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

@@ -112,15 +112,10 @@
     </select>
 
     <select id="getYsCreateTime" resultType="java.util.Map">
-        SELECT
-        PROC_INST_ID_ AS processInstanceId,
-        MIN( START_TIME_ ) AS time
-        FROM
-        act_hi_taskinst aht
-        WHERE
-        EXISTS ( SELECT 1 FROM hygf_acceptance_check hac WHERE hac.instance_Id = aht.PROC_INST_ID_  and aht.NAME_='验收提交' )
-        GROUP BY
-        PROC_INST_ID_
+        SELECT peasant_household_id AS peasantHouseholdId,MIN(operation_time) as time
+        FROM hygf_construction_acceptance_records
+        WHERE operation_content='提交验收审核'
+        GROUP BY peasant_household_id
     </select>
 
 </mapper>

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

@@ -10,14 +10,9 @@
     </select>
 
     <select id="getBwCreateTime" resultType="java.util.Map">
-        SELECT
-        PROC_INST_ID_ AS processInstanceId,
-        MIN( START_TIME_ ) AS time
-        FROM
-        act_hi_taskinst aht
-        WHERE
-        EXISTS ( SELECT 1 FROM hygf_basic_grid_record hbgr WHERE hbgr.instance_Id = aht.PROC_INST_ID_  and aht.NAME_='并网登记' )
-        GROUP BY
-        PROC_INST_ID_
+        SELECT peasant_household_id AS peasantHouseholdId,MIN(operation_time) as time
+        FROM hygf_construction_gird_records
+        WHERE operation_content='提交并网资料'
+        GROUP BY peasant_household_id
     </select>
 </mapper>

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

@@ -19,8 +19,10 @@
     </select>
 
     <select id="getSgCreateTime" resultType="java.util.Map">
-        SELECT SEQUENCE_NBR AS workOrderId,planned_start_date as time
-        FROM hygf_work_order
+        SELECT work_order_power_station_id AS workOrderPowerStationId,MIN(operation_time) as time
+        FROM hygf_construction_records
+        WHERE operation_content='编辑施工资料'
+        GROUP BY work_order_power_station_id
     </select>
 
     <select id="getSgEndTime" resultType="java.util.Map">

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

@@ -109,8 +109,8 @@ public class TestController extends BaseController {
         List<Map<String, Object>> ysCreateTime = acceptanceCheckMapper.getYsCreateTime();
         for (Map<String, Object> stringObjectMap : ysCreateTime) {
             LambdaUpdateWrapper<AcceptanceCheck> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.set(AcceptanceCheck::getYsCreateTime, dealHour(stringObjectMap.get("time")))
-                    .eq(AcceptanceCheck::getInstanceId, stringObjectMap.get("processInstanceId"));
+            wrapper.set(AcceptanceCheck::getYsCreateTime, stringObjectMap.get("time"))
+                    .eq(AcceptanceCheck::getPeasantHouseholdId, stringObjectMap.get("peasantHouseholdId"));
             acceptanceCheckMapper.update(null, wrapper);
         }
         List<Map<String, Object>> ysEndTime = acceptanceCheckMapper.getYsEndTime();
@@ -128,8 +128,8 @@ public class TestController extends BaseController {
         List<Map<String, Object>> bwCreateTime = basicGridRecordMapper.getBwCreateTime();
         for (Map<String, Object> stringObjectMap : bwCreateTime) {
             LambdaUpdateWrapper<BasicGridRecord> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.set(BasicGridRecord::getBwCreateTime, dealHour(stringObjectMap.get("time")))
-                    .eq(BasicGridRecord::getInstanceId, stringObjectMap.get("processInstanceId"));
+            wrapper.set(BasicGridRecord::getBwCreateTime, stringObjectMap.get("time"))
+                    .eq(BasicGridRecord::getPeasantHouseholdId, stringObjectMap.get("peasantHouseholdId"));
             basicGridRecordMapper.update(null, wrapper);
         }
         List<Map<String, Object>> bwEndTime = basicGridRecordMapper.getBwEndTime();
@@ -147,8 +147,8 @@ public class TestController extends BaseController {
         List<Map<String, Object>> sgCreateTime = workOrderPowerStationMapper.getSgCreateTime();
         for (Map<String, Object> stringObjectMap : sgCreateTime) {
             LambdaUpdateWrapper<WorkOrderPowerStation> wrapper = new LambdaUpdateWrapper<>();
-            wrapper.set(WorkOrderPowerStation::getSgCreateTime, DateUtils.dateParse(String.valueOf(stringObjectMap.get("time"))))
-                    .eq(WorkOrderPowerStation::getWorkOrderId, stringObjectMap.get("workOrderId"));
+            wrapper.set(WorkOrderPowerStation::getSgCreateTime, stringObjectMap.get("time"))
+                    .eq(WorkOrderPowerStation::getSequenceNbr, stringObjectMap.get("workOrderPowerStationId"));
             workOrderPowerStationMapper.update(null, wrapper);
         }
         List<Map<String, Object>> sgEndTime = workOrderPowerStationMapper.getSgEndTime();