【pc端 -新增网格实体化详情】【修改数据接口】魏凯 2020-12-8

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/SubPositionCheckInfoDTO.java

@@ -125,4 +125,21 @@ public class SubPositionCheckInfoDTO implements Serializable {
      */
 	private Boolean delShow;
 
+    /**
+     * 新增冗余字段 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 新增冗余字段 父所有部门名称
+     */
+    private String parentDeptNames;
+    /**
+     * 新增冗余字段 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 新增冗余字段 所有部门名称
+     */
+    private String allDeptNames;
+
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/controller/SubPositionCheckDetailController.java

@@ -119,4 +119,11 @@ public class SubPositionCheckDetailController {
         subPositionCheckDetailService.saveInfoDetailList(dto);
         return new Result();
     }
+    @PutMapping("addDetail")
+    public Result updateDetail(@RequestBody KpiSubCheckDetailFormDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        subPositionCheckDetailService.saveInfoDetailList(dto);
+        return new Result();
+    }
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubFileImgDao.java

@@ -30,4 +30,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SubFileImgDao extends BaseDao<SubFileImgEntity> {
 
+    /*
+     *
+     * 根据详情id删除文件数据
+     * @param detailId
+     * @author wk
+     * @date 2020-12-08 17:41
+     * @return void
+     */
+    void deleteByDetailId(String detailId);
+	
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/SubPositionCheckDetailDao.java

@@ -17,10 +17,14 @@
 
 package com.elink.esua.epdc.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.entity.SubPositionCheckDetailEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 阵地建设考核内容提报详情表 
  *
@@ -30,4 +34,22 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SubPositionCheckDetailDao extends BaseDao<SubPositionCheckDetailEntity> {
 
+    /*
+     *
+     * 根据infoid查询考核详情
+     * @param infoId
+     * @author wk
+     * @date 2020-12-08 17:32
+     * @return java.util.List<com.elink.esua.epdc.entity.SubPositionCheckDetailEntity>
+     */
+    List<SubPositionCheckDetailEntity> selectCheckDetailByInfoId(String infoId);
+
+    /*
+     *
+     * 根据infoid删除所有相关信息
+     * @author wk
+     * @date 2020-12-08 17:44
+     * @return void
+     */
+    void deleteByInfｏIdAfter(String infoId);
 }

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/SubPositionCheckInfoEntity.java

@@ -87,5 +87,21 @@ public class SubPositionCheckInfoEntity extends BaseEpdcEntity {
      * 创建时间
      */
 	private Date createdTime;
+	/**
+	 * 新增冗余字段 父所有部门ID
+	 */
+	private String parentDeptIds;
+	/**
+	 * 新增冗余字段 父所有部门名称
+	 */
+	private String parentDeptNames;
+	/**
+	 * 新增冗余字段 所有部门ID
+	 */
+	private String allDeptIds;
+	/**
+	 * 新增冗余字段 所有部门名称
+	 */
+	private String allDeptNames;
 
 }

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

@@ -113,4 +113,15 @@ public interface SubPositionCheckDetailService extends BaseService<SubPositionCh
      * @return void
      */
     void saveInfoDetailList(KpiSubCheckDetailFormDTO dto);
+
+
+    /*
+     *
+     * 提报详情 - 修改
+     * @param dto
+     * @author wk
+     * @date 2020-12-08 15:38
+     * @return void
+     */
+    void updateInfoDetailList(KpiSubCheckDetailFormDTO dto);
 }

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

@@ -29,6 +29,7 @@ import com.elink.esua.epdc.dao.SubAuditRecordsLogDao;
 import com.elink.esua.epdc.dao.SubFileImgDao;
 import com.elink.esua.epdc.dao.SubPositionCheckDetailDao;
 import com.elink.esua.epdc.dao.SubPositionCheckInfoDao;
+import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
 import com.elink.esua.epdc.dto.SubPositionCheckDetailDTO;
 import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.KpiGridIdsFormDTO;
@@ -158,6 +159,25 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
 
 
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateInfoDetailList(KpiSubCheckDetailFormDTO dto) {
+        //先删除 在添加 1、根据infoid查询出它的详情 - 删除 2、根据详情id删除所有的文件信息
+        String infoId = dto.getInfoId();
+        String[] grids =  dto.getGridIds();
+        SubPositionCheckInfoEntity entity = infoDao.selectById(infoId);
+        String gridIds =     gridIds(grids);
+        String gridNames =      gridNames(grids);
+        entity.setGridIds(gridIds);
+        entity.setGridNames(gridNames);
+        infoDao.updateById(entity);
+        //查询所有详情信息
+       List<SubPositionCheckDetailEntity> list =  baseDao.selectCheckDetailByInfoId(infoId);
+       updateDetailInfo(infoId,list,dto);
+
+    }
+
     /*
      * 
      * 存info表中数据
@@ -190,6 +210,13 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         checkInfoEntity.setGridNames(gridNames);
         checkInfoEntity.setSubmitTime(sdf1.format(date));
         checkInfoEntity.setStatus("1");
+        //查询冗余字段信息
+        Result<DeptLevelAndLeaderDTO> allDeptInfos = adminFeignClient.getDeptInfoById(deptId,"0");
+        DeptLevelAndLeaderDTO deptLevelAndLeaderDto =   allDeptInfos.getData();
+        checkInfoEntity.setParentDeptIds(deptLevelAndLeaderDto.getParentDeptIds());
+        checkInfoEntity.setParentDeptNames(deptLevelAndLeaderDto.getParentDeptNames());
+        checkInfoEntity.setAllDeptIds(deptLevelAndLeaderDto.getAllDeptIds());
+        checkInfoEntity.setAllDeptNames(deptLevelAndLeaderDto.getAllDeptNames());
         infoDao.insert(checkInfoEntity);
         return checkInfoEntity.getId();
     }
@@ -242,6 +269,10 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
               subFileImgEntity.setThumbnail(thumbnail[i]);
               fileImgDao.insert(subFileImgEntity);
           }
+      }else {
+          SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
+          subFileImgEntity.setDetailId(detailId);
+          fileImgDao.insert(subFileImgEntity);
       }
       String[]  files = dto.getFiles();
       if (files.length>0){
@@ -253,6 +284,11 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
               fileImgDao.insert(subFileImgEntity);
           }
       }
+      else {
+          SubFileImgEntity subFileImgEntity = new SubFileImgEntity();
+          subFileImgEntity.setDetailId(detailId);
+          fileImgDao.insert(subFileImgEntity);
+      }
     }
 
     /*
@@ -279,6 +315,29 @@ public class SubPositionCheckDetailServiceImpl extends BaseServiceImpl<SubPositi
         logDao.insert(entity);
     }
 
+    /*
+     *
+     * 更新阵地详情
+     * @param infoId
+     * @param list
+     * @author wk
+     * @date 2020-12-08 17:37
+     * @return void
+     */
+    void updateDetailInfo(String infoId,
+                          List<SubPositionCheckDetailEntity> list,
+                          KpiSubCheckDetailFormDTO dto){
+        for (SubPositionCheckDetailEntity entity:list) {
+           String detailId =  entity.getId();
+           //根据详情id查询所有文件信息
+            fileImgDao.deleteByDetailId(detailId);
+            //删除详情表所有相关数据
+            baseDao.selectCheckDetailByInfoId(infoId);
+        }
+        //添加相关数据
+        addDetailDate(infoId,dto.getInfoDetail());
+    }
+
     /*
      *
      * 拼接网格id

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

@@ -19,5 +19,10 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <delete id="deleteByDetailId">
+        DELETE FROM epdc_sub_file_img
+        WHERE DETAIL_ID = #{detailId}
+    </delete>
+
 
 </mapper>

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

@@ -18,5 +18,19 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectCheckDetailByInfoId" resultMap="subPositionCheckDetailMap">
+        SELECT * FROM epdc_sub_position_check_detail
+        WHERE DEL_FLAG = 0
+        and `INFＯ_ID` =#{infoId}
+    </select>
+
+    <delete id="deleteByInfｏIdAfter">
+        DELETE
+FROM
+	epdc_sub_position_check_detail
+WHERE
+	INFＯ_ID = #{infoId}
+    </delete>
+
 
 </mapper>