XIUGAIBUG

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

@@ -50,7 +50,7 @@
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>
             <if test="map.powerStationCode!=null and map.powerStationCode!=''">
-                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%'}
+                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
             </if>
             <if test="map.formType != null and map.formType!=''">
                 AND hbga.acceptance_check_status IN ('2', '3', '4')

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

@@ -58,7 +58,7 @@
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>
             <if test="map.powerStationCode!=null and map.powerStationCode!=''">
-                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%'}
+                and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
             </if>
             <if test="map.formType != null and map.formType!=''">
                 AND hbga.grid_status IN ('2', '3', '4')

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

@@ -339,7 +339,20 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
 
     public ResponseModel addRectification(HygfRectificationOrder hygfRectificationOrder) {
-
+        if (Objects.isNull( hygfRectificationOrder.getRectificationSource()) ){
+            return	CommonResponseNewUtil.failureMessage("多角色用户发起整改单，发起人角色不可为空");
+        }
+        if (hygfRectificationOrder.getAddorSubmit().equals("0") && Objects.isNull(hygfRectificationOrder.getRectificationIdea())){
+            return	CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
+        }
+//        if (hygfRectificationOrder.getAddorSubmit().equals("0") && !Objects.isNull(hygfRectificationOrder.getRectificationIdea())){
+//            List<Object> rectificationIdea = hygfRectificationOrder.getRectificationIdea();
+//            for (Object item : rectificationIdea) {
+//                item.
+//            }
+//
+//            return	CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
+//        }
         if (hygfRectificationOrder.getSequenceNbr() != null ){
             LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
             wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());

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

@@ -627,7 +627,12 @@ public class BasicGridAcceptanceServiceImpl
 
 
 	public ResponseModel addRectification(HygfRectificationOrder hygfRectificationOrder) {
-
+		if (Objects.isNull( hygfRectificationOrder.getRectificationSource()) ){
+			return	CommonResponseNewUtil.failureMessage("多角色用户发起整改单，发起人角色不可为空");
+		}
+		if (hygfRectificationOrder.getAddorSubmit().equals("0") && Objects.isNull(hygfRectificationOrder.getRectificationIdea())){
+			return	CommonResponseNewUtil.failureMessage("整改类型及整改项不可为空");
+		}
 		if (hygfRectificationOrder.getSequenceNbr() != null ){
 			LambdaQueryWrapper<HygfRectificationOrder> wr= new LambdaQueryWrapper<>();
 			wr.eq(HygfRectificationOrder::getPeasantHouseholeId,hygfRectificationOrder.getPeasantHouseholeId());