提交代码

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

@@ -36,7 +36,9 @@
         WHEN hbga.acceptance_check_status = '12' THEN '投融待审核'
         WHEN hbga.acceptance_check_status = '13' THEN '资产待审核'
         WHEN hbga.acceptance_check_status = '14' THEN '法务待审核'
-        ELSE '待整改' END AS acceptanceCheckStatus
+        ELSE '待整改' END AS acceptanceCheckStatus,
+        hygf_commercial.scale,
+        hygf_power_station_engineering_info.real_scale as realScale
         FROM
         hygf_acceptance_check hbga
         LEFT JOIN hygf_peasant_household hph ON hph.sequence_nbr = hbga.peasant_household_id
@@ -45,6 +47,9 @@
         left join
         (select work_order_power_station_id, MIN( operation_time ) as firstSubmitDate from hygf_construction_acceptance_records where operation_content = '提交验收审核' GROUP BY work_order_power_station_id)
         newHcar  on newHcar.work_order_power_station_id = hbga.work_order_power_station_id
+        LEFT JOIN hygf_commercial on hygf_commercial.survey_information_id =hph.survey_information_id
+        LEFT JOIN hygf_work_order_power_station on hygf_work_order_power_station.peasant_household_id =hph.sequence_nbr
+        LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_power_station_id=hygf_work_order_power_station.sequence_nbr
         <where>
             hbga.is_delete = 0
             <if test="map.routhPathId != null and map.routhPathId != ''">

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

@@ -81,6 +81,8 @@ public class HouseholdContractController extends BaseController {
     PowerStationServiceImpl powerStationServiceImpl;
     @Autowired
     HouseholdContractMapper householdContractMapper;
+    @Autowired
+    HygfContractCallRecordMapper hygfContractCallRecordMapper;
     /**
      * 新增
      *
@@ -246,7 +248,10 @@ public class HouseholdContractController extends BaseController {
         toDoTasksServiceImpl.completeToDoTasks(toDoTasks,"");
 
         }catch (Exception e){
-            e.printStackTrace();
+            HygfContractCallRecord hygfContractCallRecord = new HygfContractCallRecord();
+            hygfContractCallRecord.setContractId(sequenceNbr.toString());
+            hygfContractCallRecord.setData(JSON.toJSONString(e.getStackTrace()));
+            hygfContractCallRecordMapper.insert(hygfContractCallRecord);
             throw new BadRequest("系统异常");
         }
         return householdContractServiceImpl.updateById(householdContrac);

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

@@ -99,14 +99,14 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("routhPathId", routhPathId);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
 
-        if(list != null && list.size() > 0) {
-            list.forEach(e -> {
-                if(e.getPeasantHouseholdNo() != null) {
-                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
-                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
-                }
-            });
-        }
+//        if(list != null && list.size() > 0) {
+//            list.forEach(e -> {
+//                if(e.getPeasantHouseholdNo() != null) {
+//                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+//                    e.setRealScale(powerStationEngineeringInfoMapper.getRealScaleByPeasantHouseholdNo(e.getPeasantHouseholdNo()));
+//                }
+//            });
+//        }
 
 
         PageInfo<AcceptanceCheckDto> page = new PageInfo(list);