From 849e0634fab58695e6197b9b89e340b2791294ad Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 17 七月 2023 18:09:25 +0800
Subject: [PATCH] 合同和计划管理问题修改
---
igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java | 290 ++++++++++++++++++++++++++++++---------------------------
1 files changed, 151 insertions(+), 139 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
index b0bbda3..002ecde 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java
@@ -8,8 +8,8 @@
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.m.service.HPlanManageService;
import com.ld.igds.models.DicTrigger;
-import com.ld.igds.models.MPlan;
-import com.ld.igds.models.MPlanDetail;
+import com.ld.igds.models.InoutPlan;
+import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
@@ -23,160 +23,172 @@
/**
* 缁煎悎涓氬姟-璁″垝绠＄悊
- *
- * @author: chen
*
+ * @author: chen
*/
@Component
public class PlanManagePR {
- @Autowired
- private HPlanManageService service;
- @Autowired
- private SysDeptService sysDeptService;
+ @Autowired
+ private HPlanManageService service;
+ @Autowired
+ private SysDeptService sysDeptService;
- /**
- * planManagePR#getPlanTitle 鑾峰彇璁″垝title
- *
- * @param
- * @return
- */
- @DataProvider
- public Map<String, Object> getPlanTitle(Map<String, Object> param) {
- Map<String, Object> result = new HashMap<String, Object>();
- //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
- String type = (String)param.get("type");
+ /**
+ * planManagePR#getPlanTitle 鑾峰彇璁″垝title
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getPlanTitle(Map<String, Object> param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+ //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
+ String type = (String) param.get("type");
- //璁剧疆璁″垝title
- String title = "璁″垝";
- if(InoutManageUtil.PLAN_TYPE_1.equals(type)){
- title = "閲囪喘" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_2.equals(type)){
- title = "閿�鍞�" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_3.equals(type)){
- title = "杞崲" + title;
- }
- if(InoutManageUtil.PLAN_TYPE_4.equals(type)){
- title = "鍔犲伐" + title;
- }
+ //璁剧疆璁″垝title
+ String title = "璁″垝";
+ if (InoutManageUtil.PLAN_TYPE_1.equals(type)) {
+ title = "閲囪喘" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_2.equals(type)) {
+ title = "閿�鍞�" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_3.equals(type)) {
+ title = "杞崲" + title;
+ }
+ if (InoutManageUtil.PLAN_TYPE_4.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("planManagePR#triggerPlanType").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerPlanType() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 璁″垝绫诲瀷
+ * ${dorado.getDataProvider("planManagePR#triggerPlanType").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerPlanType() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_1, "閲囪喘璁″垝"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_2, "閿�鍞鍒�"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_3, "杞崲璁″垝"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_4, "鍔犲伐璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_1, "閲囪喘璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_2, "閿�鍞鍒�"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_3, "杞崲璁″垝"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_4, "鍔犲伐璁″垝"));
- return list;
- }
+ return list;
+ }
- /**
- * 杞崲璁″垝绫诲瀷
- * ${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}
- *
- * @return
- */
- @DataProvider
- public List<DicTrigger> triggerPlanTurn() {
- List<DicTrigger> list = new ArrayList<DicTrigger>();
+ /**
+ * 杞崲璁″垝绫诲瀷
+ * ${dorado.getDataProvider("planManagePR#triggerPlanTurn").getResult()}
+ *
+ * @return
+ */
+ @DataProvider
+ public List<DicTrigger> triggerPlanTurn() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_IN, "杞叆"));
- list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_OUT, "杞嚭"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_IN, "杞叆"));
+ list.add(new DicTrigger(InoutManageUtil.PLAN_TYPE_TURN_OUT, "杞嚭"));
- return list;
- }
+ return list;
+ }
- /**
- * 鑾峰彇璁″垝鍒楄〃
- * planManagePR#pagePlan
- *
- * @param page
- * @param param
- * @throws Exception
- */
- @DataProvider
- public void pagePlan(Page<MPlan> page, Map<String, Object> param) throws Exception {
- if (null == param) {
- param = new HashMap<String, Object>();
- }
- service.pagePlan(page, param);
- }
+ /**
+ * 鑾峰彇璁″垝鍒楄〃
+ * planManagePR#pagePlan
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pagePlan(Page<InoutPlan> page, Map<String, Object> param) throws Exception {
+ if (null == param) {
+ param = new HashMap<String, Object>();
+ }
+ service.pagePlan(page, param);
+ }
- /**
- * 鑾峰彇璁″垝璇︾粏鍒楄〃
- * planManagePR#listPlanDetail
- *
- * @param planId
- * @return
- */
- @DataProvider
- public List<MPlanDetail> listPlanDetail(String planId) {
- return service.listPlanDetail(planId);
- }
+ /**
+ * 鑾峰彇璁″垝璇︾粏鍒楄〃
+ * planManagePR#listPlan
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public List<InoutPlan> listPlan() {
+ return service.listPlan();
+ }
- /**
- * 淇濆瓨璁″垝
- * planManagePR#savePlan
- *
- * @param data
- */
- @DataResolver
- public void savePlan(MPlan data) {
- service.savePlan(data);
- }
- /**
- * 鍒犻櫎璁″垝
- * planManagePR#delPlan
- *
- * @param data
- * @return
- */
- @Expose
- public String delPlan(MPlan data) {
- return service.delPlan(data);
- }
-
- /**
- * 鍒犻櫎璁″垝璇︾粏淇℃伅
- * planManagePR#delPlanDetail
- *
- * @param data
- * @return
- */
- @Expose
- public String delPlanDetail(MPlanDetail data){
- return service.delPlanDetail(data);
- }
+ /**
+ * 鑾峰彇璁″垝璇︾粏鍒楄〃
+ * planManagePR#listPlanDetail
+ *
+ * @param planId
+ * @return
+ */
+ @DataProvider
+ public List<InoutPlanDetail> listPlanDetail(String planId) {
+ return service.listPlanDetail(planId);
+ }
+
+ /**
+ * 淇濆瓨璁″垝
+ * planManagePR#savePlan
+ *
+ * @param data
+ */
+ @DataResolver
+ public void savePlan(InoutPlan data) {
+ service.savePlan(data);
+ }
+
+ /**
+ * 鍒犻櫎璁″垝
+ * planManagePR#delPlan
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delPlan(InoutPlan data) {
+ return service.delPlan(data);
+ }
+
+ /**
+ * 鍒犻櫎璁″垝璇︾粏淇℃伅
+ * planManagePR#delPlanDetail
+ *
+ * @param data
+ * @return
+ */
+ @Expose
+ public String delPlanDetail(InoutPlanDetail data) {
+ return service.delPlanDetail(data);
+ }
}
--
Gitblit v1.9.3