测试问题处理：查询条件修改、整改单号按规则生成、

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/CodeEnum.java

@@ -25,7 +25,9 @@ public enum  CodeEnum {
 
     派工单("PG", "PG"),
 
-    档案("DA", "DA");
+    档案("DA", "DA"),
+
+    整改单("ZGD", "ZGD");
 
     /**
      * 名称，描述

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

@@ -65,10 +65,10 @@
                     AND ph.developer_name LIKE CONCAT('%', #{param.serviceAgent}, '%')
                 </if>
                 <if test="param.powerStationCode != null and param.powerStationCode != ''">
-                    AND ph.peasant_household_no = #{param.powerStationCode}
+                    AND ph.peasant_household_no LIKE CONCAT('%', #{param.powerStationCode}, '%')
                 </if>
                 <if test="param.acceptanceStatus != null and param.acceptanceStatus != ''">
-                    AND bga.acceptance_status = #{acceptanceStatus}
+                    AND bga.acceptance_status = #{param.acceptanceStatus}
                 </if>
                 <if test="param.startSubmitDate != null and param.startSubmitDate != ''">
                     AND bga.acceptance_rec_date &gt;= #{param.startSubmitDate}

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

@@ -81,6 +81,8 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
         AcceptanceCheckItem acceptanceCheckItem = acceptanceCheckItemMapper.selectOne(
                 Wrappers.<AcceptanceCheckItem>lambdaQuery()
                         .eq(AcceptanceCheckItem::getPeasantHouseholdId, basicGridAcceptance.getPeasantHouseholdId())
+                        .orderByDesc(AcceptanceCheckItem::getRecDate)
+                        .last("limit 1")
         );
         result.put("checkItem", acceptanceCheckItem);
         return result;

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

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IBasicGridAcceptanceService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHygfOnGridService;
+import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +43,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
     AcceptanceCheckItemMapper acceptanceCheckItemMapper;
     @Autowired
     AcceptanceRectificationOrderMapper acceptanceRectificationOrderMapper;
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
+    @Autowired
+    WorkOrderMapper workOrderMapper;
 
     private final  String OK ="0";
     private final  String PASS ="5";
@@ -167,7 +172,10 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
             ) {
                 AcceptanceRectificationOrder rectificationOrder = new AcceptanceRectificationOrder();
                 try {
-                    rectificationOrder.setRectificationOrderCode("ZGD" + DateUtil.formatDate(new Date(), DateUtil.YMDHM));
+                    WorkOrder workOrder = workOrderMapper.selectById(basicGridAcceptanc.getWorkOrderId());
+                    RegionalCompanies regionalCompanies = regionalCompaniesMapper.selectRegionName(workOrder.getRegionCompanyId());
+                    String code = NumberUtil.getCode(CodeEnum.整改单.getCode(), regionalCompanies.getCompanyCode(), regionalCompanies.getRegionalAddress());
+                    rectificationOrder.setRectificationOrderCode(code);
                     rectificationOrder.setWorkOrderId(basicGridAcceptanc.getWorkOrderId());
                     rectificationOrder.setWorkOrderPowerStationId(basicGridAcceptanc.getWorkOrderPowerStationId());
                     rectificationOrder.setPeasantHouseholdId(basicGridAcceptanc.getPeasantHouseholdId());