解决冲突

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceRectificationOrderMapper.xml

@@ -7,7 +7,13 @@
             ph.peasant_household_no as powerStationCode,
             ph.owners_name AS ownersName,
             ph.project_address_name AS powerStationAddress,
-            IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, aro.rectification_status) AS rectificationStatus
+            aro.rectification_status AS rectificationStatus,
+            CASE aro.rectification_status
+                WHEN 1 THEN '待整改'
+                WHEN 2 THEN '整改未完成'
+                WHEN 3 THEN '整改已完成'
+                ELSE ''
+            END AS rectificationStatusDesc
         FROM
             hygf_acceptance_rectification_order aro
                  LEFT JOIN hygf_basic_grid_acceptance bga ON bga.peasant_household_id = aro.peasant_household_id
@@ -30,7 +36,13 @@
             ph.peasant_household_no as powerStationCode,
             ph.owners_name AS ownersName,
             ph.project_address_name AS powerStationAddress,
-            IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, aro.rectification_status) AS rectificationStatus
+            aro.rectification_status AS rectificationStatus,
+            CASE aro.rectification_status
+                WHEN 1 THEN '待整改'
+                WHEN 2 THEN '整改未完成'
+                WHEN 3 THEN '整改已完成'
+                ELSE ''
+            END AS rectificationStatusDesc
         FROM
             hygf_acceptance_rectification_order aro
                 LEFT JOIN hygf_basic_grid_acceptance bga ON bga.peasant_household_id = aro.peasant_household_id

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
-import com.yeejoin.amos.boot.module.hygf.api.Enum.RectificationStatusEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.AcceptanceRectificationOrderDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StandardDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.VariableDto;
@@ -52,9 +51,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 分页查询
      */
     public Page<AcceptanceRectificationOrderDto> queryForAcceptanceRectificationOrderPage(Page<AcceptanceRectificationOrderDto> page, Long acceptanceSeqNbr) {
-        Page<AcceptanceRectificationOrderDto> resultPage = acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
-        resultPage.getRecords().forEach(v -> v.setRectificationStatusDesc(RectificationStatusEnum.getNodeByCode(Integer.parseInt(v.getRectificationStatus())).getName()));
-        return resultPage;
+        return acceptanceRectificationOrderMapper.page(page, acceptanceSeqNbr);
     }
 
     /**
@@ -88,7 +85,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
      * 提交整改并触发工作流
      */
 
-    public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model,String userId) {
+    public AcceptanceRectificationOrderDto updateAndDriveWorkflow(AcceptanceRectificationOrderDto model, String userId) {
         ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 
         // 提交整改信息