From 44804e145dfd07f2537684a4358682774331cdaf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 25 七月 2023 17:44:16 +0800
Subject: [PATCH] 计划及合同相关优化
---
igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java | 226 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 122 insertions(+), 104 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
index 64a9d4a..47da457 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManagePR.java
@@ -22,125 +22,143 @@
/**
* 鍚堝悓绠＄悊
- *
- * @author:
*
+ * @author:
*/
@Component
public class ContractManagePR {
- @Autowired
- private HContractManageService service;
- @Autowired
- private SysDeptService sysDeptService;
+ @Autowired
+ private HContractManageService service;
+ @Autowired
+ private SysDeptService sysDeptService;
- /**
- * contractManagePR#getContractTitle 鑾峰彇鍚堝悓title
- *
- * @param
- * @return
- */
- @DataProvider
- public Map<String, Object> getContractTitle(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
- //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
- String type = (String)param.get("type");
+ /**
+ * contractManagePR#getContractTitle 鑾峰彇鍚堝悓title
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getContractTitle(Map<String, Object> param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
+ String type = (String) param.get("type");
- //璁剧疆璁″垝title
- String title = "鍚堝悓";
- if(InoutManageUtil.CONTRACT_TYPE_1.equals(type)){
- title = "閿�鍞�" + title;
- }
- if(InoutManageUtil.CONTRACT_TYPE_2.equals(type)){
- title = "閲囪喘" + title;
- }
- if(InoutManageUtil.CONTRACT_TYPE_3.equals(type)){
- title = "杞崲" + title;
- }
+ //璁剧疆璁″垝title
+ String title = "鍚堝悓";
+ if (InoutManageUtil.CONTRACT_TYPE_1.equals(type)) {
+ title = "閿�鍞�" + title;
+ }
+ if (InoutManageUtil.CONTRACT_TYPE_2.equals(type)) {
+ title = "閲囪喘" + title;
+ }
+ if (InoutManageUtil.CONTRACT_TYPE_3.equals(type)) {
+ title = "杞崲" + title;
+ }
- //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
- String deptId = (String)param.get("deptId");
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(null);
- }
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
- for (DefaultDept defaultDept : defaultDepts) {
- if(defaultDept.getId().equals(deptId)){
- deptName = defaultDept.getName();
- }
- }
+ //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
+ String deptId = (String) param.get("deptId");
+ if (StringUtils.isEmpty(deptId)) {
+ deptId = ContextUtil.subDeptId(null);
+ }
+ //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
+ String deptName = "";
+ List<DefaultDept> defaultDepts = sysDeptService.loadUserDepts(ContextUtil.getLoginUserName());
+ for (DefaultDept defaultDept : defaultDepts) {
+ if (defaultDept.getId().equals(deptId)) {
+ deptName = defaultDept.getName();
+ }
+ }
- if (StringUtils.isNotEmpty(deptName)) {
- title = deptName + " - " + title;
- }
- result.put("title", title);
- return result;
- }
+ if (StringUtils.isNotEmpty(deptName)) {
+ title = deptName + " - " + title;
+ }
+ result.put("title", title);
+ return result;
+ }
- /**
- * 鍚堝悓绫诲瀷
- * ${dorado.getDataProvider("contractManagePR#triggerContractType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerContractType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_1, "閿�鍞悎鍚�"));
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_2, "閲囪喘鍚堝悓"));
- list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "浠ｅ偍鍚堝悓"));
+ /**
+ * 鍚堝悓绫诲瀷
+ * ${dorado.getDataProvider("contractManagePR#triggerContractType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerContractType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_1, "閿�鍞悎鍚�"));
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_2, "閲囪喘鍚堝悓"));
+ list.add(new DicTrigger(InoutManageUtil.CONTRACT_TYPE_3, "浠ｅ偍鍚堝悓"));
- return list;
- }
+ return list;
+ }
- /**
- * 瀹㈡埛绫诲瀷
- * ${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerCustomerType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 瀹㈡埛绫诲瀷
+ * ${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerCustomerType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_1, "浼佷笟"));
- list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_2, "涓汉"));
+ list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_1, "浼佷笟"));
+ list.add(new DicTrigger(InoutManageUtil.CUSTOMER_TYPE_2, "涓汉"));
- return list;
- }
+ return list;
+ }
- /**
- * contractManagePR#pageContract
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
- if (null == param) {
- param = new HashMap<String, Object>();
- }
- service.pageContract(page, param);
- }
+ /**
+ * 涓�鑷存�х被鍨�
+ * ${dorado.getDataProvider("contractManagePR#triggerConsistency").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerConsistency() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- /**
- * contractManagePR#saveContract
- * @param data
- */
- @DataResolver
- public void saveContract(InoutContract data) {
- service.saveContract(data);
- }
+ list.add(new DicTrigger(InoutManageUtil.CONSISTENCY_1, "绗﹀悎"));
+ list.add(new DicTrigger(InoutManageUtil.CONSISTENCY_2, "涓嶇鍚�"));
- /**
- * contractManagePR#delContract
- * @param data
- * @return
- */
- @Expose
- public String delContract(InoutContract data) {
- return service.delContract(data);
- }
+ return list;
+ }
+
+ /**
+ * contractManagePR#pageContract
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageContract(Page<InoutContract> page, Map<String, Object> param) throws Exception {
+ if (null == param) {
+ param = new HashMap<String, Object>();
+ }
+ service.pageContract(page, param);
+ }
+
+ /**
+ * contractManagePR#saveContract
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveContract(InoutContract data) {
+ service.saveContract(data);
+ }
+
+ /**
+ * contractManagePR#delContract
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delContract(InoutContract data) {
+ return service.delContract(data);
+ }
}
--
Gitblit v1.9.3