解决冲突

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

@@ -7,7 +7,7 @@
             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, 1) AS rectificationStatus
+            IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, aro.rectification_status) AS rectificationStatus
         FROM
             hygf_acceptance_rectification_order aro
                  LEFT JOIN hygf_basic_grid_acceptance bga ON bga.peasant_household_id = aro.peasant_household_id
@@ -30,7 +30,7 @@
             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, 1) AS rectificationStatus
+            IF(aro.rectification_status IS NULL OR aro.rectification_status = '', 0, aro.rectification_status) AS rectificationStatus
         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

@@ -99,7 +99,7 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
         // 触发工作流
         BasicGridAcceptance basicGridAcceptance = basicGridAcceptanceMapper.selectOne(
                 Wrappers.<BasicGridAcceptance>lambdaQuery()
-                        .eq(BasicGridAcceptance::getWorkOrderPowerStationId, entity.getWorkOrderPowerStationId())
+                        .eq(BasicGridAcceptance::getPeasantHouseholdId, entity.getPeasantHouseholdId())
         );
         basicGridAcceptance.setAcceptanceStatus(String.valueOf(Integer.parseInt(basicGridAcceptance.getAcceptanceStatus()) - 1));
 

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.AcceptanceStatusEnum;
@@ -13,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.BasicGridAcceptance;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceCheckItemMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.AcceptanceMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.BasicGridAcceptanceMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IAcceptanceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
@@ -33,6 +32,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     @Autowired
     private BasicGridAcceptanceMapper basicGridAcceptanceMapper;
     @Autowired
+    private PeasantHouseholdMapper peasantHouseholdMapper;
+    @Autowired
     private AcceptanceCheckItemMapper acceptanceCheckItemMapper;
 
     /**
@@ -93,7 +94,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         // 检查项信息
         AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
                 Wrappers.<AcceptanceCheckItem>lambdaQuery()
-                        .eq(AcceptanceCheckItem::getWorkOrderPowerStationId, basicGridAcceptance.getWorkOrderPowerStationId())
+                        .eq(AcceptanceCheckItem::getPeasantHouseholdId, basicGridAcceptance.getPeasantHouseholdId())
         );
         AcceptanceCheckItemDto acceptanceCheckItemDto = new AcceptanceCheckItemDto();
         BeanUtils.copyProperties(acceptanceCheckItem, acceptanceCheckItemDto);
@@ -103,7 +104,7 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
     }
 
     @Override
-     public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item) {
+    public AcceptanceCheckItem saveEntity(AcceptanceCheckItem item) {
         acceptanceCheckItemMapper.insert(item);
         return Optional.ofNullable(item).orElse(new AcceptanceCheckItem());
     }