Skip to content

C
cloud-fb
Commit 57378297 by 王炜晨
Options

merge

parents 6b129698 00b0f2d2
Showing with 2176 additions and 221 deletions
backend/inz.basis/src/main/resources/com/beecode/inz/portal/functiontree/DefaultFunctionTree.jmx
...@@ -25,6 +25,24 @@ ...@@ -25,6 +25,24 @@
<dependency>com.xyst.dinas.oa.auth.PerformanceAssessApproveList</dependency> <dependency>com.xyst.dinas.oa.auth.PerformanceAssessApproveList</dependency>
<dependency>com.xyst.dinas.oa.auth.PerformanceAssessScoreList</dependency> <dependency>com.xyst.dinas.oa.auth.PerformanceAssessScoreList</dependency>
<dependency>com.xyst.dinas.oa.auth.OAWorkflowSetting</dependency> <dependency>com.xyst.dinas.oa.auth.OAWorkflowSetting</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractApproveList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractWarningExeList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractExecuteAnalyseList</dependency>
<dependency>com.xyst.dinas.contract.auth.ContractWarningSettingList</dependency>
<dependency>com.xyst.dinas.finance.auth.ArtificialRechargeList</dependency>
<dependency>com.xyst.dinas.finance.auth.BankRechargeDetailList</dependency>
<dependency>com.xyst.dinas.finance.auth.ExpenseAdjustList</dependency>
<dependency>com.xyst.dinas.finance.auth.FinanceRefundList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanTempList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanAuditList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanTempAuditList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesWarningRecordList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesWarningSetList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesLedgerGroupList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseList</dependency>
<dependency>com.xyst.dinas.sales.auth.SalesPlanGroupQuery</dependency>
<content> <content>
<m:function-tree> <m:function-tree>
<m:parent></m:parent> <m:parent></m:parent>
...@@ -58,7 +76,7 @@ ...@@ -58,7 +76,7 @@
<m:title>项目清单</m:title> <m:title>项目清单</m:title>
<m:index>900</m:index> <m:index>900</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.project.auth.ProjectFiledListGroupCompany</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-project-list-jituan</m:view> <m:view>function-project-list-jituan</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -71,7 +89,7 @@ ...@@ -71,7 +89,7 @@
<m:title>项目备案</m:title> <m:title>项目备案</m:title>
<m:index>1000</m:index> <m:index>1000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.project.auth.ProjectFiledList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-project-list</m:view> <m:view>function-project-list</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -84,7 +102,7 @@ ...@@ -84,7 +102,7 @@
<m:title>购砂单位清单</m:title> <m:title>购砂单位清单</m:title>
<m:index>1100</m:index> <m:index>1100</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.project.auth.PurchaseSandCompanyListGroupCompany</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-company-customer-list-jituan</m:view> <m:view>function-company-customer-list-jituan</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -97,7 +115,7 @@ ...@@ -97,7 +115,7 @@
<m:title>购砂单位备案</m:title> <m:title>购砂单位备案</m:title>
<m:index>6000</m:index> <m:index>6000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.project.auth.PurchaseSandCompanyList</m:privilege>
<m:role></m:role> <m:role></m:role>
<m:function-definition> <m:function-definition>
<m:view>function-company-customer-list</m:view> <m:view>function-company-customer-list</m:view>
...@@ -138,7 +156,7 @@ ...@@ -138,7 +156,7 @@
<m:title>合同登记</m:title> <m:title>合同登记</m:title>
<m:index>1000</m:index> <m:index>1000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.contract.auth.ContractList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-contract-list</m:view> <m:view>function-contract-list</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -151,7 +169,7 @@ ...@@ -151,7 +169,7 @@
<m:title>合同审核</m:title> <m:title>合同审核</m:title>
<m:index>2000</m:index> <m:index>2000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.contract.auth.ContractApproveList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-contract-approve</m:view> <m:view>function-contract-approve</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -164,7 +182,7 @@ ...@@ -164,7 +182,7 @@
<m:title>合同执行预警</m:title> <m:title>合同执行预警</m:title>
<m:index>3000</m:index> <m:index>3000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.contract.auth.ContractWarningExeList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-contract-execute-warning</m:view> <m:view>function-contract-execute-warning</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -177,7 +195,7 @@ ...@@ -177,7 +195,7 @@
<m:title>合同执行分析</m:title> <m:title>合同执行分析</m:title>
<m:index>4000</m:index> <m:index>4000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.contract.auth.ContractExecuteAnalyseList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-contract-execute-analyse</m:view> <m:view>function-contract-execute-analyse</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -190,7 +208,7 @@ ...@@ -190,7 +208,7 @@
<m:title>合同预警设置</m:title> <m:title>合同预警设置</m:title>
<m:index>1000</m:index> <m:index>1000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.contract.auth.ContractWarningSettingList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-contract-warning-setting</m:view> <m:view>function-contract-warning-setting</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -362,7 +380,7 @@ ...@@ -362,7 +380,7 @@
<m:title>销售计划</m:title> <m:title>销售计划</m:title>
<m:index>5000</m:index> <m:index>5000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-plan</m:view> <m:view>function-market-plan</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -375,7 +393,7 @@ ...@@ -375,7 +393,7 @@
<m:title>临时销售计划</m:title> <m:title>临时销售计划</m:title>
<m:index>4500</m:index> <m:index>4500</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanTempList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-plan-temporary</m:view> <m:view>function-market-plan-temporary</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -388,7 +406,7 @@ ...@@ -388,7 +406,7 @@
<m:title>销售计划审核</m:title> <m:title>销售计划审核</m:title>
<m:index>4000</m:index> <m:index>4000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanAuditList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-plan-approve</m:view> <m:view>function-market-plan-approve</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -401,7 +419,7 @@ ...@@ -401,7 +419,7 @@
<m:title>临时销售计划审核</m:title> <m:title>临时销售计划审核</m:title>
<m:index>4500</m:index> <m:index>4500</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanTempAuditList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-plan-temporary-approve</m:view> <m:view>function-market-plan-temporary-approve</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -414,7 +432,7 @@ ...@@ -414,7 +432,7 @@
<m:title>销售预警</m:title> <m:title>销售预警</m:title>
<m:index>10000</m:index> <m:index>10000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesWarningRecordList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-warning</m:view> <m:view>function-market-warning</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -427,7 +445,7 @@ ...@@ -427,7 +445,7 @@
<m:title>销售预警设置</m:title> <m:title>销售预警设置</m:title>
<m:index>11000</m:index> <m:index>11000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesWarningSetList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-warning-setting</m:view> <m:view>function-market-warning-setting</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -440,7 +458,7 @@ ...@@ -440,7 +458,7 @@
<m:title>销售计划查看</m:title> <m:title>销售计划查看</m:title>
<m:index>8000</m:index> <m:index>8000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanGroupQuery</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-view</m:view> <m:view>function-market-view</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -453,7 +471,7 @@ ...@@ -453,7 +471,7 @@
<m:title>销售计划分析</m:title> <m:title>销售计划分析</m:title>
<m:index>9000</m:index> <m:index>9000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-market-analyse</m:view> <m:view>function-market-analyse</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -466,7 +484,7 @@ ...@@ -466,7 +484,7 @@
<m:title>销售台账</m:title> <m:title>销售台账</m:title>
<m:index>7000</m:index> <m:index>7000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.sales.auth.SalesLedgerGroupList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-project-market-list</m:view> <m:view>function-project-market-list</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -493,7 +511,7 @@ ...@@ -493,7 +511,7 @@
<m:title>账户充值</m:title> <m:title>账户充值</m:title>
<m:index>2000</m:index> <m:index>2000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.finance.auth.ArtificialRechargeList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-account-charge</m:view> <m:view>function-account-charge</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -506,7 +524,7 @@ ...@@ -506,7 +524,7 @@
<m:title>银行入账</m:title> <m:title>银行入账</m:title>
<m:index>1000</m:index> <m:index>1000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.finance.auth.BankRechargeDetailList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-charge-detail</m:view> <m:view>function-charge-detail</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -519,7 +537,7 @@ ...@@ -519,7 +537,7 @@
<m:title>费用调整</m:title> <m:title>费用调整</m:title>
<m:index>2500</m:index> <m:index>2500</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.finance.auth.ExpenseAdjustList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-account-adjust</m:view> <m:view>function-account-adjust</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -532,7 +550,7 @@ ...@@ -532,7 +550,7 @@
<m:title>退款管理</m:title> <m:title>退款管理</m:title>
<m:index>3000</m:index> <m:index>3000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege>com.xyst.dinas.finance.auth.FinanceRefundList</m:privilege>
<m:function-definition> <m:function-definition>
<m:view>function-refund-list</m:view> <m:view>function-refund-list</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1272,7 +1290,7 @@ ...@@ -1272,7 +1290,7 @@
<m:index>4000</m:index> <m:index>4000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-org-list</m:view> <m:view>function-org-list</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1286,7 +1304,7 @@ ...@@ -1286,7 +1304,7 @@
<m:index>1000</m:index> <m:index>1000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-userMgr</m:view> <m:view>function-userMgr</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1314,7 +1332,7 @@ ...@@ -1314,7 +1332,7 @@
<m:index>2000</m:index> <m:index>2000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-funcauth</m:view> <m:view>function-funcauth</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1328,7 +1346,7 @@ ...@@ -1328,7 +1346,7 @@
<m:index>7000</m:index> <m:index>7000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-post-manage</m:view> <m:view>function-post-manage</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1342,7 +1360,7 @@ ...@@ -1342,7 +1360,7 @@
<m:index>3000</m:index> <m:index>3000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-dictMgr</m:view> <m:view>function-dictMgr</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1356,7 +1374,7 @@ ...@@ -1356,7 +1374,7 @@
<m:index>4000</m:index> <m:index>4000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-workflowDefinition</m:view> <m:view>function-workflowDefinition</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
...@@ -1370,7 +1388,7 @@ ...@@ -1370,7 +1388,7 @@
<m:index>8000</m:index> <m:index>8000</m:index>
<m:license></m:license> <m:license></m:license>
<m:privilege></m:privilege> <m:privilege></m:privilege>
<m:role></m:role> <m:role>bizManagerRole</m:role>
<m:function-definition> <m:function-definition>
<m:view>function-enterpriseSettings</m:view> <m:view>function-enterpriseSettings</m:view>
<m:view-config></m:view-config> <m:view-config></m:view-config>
......
backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/SandMiningAreaServiceImpl.java
...@@ -80,7 +80,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService { ...@@ -80,7 +80,7 @@ public class SandMiningAreaServiceImpl implements SandMiningAreaService {
warnSetting.setBillId(kobject.getUuid("id")); warnSetting.setBillId(kobject.getUuid("id"));
warnSetting.setTarget(SandMiningAreaConstant.SAND_MINING_AREA_WARN_TARGET); warnSetting.setTarget(SandMiningAreaConstant.SAND_MINING_AREA_WARN_TARGET);
warnSetting.setTargetType(WarnTargetTypeEnum.NUMBER_TYPE.name()); warnSetting.setTargetType(WarnTargetTypeEnum.NUMBER_TYPE.name());
warnSetting.setOpen(false); warnSetting.setOpen(true);
warnSetting.setMemo(getAreaWarningInfo(kobject)); warnSetting.setMemo(getAreaWarningInfo(kobject));
warnSetting.setWarnCalculator(SandMiningAreaConstant.warnCalculator); warnSetting.setWarnCalculator(SandMiningAreaConstant.warnCalculator);
warningSettingService.insertWarnSetting(warnSetting); warningSettingService.insertWarnSetting(warnSetting);
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractAdd.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractAdd</name> <name>ContractAdd</name>
<title>新增</title> <title>新建</title>
<tags></tags> <tags></tags>
<description></description> <description></description>
</header> </header>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractApproveList.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractApproveList</name> <name>ContractApproveList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractCardLook.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractCardLook</name> <name>ContractCardLook</name>
<title>卡片查看</title> <title>卡片查看</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractChange.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractChange</name> <name>ContractChange</name>
<title>变更</title> <title>变更</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractComplete.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractComplete</name> <name>ContractComplete</name>
<title>完成</title> <title>完成</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractEdit.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractEdit</name> <name>ContractEdit</name>
<title>编辑</title> <title>编辑</title>
<tags></tags> <tags></tags>
<description></description> <description></description>
</header> </header>
<content> <content>
<privilege type='TOKEN' target-type='' id='1ef4ce72-d73d-442d-9428-5fe3be0bb8c1' category='合同/合同登记（区域公司）' seq='5'></privilege> <privilege type='TOKEN' target-type='' id='1ef4ce72-d73d-442d-9428-5fe3be0bb8c1' category='合同/合同登记（区域公司）' seq='4'></privilege>
</content> </content>
</model> </model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractExecuteAnalyseList.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractExecuteAnalyseList</name> <name>ContractExecuteAnalyseList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractExport.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractExport</name> <name>ContractExport</name>
<title>导出</title> <title>导出</title>
<tags></tags> <tags></tags>
<description></description> <description></description>
</header> </header>
<content> <content>
<privilege type='TOKEN' target-type='' id='ef6a6291-c631-4c4b-90ce-32ebea1d984d' category='合同/合同登记（区域公司）' seq='4'></privilege> <privilege type='TOKEN' target-type='' id='ef6a6291-c631-4c4b-90ce-32ebea1d984d' category='合同/合同登记（区域公司）' seq='5'></privilege>
</content> </content>
</model> </model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractList.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractList</name> <name>ContractList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractRemove.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractRemove</name> <name>ContractRemove</name>
<title>删除</title> <title>删除</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractSubmit.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractSubmit</name> <name>ContractSubmit</name>
<title>提交</title> <title>提交</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractWarningExeList.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractWarningExeList</name> <name>ContractWarningExeList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractWarningSettingList.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractWarningSettingList</name> <name>ContractWarningSettingList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractWarningSettingMemberSet.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractWarningSettingMemberSet</name> <name>ContractWarningSettingMemberSet</name>
<title>人员设置</title> <title>人员设置</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractWarningSettingWarningSet.mk
<model> <model>
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.contract.auth</package>
<name>ContractWarningSettingWarningSet</name> <name>ContractWarningSettingWarningSet</name>
<title>预警设置</title> <title>预警设置</title>
<tags></tags> <tags></tags>
......
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractAdd.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>af449c11-de31-4e42-8ef6-be62f359aa01</id>
<name>com.xyst.dinas.contract.auth.ContractAdd</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractApproveList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>527c15dd-7fe3-4162-bb27-c40f8ec50478</id>
<name>com.xyst.dinas.contract.auth.ContractApproveList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同审核（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractCardLook.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>501467ff-5202-4b02-9fa7-f3316c60b0b5</id>
<name>com.xyst.dinas.contract.auth.ContractCardLook</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractChange.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>47207868-c0b4-455a-b8fc-e18b0c19cd16</id>
<name>com.xyst.dinas.contract.auth.ContractChange</name>
<title>变更</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>6</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractComplete.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>01bbc7a0-e37a-4316-830e-b043e5e231ca</id>
<name>com.xyst.dinas.contract.auth.ContractComplete</name>
<title>完成</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>7</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractEdit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>1ef4ce72-d73d-442d-9428-5fe3be0bb8c1</id>
<name>com.xyst.dinas.contract.auth.ContractEdit</name>
<title>编辑</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractExecuteAnalyseList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>c2ae8f54-b0fb-4397-b050-5d327867f1b8</id>
<name>com.xyst.dinas.contract.auth.ContractExecuteAnalyseList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同执行分析</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractExport.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ef6a6291-c631-4c4b-90ce-32ebea1d984d</id>
<name>com.xyst.dinas.contract.auth.ContractExport</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>5</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e9e9390f-87d0-41ef-a3a5-a20af58fb1ff</id>
<name>com.xyst.dinas.contract.auth.ContractList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractRemove.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ef0dd8eb-f063-4390-aab6-dbb8f70f89e0</id>
<name>com.xyst.dinas.contract.auth.ContractRemove</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>8</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractSubmit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>f6ca0ba5-985a-4fb6-90e5-fcb616dfdffe</id>
<name>com.xyst.dinas.contract.auth.ContractSubmit</name>
<title>提交</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同登记（区域公司）</m:category>
<m:seq>9</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractWarningExeList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>f6911413-296e-43c5-92d4-2a27e8d8901f</id>
<name>com.xyst.dinas.contract.auth.ContractWarningExeList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同执行预警</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractWarningSettingList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e58e42d9-a2c9-4126-ab8b-93de7d4c47e9</id>
<name>com.xyst.dinas.contract.auth.ContractWarningSettingList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同预警设置（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractWarningSettingMemberSet.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e15a4b0f-43c1-436e-9a47-05ed4b216701</id>
<name>com.xyst.dinas.contract.auth.ContractWarningSettingMemberSet</name>
<title>人员设置</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同预警设置（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.contract/src/main/resources/com/xyst/dinas/contract/auth/ContractWarningSettingWarningSet.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>165f487e-75b5-493b-8cc6-0c233f85ec85</id>
<name>com.xyst.dinas.contract.auth.ContractWarningSettingWarningSet</name>
<title>预警设置</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>合同/合同预警设置（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/config/FinanceConfiguration.java
...@@ -8,15 +8,18 @@ import com.xyst.dinas.finance.dao.StatementAccountDao; ...@@ -8,15 +8,18 @@ import com.xyst.dinas.finance.dao.StatementAccountDao;
import com.xyst.dinas.finance.internal.dao.BankRechargeDetailDaoImpl; import com.xyst.dinas.finance.internal.dao.BankRechargeDetailDaoImpl;
import com.xyst.dinas.finance.internal.dao.ExpenseAdjustDaoImpl; import com.xyst.dinas.finance.internal.dao.ExpenseAdjustDaoImpl;
import com.xyst.dinas.finance.internal.dao.StatementAccountDaoImpl; import com.xyst.dinas.finance.internal.dao.StatementAccountDaoImpl;
import com.xyst.dinas.finance.internal.service.ArtificialRechargeServiceImpl;
import com.xyst.dinas.finance.internal.service.BankRechargeDetailServiceImpl; import com.xyst.dinas.finance.internal.service.BankRechargeDetailServiceImpl;
import com.xyst.dinas.finance.internal.service.ExpenseAdjustServiceImpl; import com.xyst.dinas.finance.internal.service.ExpenseAdjustServiceImpl;
import com.xyst.dinas.finance.internal.service.FinanceRefundServiceImpl; import com.xyst.dinas.finance.internal.service.FinanceRefundServiceImpl;
import com.xyst.dinas.finance.internal.service.StatementAccountServiceImpl; import com.xyst.dinas.finance.internal.service.StatementAccountServiceImpl;
import com.xyst.dinas.finance.processor.FinanceRefundProcessor; import com.xyst.dinas.finance.processor.FinanceRefundProcessor;
import com.xyst.dinas.finance.service.ArtificialRechargeService;
import com.xyst.dinas.finance.service.BankRechargeDetailService; import com.xyst.dinas.finance.service.BankRechargeDetailService;
import com.xyst.dinas.finance.service.ExpenseAdjustService; import com.xyst.dinas.finance.service.ExpenseAdjustService;
import com.xyst.dinas.finance.service.FinanceRefundService; import com.xyst.dinas.finance.service.FinanceRefundService;
import com.xyst.dinas.finance.service.StatementAccountService; import com.xyst.dinas.finance.service.StatementAccountService;
import com.xyst.dinas.finance.web.ArtificialRechargeController;
import com.xyst.dinas.finance.web.BankRechargeDetailController; import com.xyst.dinas.finance.web.BankRechargeDetailController;
import com.xyst.dinas.finance.web.ExpenseAdjustController; import com.xyst.dinas.finance.web.ExpenseAdjustController;
import com.xyst.dinas.finance.web.RefundController; import com.xyst.dinas.finance.web.RefundController;
...@@ -90,5 +93,14 @@ public class FinanceConfiguration { ...@@ -90,5 +93,14 @@ public class FinanceConfiguration {
return new StatementAccountDaoImpl(); return new StatementAccountDaoImpl();
} }
@Bean
public ArtificialRechargeController artificialRechargeController() {
return new ArtificialRechargeController();
}
@Bean
public ArtificialRechargeService artificialRechargeService() {
return new ArtificialRechargeServiceImpl();
}
} }
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/ArtificialRechargeServiceImpl.java 0 → 100644
package com.xyst.dinas.finance.internal.service;
import java.math.BigDecimal;
import java.util.UUID;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.beecode.bcp.type.KObject;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.jiuqi.np.syntax.parser.ANTLRParser.ifthen_eval_return;
import com.xyst.dinas.contract.internal.dao.ContractDao;
import com.xyst.dinas.finance.enumeration.FundTypeEnum;
import com.xyst.dinas.finance.service.ArtificialRechargeService;
public class ArtificialRechargeServiceImpl implements ArtificialRechargeService {
@Autowired
private ContractDao contractDao;
@Override
@Transactional
public Object adjustContractBalance(JSONObject jsonObject) {
try{
UUID contractId = UUID.fromString(jsonObject.getString("contractId"));
KObject contract = contractDao.load(contractId);
if (FundTypeEnum.ADVANCE.name().equals(jsonObject.getString("fundType"))) {
contract.set("advanceBalance", contract.getBigDecimal("advanceBalance") == null ? new BigDecimal("0").add(jsonObject.getBigDecimal("rechargeAmount")) : contract.getBigDecimal("advanceBalance").add(jsonObject.getBigDecimal("rechargeAmount")));
} else if(FundTypeEnum.DEPOSIT.name().equals(jsonObject.getString("fundType"))){
contract.set("depositBalance", contract.getBigDecimal("depositBalance") == null ? new BigDecimal("0").add(jsonObject.getBigDecimal("rechargeAmount")) : contract.getBigDecimal("depositBalance").add(jsonObject.getBigDecimal("rechargeAmount")));
}
contractDao.update(contract);
return ResponseObj.success();
} catch(Exception e){
return ResponseObj.error();
}
}
}
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/BankRechargeDetailServiceImpl.java
...@@ -79,19 +79,28 @@ public class BankRechargeDetailServiceImpl implements BankRechargeDetailService ...@@ -79,19 +79,28 @@ public class BankRechargeDetailServiceImpl implements BankRechargeDetailService
artificialRecharge.set("regionalCompany", jsonObject.isNull("regionalCompany") ? null : dinasOrganizationDao.load(UUID.fromString(jsonObject.getJSONObject("regionalCompany").getString("id")))); artificialRecharge.set("regionalCompany", jsonObject.isNull("regionalCompany") ? null : dinasOrganizationDao.load(UUID.fromString(jsonObject.getJSONObject("regionalCompany").getString("id"))));
artificialRecharge.set("purchaseSandUnit", jsonObject.isNull("purchaseSandUnit") ? null : purchaseSandCompanyDao.load(UUID.fromString(jsonObject.getJSONObject("purchaseSandUnit").getString("id")))); artificialRecharge.set("purchaseSandUnit", jsonObject.isNull("purchaseSandUnit") ? null : purchaseSandCompanyDao.load(UUID.fromString(jsonObject.getJSONObject("purchaseSandUnit").getString("id"))));
artificialRecharge.set("contract", jsonObject.isNull("contract") ? null : contractDao.load(UUID.fromString(jsonObject.getJSONObject("contract").getString("id")))); artificialRecharge.set("contract", jsonObject.isNull("contract") ? null : contractDao.load(UUID.fromString(jsonObject.getJSONObject("contract").getString("id"))));
//获取关联合同
UUID contractId = UUID.fromString(jsonObject.getJSONObject("contract").getString("id"));
KObject contract = contractDao.load(contractId);
if (!jsonObject.isNull("advanceAmount")) { if (!jsonObject.isNull("advanceAmount")) {
//生成预付款调整 //生成预付款入账
artificialRecharge.set("id", UUID.randomUUID()); artificialRecharge.set("id", UUID.randomUUID());
artificialRecharge.set("fundType", "ADVANCE"); artificialRecharge.set("fundType", "ADVANCE");
artificialRecharge.set("rechargeAmount", jsonObject.getBigDecimal("advanceAmount")); artificialRecharge.set("rechargeAmount", jsonObject.getBigDecimal("advanceAmount"));
contract.set("advanceBalance", contract.getBigDecimal("advanceBalance") == null ? new BigDecimal("0").add(jsonObject.getBigDecimal("advanceAmount")) : contract.getBigDecimal("advanceBalance").add(jsonObject.getBigDecimal("advanceAmount")));
contractDao.update(contract);
artificialRecharge.set("contract", contract);
bankRechargeDetailDao.save(artificialRecharge); bankRechargeDetailDao.save(artificialRecharge);
} }
if (!jsonObject.isNull("depositAmount")) { if (!jsonObject.isNull("depositAmount")) {
//生成保证金调整 //生成保证金入账
KObject artificialRechargeTwo = artificialRechargeClass.newInstance(artificialRecharge); KObject artificialRechargeTwo = artificialRechargeClass.newInstance(artificialRecharge);
artificialRechargeTwo.set("id", UUID.randomUUID()); artificialRechargeTwo.set("id", UUID.randomUUID());
artificialRechargeTwo.set("fundType", "DEPOSIT"); artificialRechargeTwo.set("fundType", "DEPOSIT");
artificialRechargeTwo.set("rechargeAmount", jsonObject.getBigDecimal("depositAmount")); artificialRechargeTwo.set("rechargeAmount", jsonObject.getBigDecimal("depositAmount"));
contract.set("depositBalance", contract.getBigDecimal("depositBalance") == null ? new BigDecimal("0").add(jsonObject.getBigDecimal("depositAmount")) : contract.getBigDecimal("depositBalance").add(jsonObject.getBigDecimal("depositAmount")));
contractDao.update(contract);
artificialRecharge.set("contract", contract);
bankRechargeDetailDao.save(artificialRechargeTwo); bankRechargeDetailDao.save(artificialRechargeTwo);
} }
return ResponseObj.success(); return ResponseObj.success();
......
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/internal/service/StatementAccountServiceImpl.java
...@@ -166,7 +166,7 @@ public class StatementAccountServiceImpl implements StatementAccountService{ ...@@ -166,7 +166,7 @@ public class StatementAccountServiceImpl implements StatementAccountService{
cell.setCellStyle(textStyle); cell.setCellStyle(textStyle);
Cell cell1 = row.createCell(1); Cell cell1 = row.createCell(1);
cell1.setCellValue(statementAccount.getDealDate()); cell1.setCellValue(statementAccount.getDealDate().substring(0, statementAccount.getDealDate().indexOf(".")));
cell1.setCellStyle(textStyle); cell1.setCellStyle(textStyle);
Cell cell2 = row.createCell(2); Cell cell2 = row.createCell(2);
......
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/service/ArtificialRechargeService.java 0 → 100644
package com.xyst.dinas.finance.service;
import org.json.JSONObject;
public interface ArtificialRechargeService {
Object adjustContractBalance(JSONObject jsonObject);
}
backend/xyst.dinas.finance/src/main/java/com/xyst/dinas/finance/web/ArtificialRechargeController.java 0 → 100644
package com.xyst.dinas.finance.web;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.xyst.dinas.finance.service.ArtificialRechargeService;
import com.xyst.dinas.finance.service.BankRechargeDetailService;
import com.xyst.dinas.finance.service.ExpenseAdjustService;
/**
* 人工充值
*
* @author yangqingsong
* @date 2021年4月29日
*/
@RestController
public class ArtificialRechargeController {
@Autowired
private ArtificialRechargeService artificialRechargeService;
@ResponseBody
@RequestMapping(value = "/finance/artificialRecharge/adjustContractBalance", method = RequestMethod.POST, consumes = "application/json")
public Object adjustContractBalance(@RequestBody String body) {
JSONObject jsonObject = new JSONObject(body);
return artificialRechargeService.adjustContractBalance(jsonObject);
}
}
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ArtificialRechargeCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ArtificialRechargeCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='0ba03c35-0f62-40ac-bc96-94e80dffe2d3' category='资金/人工账户充值（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ArtificialRechargeCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ArtificialRechargeCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='a742f2aa-db1a-4075-9890-79b50b8cccd2' category='资金/人工账户充值（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ArtificialRechargeList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ArtificialRechargeList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='45f107ed-dc73-40a2-af55-86f2d3a06928' category='资金/人工账户充值' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/BankRechargeDetailCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>BankRechargeDetailCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='f2d1a332-5aec-491e-acbc-b2f3e1c8909c' category='资金/银行充值明细（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/BankRechargeDetailList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>BankRechargeDetailList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='ae29a89f-29ec-442f-b60c-0c3ed0332609' category='资金/银行充值明细' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ExpenseAdjustCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ExpenseAdjustCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='c7901c69-fe3b-4f4f-9f8f-edee831af56f' category='资金/费用调整（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ExpenseAdjustCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ExpenseAdjustCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='71f136e6-86c2-4633-8c64-3243f706b3f0' category='资金/费用调整（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/ExpenseAdjustList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>ExpenseAdjustList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='fdecb055-3121-458a-a4f1-6e63971957fe' category='资金/费用调整（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/FinanceRefundAccept.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>FinanceRefundAccept</name>
<title>受理</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6c88e9a2-2e07-40cd-8c78-a0fac1f3426a' category='资金/退费管理（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/FinanceRefundCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>FinanceRefundCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='71e8e3ed-b0d0-47f4-b451-752416a5fa7d' category='资金/退费管理（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/FinanceRefundList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>FinanceRefundList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='054dae92-83fe-4bc4-b280-49983845914f' category='资金/退费管理' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/model/com/xyxt/dinas/finance/auth/FinanceRefundReturnPremium.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.finance.auth</package>
<name>FinanceRefundReturnPremium</name>
<title>退费</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='e3b6a228-18d4-4da2-8954-8587d5ce09d4' category='资金/退费管理（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ArtificialRechargeCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>0ba03c35-0f62-40ac-bc96-94e80dffe2d3</id>
<name>com.xyst.dinas.finance.auth.ArtificialRechargeCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/人工账户充值（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ArtificialRechargeCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>a742f2aa-db1a-4075-9890-79b50b8cccd2</id>
<name>com.xyst.dinas.finance.auth.ArtificialRechargeCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/人工账户充值（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ArtificialRechargeList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>45f107ed-dc73-40a2-af55-86f2d3a06928</id>
<name>com.xyst.dinas.finance.auth.ArtificialRechargeList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/人工账户充值</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/BankRechargeDetailCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>f2d1a332-5aec-491e-acbc-b2f3e1c8909c</id>
<name>com.xyst.dinas.finance.auth.BankRechargeDetailCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/银行充值明细（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/BankRechargeDetailList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ae29a89f-29ec-442f-b60c-0c3ed0332609</id>
<name>com.xyst.dinas.finance.auth.BankRechargeDetailList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/银行充值明细</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ExpenseAdjustCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>c7901c69-fe3b-4f4f-9f8f-edee831af56f</id>
<name>com.xyst.dinas.finance.auth.ExpenseAdjustCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/费用调整（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ExpenseAdjustCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>71f136e6-86c2-4633-8c64-3243f706b3f0</id>
<name>com.xyst.dinas.finance.auth.ExpenseAdjustCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/费用调整（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/ExpenseAdjustList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>fdecb055-3121-458a-a4f1-6e63971957fe</id>
<name>com.xyst.dinas.finance.auth.ExpenseAdjustList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/费用调整（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/FinanceRefundAccept.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>6c88e9a2-2e07-40cd-8c78-a0fac1f3426a</id>
<name>com.xyst.dinas.finance.auth.FinanceRefundAccept</name>
<title>受理</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/退费管理（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/FinanceRefundCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>71e8e3ed-b0d0-47f4-b451-752416a5fa7d</id>
<name>com.xyst.dinas.finance.auth.FinanceRefundCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/退费管理（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/FinanceRefundList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>054dae92-83fe-4bc4-b280-49983845914f</id>
<name>com.xyst.dinas.finance.auth.FinanceRefundList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/退费管理</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.finance/src/main/resources/com/xyst/dinas/finance/auth/FinanceRefundReturnPremium.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e3b6a228-18d4-4da2-8954-8587d5ce09d4</id>
<name>com.xyst.dinas.finance.auth.FinanceRefundReturnPremium</name>
<title>退费</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>资金/退费管理（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/constant/PriceAdjustmentConstant.java
package com.xyst.dinas.price.constant; package com.xyst.dinas.price.constant;
/**
* @author scol
*/
public interface PriceAdjustmentConstant { public interface PriceAdjustmentConstant {
/** /**
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java
...@@ -106,7 +106,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju ...@@ -106,7 +106,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName()); DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false)); detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.in("station.id", id)); detachedCriteria.add(Restrictions.in("station.id", id));
detachedCriteria.add(Restrictions.in("applyStatus", BizProcessState.IN_PROCESS.getValue(), BizProcessState.DONE_WITH_REJECT.getValue())); detachedCriteria.add(Restrictions.in("applyStatus", BizProcessState.IN_PROCESS.getValue()));
detachedCriteria.addOrder(Order.desc("adjustmentDate")); detachedCriteria.addOrder(Order.desc("adjustmentDate"));
List<KObject> byCriteria = (List<KObject>) template.findByCriteria(detachedCriteria, 0, 1); List<KObject> byCriteria = (List<KObject>) template.findByCriteria(detachedCriteria, 0, 1);
return byCriteria; return byCriteria;
...@@ -355,7 +355,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju ...@@ -355,7 +355,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
private List<PriceAdjustmentEchartReturnEntity> getPriceAdjustmentEchartReturnEntities(List<HashMap<String, Object>> byCriteria, Date adjustmentStartDate, Date adjustmentEndDate) { private List<PriceAdjustmentEchartReturnEntity> getPriceAdjustmentEchartReturnEntities(List<HashMap<String, Object>> byCriteria, Date adjustmentStartDate, Date adjustmentEndDate) {
PriceAdjustmentEchartReturnEntity priceAdjustmentEchartReturnEntity; PriceAdjustmentEchartReturnEntity priceAdjustmentEchartReturnEntity;
List<PriceAdjustmentEchartReturnEntity> priceAdjustmentEchartReturnEntities = new ArrayList<>(); List<PriceAdjustmentEchartReturnEntity> priceAdjustmentEchartReturnEntities = new ArrayList<>();
HashMap<String, PriceAdjustmentEchartReturnEntity> priceAdjustmentEchartReturnHashMap = new HashMap<>(); HashMap<String, PriceAdjustmentEchartReturnEntity> priceAdjustmentEchartReturnHashMap = new HashMap<>(12);
StationDetailEntity stationDetailEntity; StationDetailEntity stationDetailEntity;
HashMap<String, StationDetailEntity> stationDetail = new HashMap<>(); HashMap<String, StationDetailEntity> stationDetail = new HashMap<>();
...@@ -455,13 +455,13 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju ...@@ -455,13 +455,13 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
@Override @Override
public UUID create(KObject kObject) { public UUID create(KObject kObject) {
KObject staff = AminoContextHolder.getContext().getStaff(); KObject staff = AminoContextHolder.getContext().getStaff();
if (null == kObject.getUuid("id")) { if (null == kObject.getUuid(BaseConstants.ID)) {
kObject.set("id", UUID.randomUUID()); kObject.set(BaseConstants.ID, UUID.randomUUID());
} }
kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany()); kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
kObject.set(BaseConstants.CREATOR, staff); kObject.set(BaseConstants.CREATOR, staff);
kObject.set(BaseConstants.CREATE_TIME, new Date()); kObject.set(BaseConstants.CREATE_TIME, new Date());
kObject.set("del", false); kObject.set(BaseConstants.DEL, false);
return ((UUID) template.save(kObject)); return ((UUID) template.save(kObject));
} }
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/service/PriceAdjustmentServiceImpl.java
...@@ -3,6 +3,7 @@ package com.xyst.dinas.price.internal.service; ...@@ -3,6 +3,7 @@ package com.xyst.dinas.price.internal.service;
import com.beecode.bap.attachment.common.Page; import com.beecode.bap.attachment.common.Page;
import com.beecode.bap.workflow.core.BizProcessState; import com.beecode.bap.workflow.core.BizProcessState;
import com.beecode.bcp.type.KObject; import com.beecode.bcp.type.KObject;
import com.beecode.inz.common.BaseConstants;
import com.xyst.dinas.price.dao.PriceAdjustmentDao; import com.xyst.dinas.price.dao.PriceAdjustmentDao;
import com.xyst.dinas.price.entity.PriceAdjustmentEchartReturnEntity; import com.xyst.dinas.price.entity.PriceAdjustmentEchartReturnEntity;
import com.xyst.dinas.price.entity.PriceAdjustmentEchartSearchEntity; import com.xyst.dinas.price.entity.PriceAdjustmentEchartSearchEntity;
...@@ -134,15 +135,16 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService { ...@@ -134,15 +135,16 @@ public class PriceAdjustmentServiceImpl implements PriceAdjustmentService {
@Override @Override
public void update(KObject kobject) { public void update(KObject kobject) {
priceAdjustmentDao.modify(kobject); priceAdjustmentDao.modify(kobject);
//审批通过后获取 同一天生效时间 && 创建时间小于该条记录 && 已审批 的记录,将其改为驳回 //审批通过后获取 同一天生效时间 && 创建时间小于该条记录 && 已审批 的记录,将其改为失效
List<KObject> kObjects = priceAdjustmentDao.getSameAdjustmentDateAndLtCreateDate(kobject); List<KObject> kObjects = priceAdjustmentDao.getSameAdjustmentDateAndLtCreateDate(kobject);
if (null == kObjects) { if (null == kObjects) {
return; return;
} }
for (KObject kObject : kObjects) { for (KObject kObject : kObjects) {
// kObject.set("applyStatus", BizProcessState.DONE_WITH_REJECT.getValue()); if(kObject.getString(BaseConstants.ID).equals(kObject.getString(BaseConstants.ID))){
continue;
}
kObject.set("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.ABOLITION.getValue()); kObject.set("adjustmentStatus", PriceAdjustmentAdjustmentStatusEnum.ABOLITION.getValue());
// kObject.set("failureReason", "本条数据所属生效日已有新记录审批通过,本条系统自动废弃");
priceAdjustmentDao.modify(kObject); priceAdjustmentDao.modify(kObject);
} }
......
backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/web/PriceAdjustmentController.java
...@@ -174,7 +174,7 @@ public class PriceAdjustmentController { ...@@ -174,7 +174,7 @@ public class PriceAdjustmentController {
} }
KObject priceAdjustment = priceAdjustmentService.validateByStationId(id); KObject priceAdjustment = priceAdjustmentService.validateByStationId(id);
if(null!=priceAdjustment){ if(null!=priceAdjustment){
return ResponseObj.error("有正在审批或者未通过的数据,不可新建", priceAdjustment); return ResponseObj.error("有正在审批的数据,不可新建", priceAdjustment);
} }
return ResponseObj.success("可以新增"); return ResponseObj.success("可以新增");
...@@ -218,7 +218,7 @@ public class PriceAdjustmentController { ...@@ -218,7 +218,7 @@ public class PriceAdjustmentController {
@GetMapping("getSameMessage") @GetMapping("getSameMessage")
public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(@DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("adjustmentDate") Date adjustmentDate, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("createTime") Date createTime, @DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("stationId") UUID stationId){ public ResponseObj getSameAdjustmentDateAndLtCreateDateInfo(@DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("adjustmentDate") Date adjustmentDate, @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @RequestParam("createTime") Date createTime, @DateTimeFormat(pattern = "yyyy-MM-dd")@RequestParam("stationId") UUID stationId){
List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(adjustmentDate, createTime, stationId); List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(adjustmentDate, createTime, stationId);
if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){ if(!CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
String formart1DateString = DateTimeUtils.getFormart1DateString(adjustmentDate); String formart1DateString = DateTimeUtils.getFormart1DateString(adjustmentDate);
String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效"; String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo); return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
...@@ -234,8 +234,8 @@ public class PriceAdjustmentController { ...@@ -234,8 +234,8 @@ public class PriceAdjustmentController {
@GetMapping("getSameMessageById") @GetMapping("getSameMessageById")
public ResponseObj getSameById(@RequestParam("id") UUID id){ public ResponseObj getSameById(@RequestParam("id") UUID id){
KObject byId = priceAdjustmentService.getById(id); KObject byId = priceAdjustmentService.getById(id);
List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(byId.getDate("adjustmentDate"),byId.getDate("createTime") , byId.get("station").getUuid("Id")); List<KObject> sameAdjustmentDateAndLtCreateDateInfo = priceAdjustmentService.getSameAdjustmentDateAndLtCreateDateInfo(byId.getDate("adjustmentDate"),byId.getDate("createTime") , byId.get("station").getUuid("id"));
if(CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){ if(!CollectionUtils.isEmpty(sameAdjustmentDateAndLtCreateDateInfo)){
String formart1DateString = DateTimeUtils.getFormart1DateString(byId.getDate("adjustmentDate")); String formart1DateString = DateTimeUtils.getFormart1DateString(byId.getDate("adjustmentDate"));
String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效"; String message = "检查到该场站生效日期为["+formart1DateString+"]下有"+sameAdjustmentDateAndLtCreateDateInfo.size()+"条早先创建并审批通过的记录,当该记录提交审批通过后,会将其它记录置为失效";
return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo); return ResponseObj.error(message, sameAdjustmentDateAndLtCreateDateInfo);
...@@ -243,6 +243,4 @@ public class PriceAdjustmentController { ...@@ -243,6 +243,4 @@ public class PriceAdjustmentController {
return ResponseObj.success(); return ResponseObj.success();
} }
} }
\ No newline at end of file
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/dao/ProductionPlanReportDao.java
...@@ -33,6 +33,6 @@ public interface ProductionPlanReportDao extends BaseDao { ...@@ -33,6 +33,6 @@ public interface ProductionPlanReportDao extends BaseDao {
void deleteByStationAndDate(UUID stationId, Date convertStringToDate1); void deleteByStationAndDate(UUID stationId, Date convertStringToDate1);
List<KObject> getNoWareHousing(List<UUID> productionLineIds); List<KObject> getNoWareHousing(UUID productionPlanId);
} }
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/ProductionPlanReportDaoImpl.java
...@@ -57,7 +57,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod ...@@ -57,7 +57,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
detachedCriteria.add(Restrictions.ge("productionPlanDate", startDate)); detachedCriteria.add(Restrictions.ge("productionPlanDate", startDate));
} }
if (null != endDate) { if (null != endDate) {
detachedCriteria.add(Restrictions.le("productionPlanDate", startDate)); detachedCriteria.add(Restrictions.le("productionPlanDate", endDate));
} }
dinasTypeDao.addRegionalCompanyFilter(detachedCriteria); dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
...@@ -235,19 +235,33 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod ...@@ -235,19 +235,33 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
} }
@Override @Override
public List<KObject> getNoWareHousing(List<UUID> productionLineIds) { public List<KObject> getNoWareHousing(UUID productionPlanId) {
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(ENTITY); DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(ENTITY);
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false)); detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
if (CollectionUtils.isEmpty(productionLineIds)) { if (null==productionPlanId) {
detachedCriteria.add(Restrictions.le("productionPlanDate", new Date())); detachedCriteria.add(Restrictions.le("productionPlanDate", new Date()));
} else { } else {
detachedCriteria.add(Restrictions.in("id", productionLineIds)); //根据单条生产计划id查询该场站今天所有的生产计划
List<UUID> ids= getAllByOne(productionPlanId);
assert ids != null;
detachedCriteria.add(Restrictions.in("id", ids));
} }
detachedCriteria.add(Restrictions.eq("warehousingStatus", false)); detachedCriteria.add(Restrictions.eq("warehousingStatus", false));
return (List<KObject>) template.findByCriteria(detachedCriteria); return (List<KObject>) template.findByCriteria(detachedCriteria);
} }
private List<UUID> getAllByOne(UUID productionPlanId) {
KObject load = load(productionPlanId);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(ENTITY);
detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
detachedCriteria.add(Restrictions.eq("productionPlanDate", load.getDate("productionPlanDate")));
detachedCriteria.add(Restrictions.eq("station.id", load.get("station").getUuid("id")));
detachedCriteria.setProjection(Projections.projectionList().add(Projections.distinct(Projections.property("id"))));
return (List<UUID>)template.findByCriteria(detachedCriteria);
}
/** /**
* 抽象方法，需要实现类提供HibernateTemplate * 抽象方法，需要实现类提供HibernateTemplate
* *
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/DischargingServiceImpl.java
...@@ -59,9 +59,9 @@ public class DischargingServiceImpl implements DischargingService { ...@@ -59,9 +59,9 @@ public class DischargingServiceImpl implements DischargingService {
} }
@Override @Override
public List<HashMap<String,Object>> groupInfoByYear(List<UUID> regionalCompanyIds, Integer year, Boolean isGroupByMonth, Boolean isGroupByRegionalCompany, Boolean isGroupBySandMiningArea) { public List<HashMap<String, Object>> groupInfoByYear(List<UUID> regionalCompanyIds, Integer year, Boolean isGroupByMonth, Boolean isGroupByRegionalCompany, Boolean isGroupBySandMiningArea) {
return dischargingDao.groupInfo(regionalCompanyIds,year,isGroupByMonth,isGroupByRegionalCompany,isGroupBySandMiningArea); return dischargingDao.groupInfo(regionalCompanyIds, year, isGroupByMonth, isGroupByRegionalCompany, isGroupBySandMiningArea);
} }
@Override @Override
...@@ -97,7 +97,7 @@ public class DischargingServiceImpl implements DischargingService { ...@@ -97,7 +97,7 @@ public class DischargingServiceImpl implements DischargingService {
//生成预警消息的逻辑 如果是小于当前年份的记录,不生成预警 //生成预警消息的逻辑 如果是小于当前年份的记录,不生成预警
//如果已有parentId 也不触发预警 //如果已有parentId 也不触发预警
Boolean ltYear = DateTimeUtils.isLtNowYear(dischargingTime); Boolean ltYear = DateTimeUtils.isLtNowYear(dischargingTime);
if (!ltYear && kObject.getUuid("parentId")!=null) { if (!ltYear && kObject.getUuid("parentId") != null) {
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea); setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
} }
return uuid; return uuid;
...@@ -114,7 +114,7 @@ public class DischargingServiceImpl implements DischargingService { ...@@ -114,7 +114,7 @@ public class DischargingServiceImpl implements DischargingService {
} }
@Override @Override
public Double getAllDischargingWeightByNowAndSandAreaId(UUID billId){ public Double getAllDischargingWeightByNowAndSandAreaId(UUID billId) {
return dischargingDao.getAllDischargingWeightByYearAndSandAreaId(new Date(), billId); return dischargingDao.getAllDischargingWeightByYearAndSandAreaId(new Date(), billId);
} }
...@@ -188,12 +188,12 @@ public class DischargingServiceImpl implements DischargingService { ...@@ -188,12 +188,12 @@ public class DischargingServiceImpl implements DischargingService {
KObject oldSandMiningArea = id.get("sandMiningArea"); KObject oldSandMiningArea = id.get("sandMiningArea");
UUID oldSandMiningAreaId = oldSandMiningArea.getUuid("id"); UUID oldSandMiningAreaId = oldSandMiningArea.getUuid("id");
if(null!=kObject.getUuid("parentId")){ if (null == kObject.getUuid("parentId")) {
//如果采区和年都没有变化,则不判断旧的数据是否结束 //如果采区和年都没有变化,则不判断旧的数据是否结束
if(oldSandMiningAreaId!=sandMiningAreaId&&!DateTimeUtils.isSameYear(oldDischargingTime,dischargingTime)){ if (oldSandMiningAreaId != sandMiningAreaId && !DateTimeUtils.isSameYear(oldDischargingTime, dischargingTime)) {
setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea); setWarningRecord(oldSandMiningAreaId, oldDischargingTime, oldSandMiningArea);
} }
if(!DateTimeUtils.isLtNowYear(dischargingTime)){ if (!DateTimeUtils.isLtNowYear(dischargingTime)) {
setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea); setWarningRecord(sandMiningAreaId, dischargingTime, sandMiningArea);
} }
} }
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/ProductionPlanReportServiceImpl.java
...@@ -168,7 +168,7 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ ...@@ -168,7 +168,7 @@ public class ProductionPlanReportServiceImpl implements ProductionPlanReportServ
} }
@Override @Override
public void warehousing(List<UUID> productionLineIds) { public void warehousing(UUID productionLineIds) {
//查询本天之前所有未入库的数据 //查询本天之前所有未入库的数据
List<KObject> a = productionPlanReportDao.getNoWareHousing(productionLineIds); List<KObject> a = productionPlanReportDao.getNoWareHousing(productionLineIds);
......
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/service/ProductionPlanReportService.java
...@@ -38,6 +38,6 @@ public interface ProductionPlanReportService { ...@@ -38,6 +38,6 @@ public interface ProductionPlanReportService {
void deleteByStationAndDate(UUID stationId, Date convertStringToDate1); void deleteByStationAndDate(UUID stationId, Date convertStringToDate1);
void warehousing(List<UUID> productionLineIds); void warehousing(UUID productionLineIds);
} }
backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/web/ProductionPlanReportController.java
...@@ -59,9 +59,9 @@ public class ProductionPlanReportController { ...@@ -59,9 +59,9 @@ public class ProductionPlanReportController {
@RequestMapping(value = "warehousing", method = RequestMethod.GET) @RequestMapping(value = "warehousing", method = RequestMethod.GET)
public ResponseObj warehousing( public ResponseObj warehousing(
@RequestParam(name = "productionLineIds", required = false) List<UUID> productionLineIds @RequestParam(name = "productionPlanId", required = false) UUID productionPlanId
) { ) {
productionPlanReportService.warehousing(productionLineIds); productionPlanReportService.warehousing(productionPlanId);
return ResponseObj.success("入库成功"); return ResponseObj.success("入库成功");
} }
......
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='285b4a7d-a887-45f1-81fd-7b6d3595579d' category='项目/项目备案（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledCardGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledCardGroupCompany</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='0ada5952-4eb2-4e24-be76-be63c77afee0' category='项目/项目清单（集团）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='b0030e40-a73f-4b56-966e-d9975a882b7f' category='项目/项目备案（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledDiscard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledDiscard</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='9cf0044e-d723-42ec-92e1-a4f289102ec9' category='项目/项目备案（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='be2cb17f-aac0-4424-9dff-8a6cfdbba670' category='项目/项目备案（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledExport.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledExport</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='90169ba4-65a0-4720-8034-dc0206ee82e1' category='项目/项目备案（区域公司）' seq='5'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledExportGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledExportGroupCompany</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='d3fac741-040c-4e52-9194-879bccb2ace2' category='项目/项目清单（集团）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='38d2a15a-e8bf-4a0c-b27d-812f13915962' category='项目/项目备案（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/ProjectFiledListGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>ProjectFiledListGroupCompany</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='ba078e68-b467-4ce6-a45f-c9d8f7db0089' category='项目/项目清单（集团）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='f06da281-d6dc-4475-9168-b5a1ed374ecc' category='项目/购砂单位备案（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyCardGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyCardGroupCompany</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='28768a8d-df79-4b38-bb37-956cba7724ac' category='项目/购砂单位清单（集团）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='1572cd56-456c-4b9e-b487-15a6b42df517' category='项目/购砂单位备案（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyDiscard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyDiscard</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='b26cd05a-cb87-4e0e-ac2d-2211cec7b2ae' category='项目/购砂单位备案（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='ff38f29e-1742-4443-956d-f2b126ab9b26' category='项目/购砂单位备案（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyExport.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyExport</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7cbbce5b-5ac1-40c5-92b1-3a6e740648f4' category='项目/购砂单位备案（区域公司）' seq='5'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyExportGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyExportGroupCompany</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='0ed28840-4411-47ef-a2cf-fa6755de0428' category='项目/购砂单位清单（集团）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='1d093c8b-84f6-4383-bf7a-fcda912559c7' category='项目/购砂单位备案（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/model/com/xyst/dinas/project/auth/PurchaseSandCompanyListGroupCompany.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.project.auth</package>
<name>PurchaseSandCompanyListGroupCompany</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='d093b261-bb6c-4713-b5ed-439bf54648ad' category='项目/购砂单位清单（集团）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>285b4a7d-a887-45f1-81fd-7b6d3595579d</id>
<name>com.xyst.dinas.project.auth.ProjectFiledCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledCardGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>0ada5952-4eb2-4e24-be76-be63c77afee0</id>
<name>com.xyst.dinas.project.auth.ProjectFiledCardGroupCompany</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目清单（集团）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>b0030e40-a73f-4b56-966e-d9975a882b7f</id>
<name>com.xyst.dinas.project.auth.ProjectFiledCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledDiscard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>9cf0044e-d723-42ec-92e1-a4f289102ec9</id>
<name>com.xyst.dinas.project.auth.ProjectFiledDiscard</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledEdit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>be2cb17f-aac0-4424-9dff-8a6cfdbba670</id>
<name>com.xyst.dinas.project.auth.ProjectFiledEdit</name>
<title>编辑</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledExport.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>90169ba4-65a0-4720-8034-dc0206ee82e1</id>
<name>com.xyst.dinas.project.auth.ProjectFiledExport</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>5</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledExportGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>d3fac741-040c-4e52-9194-879bccb2ace2</id>
<name>com.xyst.dinas.project.auth.ProjectFiledExportGroupCompany</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目清单（集团）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>38d2a15a-e8bf-4a0c-b27d-812f13915962</id>
<name>com.xyst.dinas.project.auth.ProjectFiledList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目备案（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/ProjectFiledListGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ba078e68-b467-4ce6-a45f-c9d8f7db0089</id>
<name>com.xyst.dinas.project.auth.ProjectFiledListGroupCompany</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/项目清单（集团）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>f06da281-d6dc-4475-9168-b5a1ed374ecc</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyCardGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>28768a8d-df79-4b38-bb37-956cba7724ac</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyCardGroupCompany</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位清单（集团）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>1572cd56-456c-4b9e-b487-15a6b42df517</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyDiscard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>b26cd05a-cb87-4e0e-ac2d-2211cec7b2ae</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyDiscard</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyEdit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ff38f29e-1742-4443-956d-f2b126ab9b26</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyEdit</name>
<title>编辑</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyExport.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>7cbbce5b-5ac1-40c5-92b1-3a6e740648f4</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyExport</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>5</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyExportGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>0ed28840-4411-47ef-a2cf-fa6755de0428</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyExportGroupCompany</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位清单（集团）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>1d093c8b-84f6-4383-bf7a-fcda912559c7</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位备案（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/auth/PurchaseSandCompanyListGroupCompany.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>d093b261-bb6c-4713-b5ed-439bf54648ad</id>
<name>com.xyst.dinas.project.auth.PurchaseSandCompanyListGroupCompany</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>项目/购砂单位清单（集团）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/dict/DinasType$listSelector.jmx deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-selector">
<specification>1.0</specification>
<id>1cf86957-7552-4a9f-a47a-0f9784ee6987</id>
<name>com.xyst.dinas.project.dict.DinasType$listSelector</name>
<title>listSelector</title>
<define>bcp.selector.ListSelector</define>
<define-version>1.0</define-version>
<content>
<m:list-selector>
<m:columns>
<m:column>
<m:name>name</m:name>
<m:title>名称</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>title</m:name>
<m:title>标题</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>shortName</m:name>
<m:title>助记码</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>memo</m:name>
<m:title>备注</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>pathCode</m:name>
<m:title>路径编码</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
<m:column>
<m:name>path</m:name>
<m:title>路径</m:title>
<m:type>string</m:type>
<m:output>true</m:output>
</m:column>
</m:columns>
<m:adapter>
<m:name>com.beecode.bap.biztrait.BasicBillDictListSelectorAdaptor</m:name>
</m:adapter>
<m:config>com.xyst.dinas.project.dict.DinasType</m:config>
</m:list-selector>
</content>
</metadata>
backend/xyst.dinas.project/src/main/resources/com/xyst/dinas/project/dict/DinasType.jmx deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-dict">
<specification>1.0</specification>
<id>e0fdd25a-d908-4198-a320-d90d99959d54</id>
<name>com.xyst.dinas.project.dict.DinasType</name>
<title>砂石类型</title>
<description>砂石类型</description>
<define>bcp.dict</define>
<define-version>1.0</define-version>
<dependency>com.xyst.dinas.project.dict.datamodel.DinasType</dependency>
<content>
<m:dict>
<m:type>com.xyst.dinas.project.dict.datamodel.DinasType</m:type>
<m:config>
<m:structure>list</m:structure>
<m:code-rule></m:code-rule>
</m:config>
</m:dict>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java
...@@ -144,13 +144,14 @@ public class SalesPlanDao { ...@@ -144,13 +144,14 @@ public class SalesPlanDao {
* @param endTime * @param endTime
* @return * @return
*/ */
public List<KObject> querySalesTempPlanByTime(Date startTime,Date endTime) { public List<KObject> querySalesTempPlanByTime(Date startTime,Date endTime, UUID contractId) {
return template.execute(session ->{ return template.execute(session ->{
String hql = "from " + SalesPlanConstant.ENTITY_TEMP + " where planningCycle.startTime >=:startTime and planningCycle.endTime <=:endTime" String hql = "from " + SalesPlanConstant.ENTITY_TEMP + " where contract.id=:contractId and planningCycle.startTime >=:startTime and planningCycle.endTime <=:endTime"
+ " and (approveState = 1 or approveState =2)"; + " and (approveState = 1 or approveState =2)";
Query<KObject> query = session.createQuery(hql, KObject.class); Query<KObject> query = session.createQuery(hql, KObject.class);
query.setParameter("startTime", startTime); query.setParameter("startTime", startTime);
query.setParameter("endTime", endTime); query.setParameter("endTime", endTime);
query.setParameter("contractId", contractId);
List<KObject> resultList = query.getResultList(); List<KObject> resultList = query.getResultList();
return resultList; return resultList;
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/entity/SalesPlanDetail.java
package com.xyst.dinas.sales.entity; package com.xyst.dinas.sales.entity;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal;
import java.util.UUID; import java.util.UUID;
/** /**
* 销售计划明细 * 销售计划明细
...@@ -32,6 +33,7 @@ public class SalesPlanDetail implements Serializable{ ...@@ -32,6 +33,7 @@ public class SalesPlanDetail implements Serializable{
private Double stockAmount; private Double stockAmount;
private Double planAmount; private Double planAmount;
private Double actualSaleAmount; private Double actualSaleAmount;
private BigDecimal distributedVolum;
public UUID getMasterId() { public UUID getMasterId() {
...@@ -142,6 +144,12 @@ public class SalesPlanDetail implements Serializable{ ...@@ -142,6 +144,12 @@ public class SalesPlanDetail implements Serializable{
public void setActualSaleAmount(Double actualSaleAmount) { public void setActualSaleAmount(Double actualSaleAmount) {
this.actualSaleAmount = actualSaleAmount; this.actualSaleAmount = actualSaleAmount;
} }
public BigDecimal getDistributedVolum() {
return distributedVolum;
}
public void setDistributedVolum(BigDecimal distributedVolum) {
this.distributedVolum = distributedVolum;
}
} }
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
...@@ -3,7 +3,9 @@ package com.xyst.dinas.sales.internal.service; ...@@ -3,7 +3,9 @@ package com.xyst.dinas.sales.internal.service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import javax.transaction.Transactional; import javax.transaction.Transactional;
...@@ -22,9 +24,12 @@ import com.beecode.bcp.core.context.AminoContextHolder; ...@@ -22,9 +24,12 @@ import com.beecode.bcp.core.context.AminoContextHolder;
import com.beecode.bcp.type.KClass; import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject; import com.beecode.bcp.type.KObject;
import com.beecode.bcp.type.Null; import com.beecode.bcp.type.Null;
import com.beecode.inz.basis.team.pojo.ResponseObj;
import com.beecode.inz.common.BaseConstants; import com.beecode.inz.common.BaseConstants;
import com.beecode.xlib.utils.StringUtil; import com.beecode.xlib.utils.StringUtil;
import com.jiuqi.np.syntax.parser.ANTLRParser.ifthen_eval_return;
import com.xyst.dinas.biz.constant.DinasTypeConstant; import com.xyst.dinas.biz.constant.DinasTypeConstant;
import com.xyst.dinas.biz.constant.PlanningCycleConstant;
import com.xyst.dinas.biz.service.StationService; import com.xyst.dinas.biz.service.StationService;
import com.xyst.dinas.contract.constant.ContractConstant; import com.xyst.dinas.contract.constant.ContractConstant;
import com.xyst.dinas.project.constant.ProjectFiledConstant; import com.xyst.dinas.project.constant.ProjectFiledConstant;
...@@ -189,7 +194,13 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -189,7 +194,13 @@ public class SalesPlanServiceImpl implements SalesPlanService{
salesPlanDetail.setStockAmount(detail.getDouble(SalesPlanConstant.stockAmount)); salesPlanDetail.setStockAmount(detail.getDouble(SalesPlanConstant.stockAmount));
salesPlanDetail.setPlanAmount(detail.getDouble(SalesPlanConstant.planAmount)); salesPlanDetail.setPlanAmount(detail.getDouble(SalesPlanConstant.planAmount));
salesPlanDetail.setActualSaleAmount(detail.getDouble(SalesPlanConstant.actualSaleAmount)); salesPlanDetail.setActualSaleAmount(detail.getDouble(SalesPlanConstant.actualSaleAmount));
//计算销售计划可分配余量
JSONObject jsonObject = new JSONObject(salesPlanDetail);
KObject planningCycle = salesPlanKObject.get("planningCycle");
Date startTime = planningCycle.getDate("startTime");
Date endTime = planningCycle.getDate("endTime");
BigDecimal distributedVolum = calcDistributedVolum(jsonObject, startTime, endTime);
salesPlanDetail.setDistributedVolum(distributedVolum);
salesPlanDetails.add(salesPlanDetail); salesPlanDetails.add(salesPlanDetail);
} }
salesPlan.setSalesPlanDetails(salesPlanDetails); salesPlan.setSalesPlanDetails(salesPlanDetails);
...@@ -231,7 +242,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -231,7 +242,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
private StationService stationService; private StationService stationService;
@Override @Override
public void modify(JSONObject jsonObject) { public List<Map<String, Object>> modify(JSONObject jsonObject) {
UUID salesPlanId = UUID.fromString(jsonObject.getString("id")); UUID salesPlanId = UUID.fromString(jsonObject.getString("id"));
KObject kObject = salesPlanDao.load(salesPlanId); KObject kObject = salesPlanDao.load(salesPlanId);
kObject.set("modifyTime", new Date()); kObject.set("modifyTime", new Date());
...@@ -240,6 +251,15 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -240,6 +251,15 @@ public class SalesPlanServiceImpl implements SalesPlanService{
//kObject.set("requiredTotalAmount", jsonObject.getBigDecimal("requiredTotalAmount")); //kObject.set("requiredTotalAmount", jsonObject.getBigDecimal("requiredTotalAmount"));
List<KObject> salesPlanDetails = kObject.get("SalesPlanDetails").toList(); List<KObject> salesPlanDetails = kObject.get("SalesPlanDetails").toList();
JSONArray jsonArray = jsonObject.getJSONArray("salesPlanDetails"); JSONArray jsonArray = jsonObject.getJSONArray("salesPlanDetails");
//校验逻辑
if (!jsonObject.isNull("isCommit") && jsonObject.getInt("isCommit") == 1) {
List<Map<String, Object>> submitSalesPlanVerifyList = submitSalesPlanVerify(salesPlanId, jsonArray);
if(submitSalesPlanVerifyList.size() > 0) {
return submitSalesPlanVerifyList;
}
//改状态
kObject.set("approveState", 1);
}
BigDecimal requiredTotalAmount = new BigDecimal("0"); BigDecimal requiredTotalAmount = new BigDecimal("0");
BigDecimal planTotalAmount = new BigDecimal("0"); BigDecimal planTotalAmount = new BigDecimal("0");
BigDecimal actualSaleTotalAmount = new BigDecimal("0"); BigDecimal actualSaleTotalAmount = new BigDecimal("0");
...@@ -264,14 +284,113 @@ public class SalesPlanServiceImpl implements SalesPlanService{ ...@@ -264,14 +284,113 @@ public class SalesPlanServiceImpl implements SalesPlanService{
planTotalAmount = planTotalAmount.add(jsonObjectDetails.getBigDecimal("planAmount")); planTotalAmount = planTotalAmount.add(jsonObjectDetails.getBigDecimal("planAmount"));
actualSaleTotalAmount = actualSaleTotalAmount.add(jsonObjectDetails.getBigDecimal("actualSaleAmount")); actualSaleTotalAmount = actualSaleTotalAmount.add(jsonObjectDetails.getBigDecimal("actualSaleAmount"));
} }
} }
kObject.set("requiredTotalAmount", requiredTotalAmount); kObject.set("requiredTotalAmount", requiredTotalAmount);
kObject.set("planTotalAmount", planTotalAmount); kObject.set("planTotalAmount", planTotalAmount);
kObject.set("actualSaleTotalAmount", actualSaleTotalAmount); kObject.set("actualSaleTotalAmount", actualSaleTotalAmount);
salesPlanDao.update(kObject); salesPlanDao.update(kObject);
return null;
}
public List<Map<String, Object>> submitSalesPlanVerify(UUID salesPlanId, JSONArray jsonArray) {
//校验数据
//获取销售计划
KObject salesplan = salesPlanDao.querySalesPlanById(salesPlanId);
KObject planningCycle = salesplan.get(SalesPlanConstant.planningCycle);//计划周期
Date startTime = planningCycle.getDate(PlanningCycleConstant.startTime);
Date endTime = planningCycle.getDate(PlanningCycleConstant.endTime);
List<Map<String, Object>> verifyList = new ArrayList<Map<String, Object>>();
//List<KObject> salesPlanDetails = salesplan.get(SalesPlanConstant.SalesPlanDetails).toList();
for (int k = 0; k < jsonArray.length(); k++) {
JSONObject jsonObject = jsonArray.getJSONObject(k);
BigDecimal distributedVolum = calcDistributedVolum(jsonObject, startTime, endTime);
if(jsonObject.getBigDecimal("planAmount").compareTo(BigDecimal.ZERO) != 0 && jsonObject.getBigDecimal("planAmount").compareTo(distributedVolum) > -1) { //大于等于
Map<String, Object> verifyMap = new HashMap<String, Object>();
verifyMap.put("contractName", jsonObject.getString("contractName"));
verifyMap.put("dinasTypeName", jsonObject.getString("dinasTypeName"));
verifyMap.put("projectName", jsonObject.getString("projectName"));
verifyMap.put("distributedVolum", distributedVolum);
verifyList.add(verifyMap);
}
}
return verifyList;
}
public BigDecimal calcDistributedVolum(JSONObject jsonObject,Date startTime,Date endTime) {
//合同可用余量
BigDecimal contractAmount = jsonObject.getBigDecimal("contractAmount");
//实际销售量
BigDecimal actualSaleAmount = jsonObject.getBigDecimal("actualSaleAmount");
//查询临时销售计划分配量之和
//根据销售计划周期内的所有临时销售计划
UUID contractId = UUID.fromString(jsonObject.getString(SalesPlanConstant.contract));
//根据开始时间和结束时间查询临时销售计划
List<KObject> salesTempPlanByTimeList = salesPlanDao.querySalesTempPlanByTime(startTime, endTime, contractId);
//获取砂石类型
UUID dinasTypeId = UUID.fromString(jsonObject.getString((SalesPlanConstant.dinasType)));
//筛选同一个砂石类型下的明细
//计算临时销售计划本期分配量之和
BigDecimal totalSalesPlanAmount = new BigDecimal("0");
if(salesTempPlanByTimeList.size() > 0) {
for (int i = 0; i < salesTempPlanByTimeList.size(); i++) {
KObject salesTempPlan = salesTempPlanByTimeList.get(i);
List<KObject> salesPlanTempDetails = salesTempPlan.get("SalesPlanTempDetail").toList();
KObject salesPlanTempDetail = salesPlanTempDetails.stream().filter(detail -> detail.get("dinasType").getUuid("id").equals(dinasTypeId)).findAny().orElse(null);
if (salesPlanTempDetail != null) {
totalSalesPlanAmount = totalSalesPlanAmount.add(salesPlanTempDetail.getBigDecimal("salesPlanAmount"));
}
}
}
//可分配量 <=合同可用余量+实际销售量 - 临时销售计划分配量之和
BigDecimal distributedVolum = contractAmount.add(actualSaleAmount).subtract(totalSalesPlanAmount);
return distributedVolum;
}
@Override
public Object submitSalesPlan(UUID salesPlanId) {
//校验数据
//获取销售计划
KObject salesplan = salesPlanDao.querySalesPlanById(salesPlanId);
KObject planningCycle = salesplan.get(SalesPlanConstant.planningCycle);//计划周期
Date startTime = planningCycle.getDate(PlanningCycleConstant.startTime);
Date endTime = planningCycle.getDate(PlanningCycleConstant.endTime);
List<KObject> salesPlanDetails = salesplan.get(SalesPlanConstant.SalesPlanDetails).toList();
for (KObject salesPlanDetail : salesPlanDetails) {
//合同可用余量
BigDecimal contractAmount = salesPlanDetail.getBigDecimal("contractAmount");
//实际销售量
BigDecimal actualSaleAmount = salesPlanDetail.getBigDecimal("actualSaleAmount");
//查询临时销售计划分配量之和
//根据销售计划周期内的所有临时销售计划
KObject contract = salesPlanDetail.get(SalesPlanConstant.contract);
//根据开始时间和结束时间查询临时销售计划
List<KObject> salesTempPlanByTimeList = salesPlanDao.querySalesTempPlanByTime(startTime, endTime, contract.getUuid("id"));
//获取砂石类型
UUID dinasTypeId = salesPlanDetail.get(SalesPlanConstant.dinasType).getUuid("id");
//筛选同一个砂石类型下的明细
//计算临时销售计划本期分配量之和
BigDecimal totalSalesPlanAmount = new BigDecimal("0");
if(salesTempPlanByTimeList.size() > 0) {
for (int i = 0; i < salesTempPlanByTimeList.size(); i++) {
KObject salesTempPlan = salesTempPlanByTimeList.get(i);
List<KObject> salesPlanTempDetails = salesTempPlan.get("SalesPlanTempDetail").toList();
KObject salesPlanTempDetail = salesPlanTempDetails.stream().filter(detail -> detail.get("dinasType").getUuid("id").equals(dinasTypeId)).findAny().orElse(null);
if (salesPlanTempDetail != null) {
totalSalesPlanAmount = totalSalesPlanAmount.add(salesPlanTempDetail.getBigDecimal("salesPlanAmount"));
}
}
}
//可分配量 <=合同可用余量+实际销售量 - 临时销售计划分配量之和
if(true) {
}
}
return ResponseObj.success("提交成功");
} }
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java
package com.xyst.dinas.sales.service; package com.xyst.dinas.sales.service;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -52,6 +53,8 @@ public interface SalesPlanService { ...@@ -52,6 +53,8 @@ public interface SalesPlanService {
public Object querySalesPlanDetails(SaleaPlanDetailQuery saleaPlanDetailQuery); public Object querySalesPlanDetails(SaleaPlanDetailQuery saleaPlanDetailQuery);
public void modify(JSONObject jsonObject); public List<Map<String, Object>> modify(JSONObject jsonObject);
public Object submitSalesPlan(UUID jsonObject);
} }
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/web/SalesPlanController.java
...@@ -2,14 +2,17 @@ package com.xyst.dinas.sales.web; ...@@ -2,14 +2,17 @@ package com.xyst.dinas.sales.web;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.UUID; import java.util.UUID;
import org.json.JSONObject; import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.beecode.bap.workflow.core.BizProcessState; import com.beecode.bap.workflow.core.BizProcessState;
...@@ -31,41 +34,10 @@ public class SalesPlanController { ...@@ -31,41 +34,10 @@ public class SalesPlanController {
@Autowired @Autowired
private SalesPlanService salesPlanService; private SalesPlanService salesPlanService;
@Autowired @GetMapping("/salesplan/submit")
private PlanningCycleService planningCycleService; public Object submitSalesPlan(@RequestParam String salesPlanId) {
//JSONObject jsonObject = new JSONObject(body);
return salesPlanService.submitSalesPlan(UUID.fromString(salesPlanId));
@PostMapping("/salesplan/submit")
public Object submitSalesPlan(@Validated @RequestBody SaleaPlanApprove saleaPlanApprove) {
//校验数据
UUID salesplanId = saleaPlanApprove.getId();
KObject salesplan = salesPlanService.querySalesPlanById(salesplanId);
KObject planningCycle = salesplan.get(SalesPlanConstant.planningCycle);
Date startTime = planningCycle.getDate(PlanningCycleConstant.startTime);
Date endTime = planningCycle.getDate(PlanningCycleConstant.endTime);
List<KObject> salesPlanDetails = salesplan.get(SalesPlanConstant.SalesPlanDetails).toList();
for (KObject salesPlanDetail : salesPlanDetails) {
UUID detailId = salesPlanDetail.getUuid(BaseConstants.ID);
KObject contract = salesPlanDetail.get(SalesPlanConstant.contract);
UUID contractId = contract.getUuid(BaseConstants.ID);
KObject dinasType = salesPlanDetail.get(SalesPlanConstant.dinasType);
UUID dinasTypeId = dinasType.getUuid(BaseConstants.ID);
double planAmount = salesPlanDetail.getDouble(SalesPlanConstant.planAmount);
double actualSaleAmount = salesPlanDetail.getDouble(SalesPlanConstant.actualSaleAmount);
double contractAmount = salesPlanDetail.getDouble(SalesPlanConstant.contractAmount);
double value = 0;
if(planAmount > value) {
return ResponseObj.error("提交失败",null);
}
}
return ResponseObj.success("提交成功");
} }
...@@ -164,13 +136,15 @@ public class SalesPlanController { ...@@ -164,13 +136,15 @@ public class SalesPlanController {
} }
JSONObject jsonObject = new JSONObject(body); JSONObject jsonObject = new JSONObject(body);
try { try {
salesPlanService.modify(jsonObject); List<Map<String, Object>> list = salesPlanService.modify(jsonObject);
if(list != null && list.size() > 0) {
return ResponseObj.error("操作失败", list);
}
return ResponseObj.success("操作成功", null);
} catch(Exception e) { } catch(Exception e) {
e.printStackTrace(); e.printStackTrace();
return ResponseObj.error("操作失败",null); return ResponseObj.error("操作失败", null);
} }
return ResponseObj.success("操作成功",null);
} }
} }
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesLedgerGroupExport.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesLedgerGroupExport</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='5bda1ed8-3cbe-409d-9b42-9d92e2865411' category='销售/销售台账（集团）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractCheckList.mk → backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesLedgerGroupList.mk
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.sales.auth</package>
<name>ContractCheckList</name> <name>SalesLedgerGroupList</name>
<title>列表</title> <title>列表</title>
<tags></tags> <tags></tags>
<description></description> <description></description>
</header> </header>
<content> <content>
<privilege type='TOKEN' target-type='' id='e3e6ec23-39dd-49a5-a8ae-004f352a4a2f' category='合同/合同清单（集团）' seq='1'></privilege> <privilege type='TOKEN' target-type='' id='288cd3f3-e78d-4a31-a3ef-06f50f281559' category='销售/销售台账（集团）' seq='0'></privilege>
</content> </content>
</model> </model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanAuditCheck.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanAuditCheck</name>
<title>审核</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='86f286b4-8f19-47a3-b07f-3c9a1ad0eaea' category='销售/销售计划审核（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanAuditList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanAuditList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='e4e444bb-6d9c-4163-abe8-285ad01493ef' category='销售/销售计划审核（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='5fd306b2-5845-4b14-849e-6d4df50ab7a0' category='销售/销售计划制定（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.contract/src/main/model/com/xyst/dinas/contract/auth/ContractCheckCardLook.mk → backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseCard.mk
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<header> <header>
<type>bcp.authz.Privilege</type> <type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package> <package>com.xyst.dinas.sales.auth</package>
<name>ContractCheckCardLook</name> <name>SalesPlanGroupAnalyseCard</name>
<title>卡片查看</title> <title>卡片查看</title>
<tags></tags> <tags></tags>
<description></description> <description></description>
</header> </header>
<content> <content>
<privilege type='TOKEN' target-type='' id='04515da1-927b-4465-b013-276d7fa86f17' category='合同/合同清单（集团）' seq='2'></privilege> <privilege type='TOKEN' target-type='' id='31cf0ab5-dfa8-4fe5-909b-5aaffa86be25' category='销售/销售计划分析（集团）' seq='1'></privilege>
</content> </content>
</model> </model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseExport.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanGroupAnalyseExport</name>
<title>导出</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7eeb0198-f226-400f-b971-ae307db5c88f' category='销售/销售计划分析（集团）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanGroupAnalyseList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='337839a4-e4dd-4d15-b384-e73ff5d4b7ec' category='销售/销售计划分析（集团）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanGroupCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanGroupCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='d56b497e-f09d-4533-b697-046b220cea90' category='销售/销售计划查看（集团）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanGroupQuery.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanGroupQuery</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='df501356-e91c-4a55-9bde-878c3dc0515f' category='销售/销售计划查看（集团）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='daa03568-cc8e-4f94-a997-bd9b3e78e52f' category='销售/销售计划制定（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempAuditCheck.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempAuditCheck</name>
<title>审核</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7fff412d-352e-4695-b94c-1dfd8aa4dd07' category='销售/临时销售计划审核（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempAuditList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempAuditList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='7c6ffc7b-e5a3-404d-ae51-49033d7721c2' category='销售/临时销售计划审核（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempCard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempCard</name>
<title>卡片查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='ad1fe218-fae1-45c2-beb2-443d685dfb96' category='销售/临时销售计划（区域公司）' seq='3'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='229bfcda-3bbc-4f7f-b998-972a9c452df5' category='销售/临时销售计划（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempDiscard.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempDiscard</name>
<title>删除</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='f8c761cf-89ef-42d1-be32-bc5caf4d9f83' category='销售/临时销售计划（区域公司）' seq='4'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempEdit</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6534bd79-275f-48dc-8517-9b18c3837103' category='销售/临时销售计划（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanTempList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanTempList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='323b4db6-c42c-4c28-b0ef-c45dc8595820' category='销售/临时销售计划（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesPlanView.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesPlanView</name>
<title>查看</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='a4abfe2a-e30d-4f34-9773-61f7e73d11bb' category='销售/销售计划制定（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesWarningRecord.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesWarningRecordList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6725bdf5-bc4c-47cf-a875-7d6b588fd0a8' category='销售/销售预警' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesWarningSetCreate.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesWarningSetCreate</name>
<title>新建</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='3ebb4580-f283-46aa-a9b9-1ac4dc1b8b9e' category='销售/销售预警设置（区域公司）' seq='1'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesWarningSetEdit.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesWarningSetCreate</name>
<title>编辑</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='a2443637-34da-4f44-a949-dc0c1bcc65d3' category='销售/销售预警设置（区域公司）' seq='2'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/model/com/xyst/dinas/sales/auth/SalesWarningSetList.mk 0 → 100644
<model>
<header>
<type>bcp.authz.Privilege</type>
<package>com.xyst.dinas.sales.auth</package>
<name>SalesWarningSetList</name>
<title>列表</title>
<tags></tags>
<description></description>
</header>
<content>
<privilege type='TOKEN' target-type='' id='6b7480df-30a9-4a79-a4c0-eefb691c1cf1' category='销售/销售预警设置（区域公司）' seq='0'></privilege>
</content>
</model>
\ No newline at end of file
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/ProjectQueryView.jmx
...@@ -43,7 +43,8 @@ ...@@ -43,7 +43,8 @@
"name": "query_export", "name": "query_export",
"action": "query_export", "action": "query_export",
"title": "导出", "title": "导出",
"type": "" "type": "",
"privage": "com.xyst.dinas.project.auth.ProjectCompanyQueryExport"
} }
], ],
"table": { "table": {
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanDetailQueryView.jmx
...@@ -44,14 +44,6 @@ ...@@ -44,14 +44,6 @@
"action": "query_export", "action": "query_export",
"title": "导出", "title": "导出",
"type": "" "type": ""
},
{
"name": "queryRefresh",
"title": "刷新",
"action": "queryRefresh",
"param": [],
"type": "",
"enable": "ALL"
} }
], ],
"table": { "table": {
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/advanquery/SalesPlanQueryView.jmx
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
"action": "query_export", "action": "query_export",
"permissions":"test", "permissions":"test",
"title": "导出", "title": "导出",
"type": "" "type": "",
"privage": "com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseExport"
} }
], ],
"table": { "table": {
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesLedgerGroupExport.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>5bda1ed8-3cbe-409d-9b42-9d92e2865411</id>
<name>com.xyst.dinas.sales.auth.SalesLedgerGroupExport</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售台账（集团）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesLedgerGroupList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>288cd3f3-e78d-4a31-a3ef-06f50f281559</id>
<name>com.xyst.dinas.sales.auth.SalesLedgerGroupList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售台账（集团）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanAuditCheck.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>86f286b4-8f19-47a3-b07f-3c9a1ad0eaea</id>
<name>com.xyst.dinas.sales.auth.SalesPlanAuditCheck</name>
<title>审核</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划审核（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanAuditList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>e4e444bb-6d9c-4163-abe8-285ad01493ef</id>
<name>com.xyst.dinas.sales.auth.SalesPlanAuditList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划审核（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanEdit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>5fd306b2-5845-4b14-849e-6d4df50ab7a0</id>
<name>com.xyst.dinas.sales.auth.SalesPlanEdit</name>
<title>编辑</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划制定（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>31cf0ab5-dfa8-4fe5-909b-5aaffa86be25</id>
<name>com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划分析（集团）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseExport.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>7eeb0198-f226-400f-b971-ae307db5c88f</id>
<name>com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseExport</name>
<title>导出</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划分析（集团）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanGroupAnalyseList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>337839a4-e4dd-4d15-b384-e73ff5d4b7ec</id>
<name>com.xyst.dinas.sales.auth.SalesPlanGroupAnalyseList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划分析（集团）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanGroupCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>d56b497e-f09d-4533-b697-046b220cea90</id>
<name>com.xyst.dinas.sales.auth.SalesPlanGroupCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划查看（集团）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanGroupQuery.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>df501356-e91c-4a55-9bde-878c3dc0515f</id>
<name>com.xyst.dinas.sales.auth.SalesPlanGroupQuery</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划查看（集团）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>daa03568-cc8e-4f94-a997-bd9b3e78e52f</id>
<name>com.xyst.dinas.sales.auth.SalesPlanList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划制定（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempAuditCheck.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>7fff412d-352e-4695-b94c-1dfd8aa4dd07</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempAuditCheck</name>
<title>审核</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划审核（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempAuditList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>7c6ffc7b-e5a3-404d-ae51-49033d7721c2</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempAuditList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划审核（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempCard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>ad1fe218-fae1-45c2-beb2-443d685dfb96</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempCard</name>
<title>卡片查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划（区域公司）</m:category>
<m:seq>3</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>229bfcda-3bbc-4f7f-b998-972a9c452df5</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempDiscard.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>f8c761cf-89ef-42d1-be32-bc5caf4d9f83</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempDiscard</name>
<title>删除</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划（区域公司）</m:category>
<m:seq>4</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempEdit.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>6534bd79-275f-48dc-8517-9b18c3837103</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempEdit</name>
<title>编辑</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划（区域公司）</m:category>
<m:seq>2</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanTempList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>323b4db6-c42c-4c28-b0ef-c45dc8595820</id>
<name>com.xyst.dinas.sales.auth.SalesPlanTempList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/临时销售计划（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesPlanView.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>a4abfe2a-e30d-4f34-9773-61f7e73d11bb</id>
<name>com.xyst.dinas.sales.auth.SalesPlanView</name>
<title>查看</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售计划制定（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesWarningRecordList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>6725bdf5-bc4c-47cf-a875-7d6b588fd0a8</id>
<name>com.xyst.dinas.sales.auth.SalesWarningRecordList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售预警</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesWarningSetCreate.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>3ebb4580-f283-46aa-a9b9-1ac4dc1b8b9e</id>
<name>com.xyst.dinas.sales.auth.SalesWarningSetCreate</name>
<title>新建</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售预警设置（区域公司）</m:category>
<m:seq>1</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/auth/SalesWarningSetList.jmx 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-privilege">
<specification>1.0</specification>
<id>6b7480df-30a9-4a79-a4c0-eefb691c1cf1</id>
<name>com.xyst.dinas.sales.auth.SalesWarningSetList</name>
<title>列表</title>
<define>bcp.authz.privilege</define>
<define-version>1.0.0</define-version>
<content>
<m:privilege>
<m:type>TOKEN</m:type>
<m:category>销售/销售预警设置（区域公司）</m:category>
<m:seq>0</m:seq>
</m:privilege>
</content>
</metadata>
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlan.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification> <specification>1.0</specification>
<id>0d503f87-930b-4da0-8a99-44a3b0568e50</id> <id>7c0128a3-7732-4647-b13d-d561ed6f912e</id>
<name>com.xyst.dinas.sales.bill.SalesPlan</name> <name>com.xyst.dinas.sales.bill.SalesPlan</name>
<title>销售计划</title> <title>销售计划</title>
<description>销售计划</description> <description>销售计划</description>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$sequence.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
<specification>1.0</specification> <specification>1.0</specification>
<id>e50bb764-d174-414e-9118-ee68bd0d0b79</id> <id>db914fe2-38f6-4129-9a57-17c4692bce74</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name> <name>com.xyst.dinas.sales.bill.SalesPlanTemp$sequence</name>
<title>临时销售计划$sequence</title> <title>临时销售计划$sequence</title>
<define>bcp.sequence</define> <define>bcp.sequence</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp$serial.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-serial">
<specification>1.0</specification> <specification>1.0</specification>
<id>345ae8cf-1195-49f4-ae8a-f4f2524ec58d</id> <id>a5d01360-59b4-44f8-a9e3-789c607f7ced</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name> <name>com.xyst.dinas.sales.bill.SalesPlanTemp$serial</name>
<title>临时销售计划$serial</title> <title>临时销售计划$serial</title>
<define>bcp.serial</define> <define>bcp.serial</define>
......
backend/xyst.dinas.sales/src/main/resources/com/xyst/dinas/sales/bill/SalesPlanTemp.jmx
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-biztype">
<specification>1.0</specification> <specification>1.0</specification>
<id>875844e7-af82-42a0-bf78-39b0876b4c04</id> <id>fb67050b-bbca-4075-8fe2-7e83ba188ad3</id>
<name>com.xyst.dinas.sales.bill.SalesPlanTemp</name> <name>com.xyst.dinas.sales.bill.SalesPlanTemp</name>
<title>临时销售计划</title> <title>临时销售计划</title>
<define>bcp.biz.Biztype</define> <define>bcp.biz.Biztype</define>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment