企业上报接口，可同时完成：新增 or 修改 操作

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -434,7 +434,7 @@ public class ApiCustomInfoController {
         return customService.getEnterpriseReportList(id);
     }
     /**
-     * @Description  新增企业上报
+     * @Description  新增 or 修改 企业上报
      * @Author songyunpeng
      * @Date  2021/8/2
      * @Param [enterpriseReportAddFormDTO]

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- *
+ * 新增 or 修改 企业上报
  *
  * @author songyunpeng
  * @since v1.0.0 2020-05-20
@@ -17,6 +17,14 @@ import java.math.BigDecimal;
 public class EnterpriseReportAddFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 企业信息上报表 ID
+     *  不为空、不为null 则本次操作为 修改；
+     *  否则，本次操作为 新增；
+     */
+    private String id;
+
     /**
      * 企业所属网格ID
      */

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

@@ -90,7 +90,7 @@ public class EnterpriseReportController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<EnterpriseReportDTO> list = enterpriseReportService.list(params);
-        ExcelUtils.exportExcelToTarget(response, "上报企业信息导出表", list, EnterpriseReportExcel.class);
+        ExcelUtils.exportExcelToTarget(response, "企业信息上报表", list, EnterpriseReportExcel.class);
     }
 
     /**

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/enterprisereport/excel/EnterpriseReportExcel.java

@@ -32,13 +32,7 @@ import java.util.Date;
 @Data
 public class EnterpriseReportExcel {
 
-    /*@Excel(name = "ID")
-    private String id;*/
-
-    /*@Excel(name = "企业所属网格ID")
-    private String gridId;*/
-
-    @Excel(name = "企业所属网格")
+    @Excel(name = "网格")
     private String grid;
 
     @Excel(name = "所属年度")
@@ -59,65 +53,10 @@ public class EnterpriseReportExcel {
     @Excel(name = "公司状态")
     private String enterpriseStatus;
 
-    @Excel(name = "营业收入")
+    @Excel(name = "营业收入(单位：万元)")
     private BigDecimal enterpriseIncome;
 
     @Excel(name = "用工人数")
     private Integer enterprisePeopleNum;
 
-    /*@Excel(name = "发布人所属网格")
-    private Long dept;
-
-    @Excel(name = "发布人所属网格ID")
-    private String deptId;
-
-    @Excel(name = "发布人ID")
-    private String userId;
-
-    @Excel(name = "发布人昵称")
-    private String nickname;
-
-    @Excel(name = "发布人手机号")
-    private String mobile;
-
-    @Excel(name = "发布人头像")
-    private String faceImg;
-
-    @Excel(name = "发布人真实姓名")
-    private String realName;
-
-    @Excel(name = "问题")
-    private String question;
-
-    @Excel(name = "删除标识 0：未删除，1：已删除")
-    private String delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-    @Excel(name = "企业父所有部门")
-    private String parentDeptIds;
-
-    @Excel(name = "企业父所有部门")
-    private String parentDeptNames;
-
-    @Excel(name = "企业所有部门ID")
-    private String allDeptIds;
-
-    @Excel(name = "企业所有部门名称")
-    private String allDeptNames;*/
-
-
 }

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

@@ -76,12 +76,14 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
     public List<EnterpriseReportDTO> list(Map<String, Object> params) {
         UserDetail userDetail = SecurityUser.getUser();
         if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
-            return new ArrayList<EnterpriseReportDTO>();
+            return new ArrayList<>();
         }
         params.put("deptIdList", userDetail.getDeptIdList());
         List<EnterpriseReportEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, EnterpriseReportDTO.class);
+        List<EnterpriseReportDTO> result = ConvertUtils.sourceToTarget(entityList, EnterpriseReportDTO.class);
+        //处理字典信息
+        formatList(result);
+        return result;
     }
 
     private QueryWrapper<EnterpriseReportEntity> getWrapper(Map<String, Object> params){
@@ -107,6 +109,7 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
         wrapper.like(StringUtils.isNotBlank(concat), "CONCAT", concat);
         wrapper.eq(StringUtils.isNotBlank(enterpriseStatus), "ENTERPRISE_STATUS", enterpriseStatus);
         wrapper.in("GRID_ID",deptIdList);
+        wrapper.orderByDesc("ENTERPRISE_INCOME", "ENTERPRISE_PEOPLE_NUM");
         return wrapper;
     }
 
@@ -203,18 +206,23 @@ public class EnterpriseReportServiceImpl extends BaseServiceImpl<EnterpriseRepor
         enterpriseReportEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
         enterpriseReportEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
         enterpriseReportEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
-        //校验唯一性
+        // 根据 【公司名称、所属年度、所属季度】 校验唯一性，如果匹配到数据，则修改。如果没匹配到数据，则新增
         QueryWrapper<EnterpriseReportEntity> entityQueryWrapper =new QueryWrapper<>();
         entityQueryWrapper.eq("YEAR",enterpriseReportAddFormDTO.getYear());
         entityQueryWrapper.eq("QUARTER",enterpriseReportAddFormDTO.getQuarter());
         entityQueryWrapper.eq("ENTERPRISE_NAME",enterpriseReportAddFormDTO.getEnterpriseName());
         List<EnterpriseReportEntity> enterpriseReportEntities = baseDao.selectList(entityQueryWrapper);
-        String infoModifyId = enterpriseReportAddFormDTO.getInfoModifyId();
-        if(enterpriseReportEntities.size()>1 ||infoModifyId.length()>0){
+        if(enterpriseReportEntities.size() > 0) {
             enterpriseReportEntity.setId(enterpriseReportEntities.get(0).getId());
             baseDao.updateById(enterpriseReportEntity);
             return new Result();
         }
+        // 企业信息上报表主键，如果有值 则修改； 值为 NULL 或 "" 则新增；
+        if (StringUtils.isNotBlank(enterpriseReportAddFormDTO.getId())) {
+            enterpriseReportEntity.setId(enterpriseReportAddFormDTO.getId());
+            baseDao.updateById(enterpriseReportEntity);
+            return new Result();
+        }
         insert(enterpriseReportEntity);
         return new Result();
     }