From 2526362ac2a085815f2e39c7ff6e6dd8374cdaa6 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Tue, 8 Dec 2020 14:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=BD=91=E6=A0=BC=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E5=8C=96=E8=BF=90=E5=81=9A=E3=80=91-=E3=80=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E5=90=8D=E3=80=91-=EF=BC=88?= =?UTF-8?q?=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/12/8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/SubAuditRecordsLogDTO.java | 5 +-- .../epdc/dto/SubPositionCheckInfoDTO.java | 2 +- .../esua/epdc/dto/form/FirstTrialFormDTO.java | 35 +++++++++++++++++++ .../SubPositionCheckInfoController.java | 16 ++++++++- .../epdc/entity/SubAuditRecordsLogEntity.java | 2 +- .../entity/SubPositionCheckInfoEntity.java | 2 +- .../service/SubPositionCheckInfoService.java | 11 ++++++ .../impl/SubPositionCheckInfoServiceImpl.java | 10 +++++- .../mapper/SubAuditRecordsLogDao.xml | 2 +- .../mapper/SubPositionCheckInfoDao.xml | 3 +- 10 files changed, 79 insertions(+), 9 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java index cb3187c55..11307507a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubAuditRecordsLogDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -46,7 +47,7 @@ public class SubAuditRecordsLogDTO implements Serializable { /** * 审核部门名称 */ - private String checkDeptNaem; + private String checkDeptName; /** * 审核时间 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java index 80ffc9d61..753d307be 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java @@ -107,7 +107,7 @@ public class SubPositionCheckInfoDTO implements Serializable { /** * 创建时间 */ - private Date createdTime1; + private Date createdTime; /** * 更新人 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java new file mode 100644 index 000000000..9b47d7c3c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/form/FirstTrialFormDTO.java @@ -0,0 +1,35 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * @program: esua-epdc + * @description: 初审传参 + * @author: wangtong + * @create: 2020-12-08 14:46 + **/ +@Data +public class FirstTrialFormDTO implements Serializable { + + /** + *信息id + */ + @NotNull(message = "信息ID不能为空") + private String infoId; + + /** + * 审核结果（1：驳回；2：通过） + */ + @NotNull(message = "审核结果不能为空") + private String checkResult; + + /** + * 审核意见 + */ + @Size(min = 1, max = 200, message = "审核意见在200字以内") + private String checkOpinion; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java index f943d8e8f..e0f84616a 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckInfoController.java @@ -23,9 +23,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; -import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO; +import com.elink.esua.epdc.dto.form.FirstTrialFormDTO; import com.elink.esua.epdc.excel.SubPositionCheckInfoExcel; import com.elink.esua.epdc.service.SubPositionCheckInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +92,17 @@ public class SubPositionCheckInfoController { ExcelUtils.exportExcelToTarget(response, null, list, SubPositionCheckInfoExcel.class); } + + /** + * @describe: 初审 + * @author wangtong + * @date 2020/12/8 14:45 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping + public Result firstTrial(@RequestBody FirstTrialFormDTO dto){ + return subPositionCheckInfoService.firstTrial(dto); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubAuditRecordsLogEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubAuditRecordsLogEntity.java index a1617656c..184cec178 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubAuditRecordsLogEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubAuditRecordsLogEntity.java @@ -43,7 +43,7 @@ public class SubAuditRecordsLogEntity extends BaseEpdcEntity { /** * 审核部门名称 */ - private String checkDeptNaem; + private String checkDeptName; /** * 审核时间 diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java index d0f7ec969..c2c950478 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java @@ -86,6 +86,6 @@ public class SubPositionCheckInfoEntity extends BaseEpdcEntity { /** * 创建时间 */ - private Date createdTime1; + private Date createdTime; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java index d6b717fa1..efc5fcd2e 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubPositionCheckInfoService.java @@ -19,7 +19,9 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO; +import com.elink.esua.epdc.dto.form.FirstTrialFormDTO; import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity; import java.util.List; @@ -92,4 +94,13 @@ public interface SubPositionCheckInfoService extends BaseService - + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml index 714d7643d..a992acca4 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml @@ -17,7 +17,7 @@ - + @@ -43,6 +43,7 @@ and date_format(SUBMIT_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime} + order by CREATED_TIME desc