【网格实体化运作】-【初审】-（王童）-2020/12/8

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/SubAuditRecordsLogService.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.SubAuditRecordsLogDTO;
+import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubAuditRecordsLogEntity;
 
 import java.util.List;
@@ -99,4 +101,13 @@ public interface SubAuditRecordsLogService extends BaseService<SubAuditRecordsLo
      * @date 2020-12-07
      */
     void delete(String[] ids);
+
+    /**
+    * @describe:
+    * @author wangtong
+    * @date 2020/12/8 15:27
+    * @params [dto]
+    * @return void
+    */
+    Result addFirstTrialRecords(FirstTrialFormDTO dto);
 }

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

@@ -24,6 +24,7 @@ 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.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -103,4 +104,13 @@ public interface SubPositionCheckInfoService extends BaseService<SubPositionChec
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     Result firstTrial(FirstTrialFormDTO dto);
+
+    /**
+    * @describe:  生成当前时间的 年月日 时分秒 字符串格式
+    * @author wangtong
+    * @date 2020/12/8 15:33
+    * @params [date]
+    * @return java.lang.String
+    */
+    String dateToString(Date date);
 }

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

@@ -20,20 +20,25 @@ 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.security.user.SecurityUser;
 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.SubAuditRecordsLogDao;
 import com.elink.esua.epdc.dto.SubAuditRecordsLogDTO;
+import com.elink.esua.epdc.dto.form.FirstTrialFormDTO;
 import com.elink.esua.epdc.entity.SubAuditRecordsLogEntity;
 import com.elink.esua.epdc.redis.SubAuditRecordsLogRedis;
 import com.elink.esua.epdc.service.SubAuditRecordsLogService;
+import com.elink.esua.epdc.service.SubPositionCheckInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -49,6 +54,9 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl<SubAuditRecor
     @Autowired
     private SubAuditRecordsLogRedis subAuditRecordsLogRedis;
 
+    @Autowired
+    private SubPositionCheckInfoService subPositionCheckInfoService;
+
     @Override
     public PageData<SubAuditRecordsLogDTO> page(Map<String, Object> params) {
         IPage<SubAuditRecordsLogEntity> page = baseDao.selectPage(
@@ -113,4 +121,18 @@ public class SubAuditRecordsLogServiceImpl extends BaseServiceImpl<SubAuditRecor
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result addFirstTrialRecords(FirstTrialFormDTO dto) {
+        SubAuditRecordsLogEntity entity = new SubAuditRecordsLogEntity();
+        entity.setCheckDeptId(SecurityUser.getUser().getDeptId().toString());
+        entity.setCheckDeptName(SecurityUser.getUser().getDeptName());
+        entity.setCheckTime(subPositionCheckInfoService.dateToString(new Date()));
+        entity.setCheckResult(dto.getCheckResult());
+        entity.setCheckOpinion(dto.getCheckOpinion());
+        entity.setProcessCode("2");
+        entity.setProcessName("初审");
+        insert(entity);
+        return new Result();
+    }
+
 }

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

@@ -23,6 +23,7 @@ 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.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.SubPositionCheckInfoDao;
@@ -30,13 +31,16 @@ 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.SubAuditRecordsLogService;
 import com.elink.esua.epdc.service.SubPositionCheckInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -52,6 +56,9 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
     @Autowired
     private SubPositionCheckInfoRedis subPositionCheckInfoRedis;
 
+    @Autowired
+    private SubAuditRecordsLogService subAuditRecordsLogService;
+
     @Override
     public PageData<SubPositionCheckInfoDTO> page(Map<String, Object> params) {
         IPage<SubPositionCheckInfoDTO> page = getPage(params);
@@ -106,15 +113,27 @@ public class SubPositionCheckInfoServiceImpl extends BaseServiceImpl<SubPosition
     public Result firstTrial(FirstTrialFormDTO dto) {
         SubPositionCheckInfoEntity entity = baseDao.selectById(dto.getInfoId());
         if(entity ==  null){
-            throw  new RenException("根据id未查询到信息");
+            throw new RenException("根据id未查询到信息");
         }
         entity.setStatus(dto.getCheckResult());
-//        entity.setApprovalDeptId();
-//        entity.setApprovalDeptName();
-//        entity.setApprovalTime();
+        entity.setApprovalDeptId(SecurityUser.getUser().getDeptId().toString());
+        entity.setApprovalDeptName(SecurityUser.getUser().getDeptName());
+        entity.setApprovalTime(dateToString(new Date()));
         updateById(entity);
-        //生成初审记录信息
-        return null;
+        //添加初审记录信息
+        subAuditRecordsLogService.addFirstTrialRecords(dto);
+        return new Result();
+    }
+
+    /**
+     *
+     * @param date 时间格式
+     * @return 年月日 时分秒 字符串格式
+     */
+    @Override
+    public String dateToString(Date date){
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(date);
     }
 
 }