@@ -94,35 +94,35 @@ public class EnterpriseAccountDao {
List<String>whereList=Lists.newArrayList();
Stringsql="SELECT * FROM ( "+
"SELECT CASE IsLeaf WHEN 0 THEN '+' ELSE '' END IsEx,Code, Name, FullName, "+
"SELECT CASE Is_Leaf WHEN 0 THEN '+' ELSE '' END IsEx,Code, Name, Full_Name, "+
"CASE Direction WHEN 1 THEN N'借方' WHEN -1 THEN N'贷方' END Direction, "+
"CASE StdAccountCode WHEN '0000' THEN '-' ELSE StdAccountCode END StdCode,"+
"CASE StdAccountCode WHEN '0000' THEN '-' ELSE StdName END StdName, "+
"CASE StdAccountCode WHEN '0000' THEN '-' ELSE StdAccountCode + '/' + StdFullName END StdCodeName, "+
"CASE StdAccountCode WHEN '0000' THEN '-' ELSE CASE StdDirection WHEN 1 THEN N'借方' WHEN -1 THEN N'贷方' END END StdDirection, "+
"CASE WHEN AcctProp<>StdAcctProp THEN 1 ELSE 0 END IsAcctPropDiff,"+
"CASE WHEN StdAccountCode IS NULL THEN 0 ELSE 1 END MappingStatus, "+
"CASE WHEN StdAccountCode IS NULL THEN AcctProp ELSE StdAcctProp END AcctProp, ParentCode, AcctLevel, StdAccountCode AcctStdCode, IsLeaf "+
" FROM (SELECT id,Code,Name,FullName,Direction,AcctProp,ParentCode,AcctLevel,IsLeaf FROM EnterpriseAccount WHERE EnterpriseAccountSetId=?) ea "+
"LEFT JOIN (SELECT EnterpriseAccountCode ,StandardAccountCode FROM AccountMapping WHERE OrganizationId=? AND IndustryId=?) am ON ea.Code=am.EnterpriseAccountCode "+
"LEFT JOIN (SELECT id StdId, Code StdAccountCode, Name StdName, FullName StdFullName,Direction StdDirection,AcctProp StdAcctProp FROM StandardAccount WHERE IndustryId=?) sa ON am.StandardAccountCode=sa.StdAccountCode ) T";
"CASE Std_Account_Code WHEN '0000' THEN '-' ELSE Std_Account_Code END Std_Code,"+
"CASE Std_Account_Code WHEN '0000' THEN '-' ELSE Std_Name END Std_Name, "+
"CASE Std_Account_Code WHEN '0000' THEN '-' ELSE CONCAT(CONCAT(STD_ACCOUNT_CODE,'/'), STD_FULL_NAME) END Std_Code_Name, "+
"CASE Std_Account_Code WHEN '0000' THEN '-' ELSE CASE Std_Direction WHEN 1 THEN '借方' WHEN -1 THEN '贷方' END END Std_Direction, "+
"CASE WHEN Acct_Prop<>Std_Acct_Prop THEN 1 ELSE 0 END Is_Acct_Prop_Diff,"+
"CASE WHEN Std_Account_Code IS NULL THEN 0 ELSE 1 END Mapping_Status, "+
"CASE WHEN Std_Account_Code IS NULL THEN Acct_Prop ELSE Std_Acct_Prop END Acct_Prop, Parent_Code, Acct_Level, Std_Account_Code Acct_Std_Code, Is_Leaf "+
" FROM (SELECT id,Code,\"NAME\",Full_Name,Direction,Acct_Prop,Parent_Code,Acct_Level,Is_Leaf FROM Enterprise_Account WHERE Enterprise_Account_Set_Id=?) ea "+
"LEFT JOIN (SELECT Enterprise_Account_Code ,Standard_Account_Code FROM Account_Mapping WHERE Organization_Id=? AND Industry_Id=?) am ON ea.Code=am.Enterprise_Account_Code "+
"LEFT JOIN (SELECT id as Std_Id, Code as Std_Account_Code, \"NAME\" as Std_Name, Full_Name as Std_Full_Name,Direction Std_Direction,Acct_Prop Std_Acct_Prop FROM Standard_Account WHERE Industry_Id=?) sa ON am.Standard_Account_Code=sa.Std_Account_Code ) T";
@@ -111,7 +111,7 @@ public interface TaxRuleSettingMapper extends MyMapper {
*/
intupdateByPrimaryKey(TaxRuleSettingrecord);
@Select("SELECT TRS.GROUP_NAME,TRS.ID,TRS.IS_DEFAULT,TRS.NAME,TRS.TAX_BASE,TRS.TAX_RATE*100 AS TAX_RATE,TRSO.ORGANIZATION_ID"
@Select("SELECT TRS.GROUP_NAME as groupName,TRS.ID as id,TRS.IS_DEFAULT as isDefault,TRS.NAME as name,TRS.TAX_BASE as taxBase,TRS.TAX_RATE*100 AS taxRate,TRSO.ORGANIZATION_ID as organizationId"
+" FROM TAX_RULE_SETTING TRS "
+"LEFT JOIN TAX_RULE_SETTING_ORGANIZATION TRSO ON TRS.ID=TRSO.TAX_SETTING_ID")
