企业上报，增加编辑功能

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/EnterpriseReportDTO.java

@@ -174,4 +174,8 @@ public class EnterpriseReportDTO implements Serializable {
      */
 	private String allDeptNames;
 
+    /**
+     * 企业所有部门ID 数组
+     */
+	private String[] gridIdArray;
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/controller/EnterpriseReportController.java

@@ -75,8 +75,7 @@ public class EnterpriseReportController {
     public Result update(@RequestBody EnterpriseReportDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        enterpriseReportService.update(dto);
+        return enterpriseReportService.update(dto);
-        return new Result();
     }
 
     @DeleteMapping

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/EnterpriseReportService.java

@@ -84,7 +84,7 @@ public interface EnterpriseReportService extends BaseService<EnterpriseReportEnt
      * @author generator
      * @date 2021-08-02
      */
-    void update(EnterpriseReportDTO dto);
+    Result update(EnterpriseReportDTO dto);
 
     /**
      * 批量删除

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/service/impl/EnterpriseReportServiceImpl.java

@@ -22,6 +22,7 @@ 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.constant.NumConstant;
+import com.elink.esua.epdc.commons.tools.constant.StrConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@@ -116,7 +117,11 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
     @Override
     public EnterpriseReportDTO get(String id) {
         EnterpriseReportEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, EnterpriseReportDTO.class);
+        EnterpriseReportDTO result = ConvertUtils.sourceToTarget(entity, EnterpriseReportDTO.class);
+        if (StringUtils.isNotBlank(result.getAllDeptIds())) {
+            result.setGridIdArray(result.getAllDeptIds().split(StrConstant.COMMA));
+        }
+        return result;
     }
 
     @Override
@@ -128,9 +133,24 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(EnterpriseReportDTO dto) {
+    public Result update(EnterpriseReportDTO dto) {
+        // 根据 【公司名称、所属年度、所属季度】 校验唯一性，如果匹配到数据，则拒绝修改。
+        QueryWrapper<EnterpriseReportEntity> entityQueryWrapper =new QueryWrapper<>();
+        entityQueryWrapper.eq("YEAR", dto.getYear());
+        entityQueryWrapper.eq("QUARTER", dto.getQuarter());
+        entityQueryWrapper.eq("ENTERPRISE_NAME", dto.getEnterpriseName());
+        entityQueryWrapper.eq("DEL_FLAG", NumConstant.ZERO);
+        entityQueryWrapper.ne("ID", dto.getId());
+        List<EnterpriseReportEntity> entities = baseDao.selectList(entityQueryWrapper);
+        if(entities.size() > 0) {
+            Integer quarter = Integer.valueOf(entities.get(NumConstant.ZERO).getQuarter()) + NumConstant.ONE;
+            return new Result().error("拒绝修改！该 [" + entities.get(NumConstant.ZERO).getEnterpriseName() + "] 公司, " +
+                    entities.get(NumConstant.ZERO).getYear() + " 年第"+ quarter + "季度的企业上报记录已存在。");
+        }
+
         EnterpriseReportEntity entity = ConvertUtils.sourceToTarget(dto, EnterpriseReportEntity.class);
         updateById(entity);
+        return new Result();
     }
 
     @Override