Merge branch 'developer_bw' of…

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/service/impl/AcceptanceCheckServiceImpl.java

@@ -308,8 +308,10 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
             default:
                 up.set(AcceptanceCheck::getPowerStationAreaStatus,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  );
 
 

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

@@ -1405,6 +1405,23 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
 		PowerStationEngineeringInfo powerStationEngineeringInfo = powerStationEngineeringInfoAllDto.getPowerStationEngineeringInfo();
 		if(Objects.nonNull(powerStationEngineeringInfo)){
 			powerStationEngineeringInfoMapper.updateById(powerStationEngineeringInfo);
+			//更新施工组件信息
+			LambdaUpdateWrapper<PowerStationConstructionData> powerStationConstructionDataWrapper = new LambdaUpdateWrapper<>();
+			powerStationConstructionDataWrapper.set(PowerStationConstructionData::getConstructionComponentInfo,powerStationEngineeringInfo.getConstructionComponentInfo());
+			powerStationConstructionDataWrapper.set(PowerStationConstructionData::getConstructionInverterInfo,powerStationEngineeringInfo.getConstructionInverterInfo());
+			powerStationConstructionDataWrapper.set(PowerStationConstructionData::getConstructionCollectorBoxInfo,powerStationEngineeringInfo.getConstructionCollectorBoxInfo());
+			powerStationConstructionDataWrapper.set(PowerStationConstructionData::getConstructionGridBoxInfo,powerStationEngineeringInfo.getConstructionGridBoxInfo());
+			powerStationConstructionDataWrapper.eq(PowerStationConstructionData::getWorkOrderId, powerStationEngineeringInfo.getWorkOrderId());
+			powerStationConstructionDataWrapper.eq(PowerStationConstructionData::getWorkOrderPowerStationId, powerStationEngineeringInfo.getWorkOrderPowerStationId());
+			powerStationConstructionDataMapper.update(null,powerStationConstructionDataWrapper);
+            //更新工程负责人
+			LambdaUpdateWrapper<WorkOrder> upl = new LambdaUpdateWrapper();
+			upl.set(WorkOrder::getProjectRegionManager, powerStationEngineeringInfo.getProjectRegionManager());
+			upl.set(WorkOrder::getProjectRegionManagerPhone, powerStationEngineeringInfo.getProjectRegionManagerPhone());
+			upl.set(WorkOrder::getConstructionRegionManager, powerStationEngineeringInfo.getConstructionRegionManager());
+			upl.set(WorkOrder::getConstructionRegionManagerPhone, powerStationEngineeringInfo.getConstructionRegionManagerPhone());
+			upl.eq(WorkOrder::getSequenceNbr, powerStationEngineeringInfo.getWorkOrderId());
+			workOrderMapper.update(null,upl);
 		}
 		//更新施工信息
 		PowerStationConstructionData powerStationConstructionData = powerStationEngineeringInfoAllDto.getPowerStationConstructionData();