Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -53,13 +53,13 @@
                 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')
+                AND hbga.acceptance_check_status IN ('2', '3', '4')
             </if>
             <if test="map.projectAddress != null and map.projectAddress!=''">
                 AND hph.project_address_name LIKE concat(concat('%', #{map.projectAddress}), '%')
             </if>
             <if test="map.type != null">
-                and ( hbga.basic_grid_node  is not null
+                and ( (hbga.basic_grid_node  is not null AND hbga.basic_grid_node != 'jxsAdmin')
                 or hbga.basic_grid_node = 'all'
                 or hbga.power_station_area_status  is not null
                 or hbga.power_station_financing_status  is not null
@@ -70,11 +70,11 @@
             <if test="map.ownersName != null and map.ownersName !=''">
                 AND hph.owners_name LIKE concat(concat('%', #{map.ownersName}), '%')
             </if>
-            <if test="map.gridStatus != null and map.gridStatus !=''">
-                AND hbga.acceptance_check_status = #{map.gridStatus}
+            <if test="map.acceptanceCheckStatus != null and map.acceptanceCheckStatus !=''">
+                AND hbga.acceptance_check_status = #{map.acceptanceCheckStatus}
             </if>
-            <if test="map.gridConnectionTime != null">
-                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}
+            <if test="map.acceptanceTime != null">
+                AND DATE_FORMAT(hogaa.acceptance_time, '%Y-%m-%d') = #{map.acceptanceTime}
             </if>
         </where>
         ORDER BY hbga.sequence_nbr desc

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

@@ -79,7 +79,7 @@
                 AND hbga.grid_status = #{map.gridStatus}
             </if>
             <if test="map.gridConnectionTime != null">
-                AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = #{map.gridConnectionTime}
+                AND DATE_FORMAT(hogaa.grid_time, '%Y-%m-%d') = #{map.gridConnectionTime}
             </if>
         </where>
         ORDER BY hbga.sequence_nbr desc

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfRectificationOrderController.java

@@ -109,7 +109,6 @@ public class HygfRectificationOrderController extends BaseController {
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个审核单",  notes = "根据sequenceNbr查询单个审核单")
 	public ResponseModel<HygfRectificationOrder> selectOne(@PathVariable Long sequenceNbr) {
 		HygfRectificationOrder hygfRectificationOrder =	hygfRectificationOrderServiceImpl.getBaseMapper().selectById(sequenceNbr);
-		
 		RectificationRoleEnum enums = RectificationRoleEnum.getNodeByName(hygfRectificationOrder.getRectificationSource());
 		hygfRectificationOrder.setRectificationSourceName(enums!=null?enums.name():null);
 	    return ResponseHelper.buildResponse(hygfRectificationOrder);

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

@@ -306,10 +306,12 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
                 }
                 break;
             default:
-                up.set(AcceptanceCheck::getPowerStationAreaStatus,approvalStatus.equals("0")?"通过":"驳回");
+                up.set(AcceptanceCheck::getPowerStationAssetsStatus,approvalStatus.equals("0")?"通过":"驳回");
                 up.set(AcceptanceCheck::getBasicGridNode,"all");
-                up.set(AcceptanceCheck::getAcceptanceTime,new Date());
-                up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
+                if (approvalStatus.equals("0")){
+                    up.set(AcceptanceCheck::getAcceptanceTime,new Date());
+                    up.set(AcceptanceCheck::getAcceptanceCheckStatus,GridStatusEnum.YWC.getCode());
+                }
                 this.wofkflowExcute(instanceId, approvalStatus , comment  );
 
 
@@ -482,9 +484,9 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             }
         }else {
             //驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
-            LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper();
+            LambdaUpdateWrapper<AcceptanceCheck> qu = new LambdaUpdateWrapper<AcceptanceCheck>();
             qu.eq(AcceptanceCheck::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-            if (CollectionUtil.isEmpty(list)) {
+            if (!CollectionUtil.isEmpty(list)) {
                 List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
                 qu.set(AcceptanceCheck::getAcceptanceCheckStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
             }else {

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

@@ -768,7 +768,7 @@ public class BasicGridAcceptanceServiceImpl
 			//驳回的时候 也需根据 工程或者设计 整改单状态修改并网状态
 			LambdaUpdateWrapper<BasicGridRecord> qu = new LambdaUpdateWrapper();
 			qu.eq(BasicGridRecord::getPeasantHouseholdId, hygfRectificationOrder.getPeasantHouseholeId());
-			if (CollectionUtil.isEmpty(list)) {
+			if (!CollectionUtil.isEmpty(list)) {
 				List<String> collect = list.stream().map(HygfRectificationOrder::getRectificationStatus).collect(Collectors.toList());
 				qu.set(BasicGridRecord::getGridStatus,collect.contains(WorkOrderEnum.待审核.getCode())?GridStatusEnum.ZGDSH.getCode():GridStatusEnum.DZG.getCode());
 			}else {