Merge remote-tracking branch 'origin/feature/subCheck' into feature/subCheck

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;
 
     /**
      * 审核时间

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;
 
     /**
      * 更新人

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;
+}

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);
+    }
+
 }

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;
 
     /**
      * 审核时间

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;
 
 }

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<SubPositionChec
      * @date 2020-12-07
      */
     void delete(String[] ids);
+
+    /**
+    * @describe: 初审
+    * @author wangtong
+    * @date 2020/12/8 14:45
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result firstTrial(FirstTrialFormDTO dto);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/SubPositionCheckInfoServiceImpl.java

@@ -20,11 +20,13 @@ package com.elink.esua.epdc.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SubPositionCheckInfoDao;
 import com.elink.esua.epdc.dto.SubPositionCheckInfoDTO;
+import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubPositionCheckInfoEntity;
 import com.elink.esua.epdc.redis.SubPositionCheckInfoRedis;
 import com.elink.esua.epdc.service.SubPositionCheckInfoService;
@@ -99,4 +101,10 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result firstTrial(FirstTrialFormDTO dto) {
+
+        return null;
+    }
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubAuditRecordsLogDao.xml

@@ -6,7 +6,7 @@
     <resultMap type="com.elink.esua.epdc.entity.SubAuditRecordsLogEntity" id="subAuditRecordsLogMap">
         <result property="id" column="ID"/>
         <result property="checkDeptId" column="CHECK_DEPT_ID"/>
-        <result property="checkDeptNaem" column="CHECK_DEPT_NAEM"/>
+        <result property="checkDeptName" column="CHECK_DEPT_NAME"/>
         <result property="checkTime" column="CHECK_TIME"/>
         <result property="checkResult" column="CHECK_RESULT"/>
         <result property="checkOpinion" column="CHECK_OPINION"/>

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/SubPositionCheckInfoDao.xml

@@ -17,7 +17,7 @@
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="revision" column="REVISION"/>
         <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime1" column="CREATED_TIME1"/>
+        <result property="createdTime" column="CREATED_TIME"/>
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
@@ -43,6 +43,7 @@
               <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                   and date_format(SUBMIT_TIME,'%Y-%m-%d') BETWEEN #{startTime} AND #{endTime}
               </if>
+        order by CREATED_TIME desc
     </select>