From f7dd854487d8d6938a7337d6f76e90407b5e5147 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 19 Nov 2020 10:43:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF-=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/controller/IssueCustomerParameterController.java  | 2 +-
 .../service/impl/IssueCustomerParameterServiceImpl.java     | 1 +
 .../controller/CustomerProjectParameterController.java      | 2 +-
 .../service/impl/CustomerProjectParameterServiceImpl.java   | 6 ++++++
 .../main/resources/mapper/CustomerProjectParameterDao.xml   | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
index a7164ec296..a9353aea01 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCustomerParameterController.java
@@ -116,7 +116,7 @@ public class IssueCustomerParameterController {
      */
     @PostMapping("reviewsave")
     public Result reviewSave(@RequestBody ParameterFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
         issueCustomerParameterService.reviewSave(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
index 4048fec972..edfdc7e391 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueCustomerParameterServiceImpl.java
@@ -145,6 +145,7 @@ public class IssueCustomerParameterServiceImpl extends BaseServiceImpl<IssueCust
         entity.setParameterKey(IssueConstant.AUDIT_SWITCH);
         entity.setParameterName(IssueConstant.AUDIT_SWITCH_NAME);
         entity.setParameterValue(formDTO.getAuditSwitch());
+        entity.setDescription("已开启审核：open； 无需审核：close");
         insert(entity);
     }
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
index e9b60a9a4c..2dbe8c0663 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/CustomerProjectParameterController.java
@@ -116,7 +116,7 @@ public class CustomerProjectParameterController {
      */
     @PostMapping("remindsave")
     public Result remindSave(@RequestBody ParameterFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
         customerProjectParameterService.remindSave(formDTO);
         return new Result();
     }
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
index 14e691ccdc..081a5959a0 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/CustomerProjectParameterServiceImpl.java
@@ -230,6 +230,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         detentionDays.setParameterKey(ParameterKeyConstant.DETENTION_DAYS);
         detentionDays.setParameterValue(formDTO.getDetentionDays());
         detentionDays.setParameterName(ParameterKeyConstant.DETENTION_DAYS_NAME);
+        detentionDays.setDescription("默5天");
         list.add(detentionDays);
         //计算方式 工作日work  日历天calendar
         CustomerProjectParameterEntity calculation = new CustomerProjectParameterEntity();
@@ -237,6 +238,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         calculation.setParameterKey(ParameterKeyConstant.CALCULATION);
         calculation.setParameterValue(formDTO.getCalculation());
         calculation.setParameterName(ParameterKeyConstant.CALCULATION_NAME);
+        calculation.setDescription("计算方式 工作日work  日历天calendar");
         list.add(calculation);
         //即将超期提醒时间
         CustomerProjectParameterEntity remindTime = new CustomerProjectParameterEntity();
@@ -244,6 +246,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         remindTime.setParameterKey(ParameterKeyConstant.REMIND_TIME);
         remindTime.setParameterValue(formDTO.getRemindTime());
         remindTime.setParameterName(ParameterKeyConstant.REMIND_TIME_NAME);
+        remindTime.setDescription("默认 当天");
         list.add(remindTime);
         //推送时间
         CustomerProjectParameterEntity pushTime = new CustomerProjectParameterEntity();
@@ -251,6 +254,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         pushTime.setParameterKey(ParameterKeyConstant.PUSH_TIME);
         pushTime.setParameterValue(formDTO.getPushTime());
         pushTime.setParameterName(ParameterKeyConstant.PUSH_TIME_NAME);
+        pushTime.setDescription("默认 上午8点");
         list.add(pushTime);
         //设定核算单位天开始时间
         CustomerProjectParameterEntity startTime = new CustomerProjectParameterEntity();
@@ -258,6 +262,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         startTime.setParameterKey(ParameterKeyConstant.START_TIME);
         startTime.setParameterValue(formDTO.getStartTime());
         startTime.setParameterName(ParameterKeyConstant.START_TIME_NAME);
+        startTime.setDescription("默认 00:00:00");
         list.add(startTime);
        //设定核算单位天结束时间
         CustomerProjectParameterEntity endTime = new CustomerProjectParameterEntity();
@@ -265,6 +270,7 @@ public class CustomerProjectParameterServiceImpl extends BaseServiceImpl<Custome
         endTime.setParameterKey(ParameterKeyConstant.END_TIME);
         endTime.setParameterValue(formDTO.getEndTime());
         endTime.setParameterName(ParameterKeyConstant.END_TIME_NAME);
+        endTime.setDescription("默认 23:59:00");
         list.add(endTime);
         insertBatch(list);
 
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
index b81ddc5945..0f9a7aeef7 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/CustomerProjectParameterDao.xml
@@ -31,6 +31,7 @@
     </select>
     <select id="getParameterByCustomer" resultType="com.epmet.dto.CustomerProjectParameterDTO">
         select
+            PARAMETER_KEY,
             PARAMETER_NAME,
             PARAMETER_VALUE
         from