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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -29,7 +29,7 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     );
     @UserEmpower(field={},dealerField={"developer_code","regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
-    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState);
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo);
 
 
     List<Map<String,Object>> selectUserIsHouse(String telephone);

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

@@ -68,6 +68,9 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         <if test="developerCode!=null and developerCode !=''">
             and developer_code = #{developerCode}
         </if>
+        <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
+            and peasant_household_no = #{peasantHouseholdNo}
+        </if>
         ORDER BY creation_time DESC
     </select>
     <select id="selectUserIsHouse" resultType="java.util.Map">

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

@@ -66,11 +66,6 @@
         LEFT JOIN hygf_peasant_household on  hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id
         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
 
-        ORDER BY
-        FIELD(hygf_work_order_power_station.power_station_construction_status, '待登记', '待审核', '已完成'),
-
-        hygf_power_station_engineering_info.completion_date DESC
-
         <where>
 
         <if test="dto.workOrderId!=null and dto.workOrderId!=''">
@@ -115,9 +110,10 @@
         </if>
         ORDER BY
 
-        FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+        hygf_power_station_engineering_info.completion_date DESC,
+
+        FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工')
 
-        hygf_work_order_power_station.rec_date DESC
     </where>
 
     </select>

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

@@ -209,7 +209,8 @@ public class PeasantHouseholdController extends BaseController {
 															  @RequestParam(value = "size") int size,
 															  @RequestParam(value = "ownersName",required = false)String ownersName,
 															  @RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
-															  @RequestParam(value = "developerId",required = false)Long developerId) {
+															  @RequestParam(value = "developerId",required = false)Long developerId,
+															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo) {
 	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -222,7 +223,7 @@ public class PeasantHouseholdController extends BaseController {
 //        String orgCode = userUnitInformationDto.getAmosDealerOrgCode();
 
 		Integer isCertified = PeasantHouseholdEnum.已认证.getCode();
-		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo));
 	}
 
 	/**

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

@@ -241,11 +241,16 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
 
         if (!CollectionUtils.isEmpty(financingInfos)) {
             FinancingInfo financingInfo = financingInfos.get(0);
-            financingInfo.setStatus("待推送");
-            financingInfo.setFinancingCompaniesCode(null);
-            financingInfo.setFinancingCompaniesSeq(null);
-            financingInfo.setFinancingCompaniesName(null);
-            this.updateById(financingInfo);
+
+            LambdaQueryWrapper<FinancingAuditing> wrapper = new LambdaQueryWrapper();
+            wrapper.eq(FinancingAuditing::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
+            financingAuditingService.getBaseMapper().delete(wrapper);
+
+            LambdaQueryWrapper<FinancingRectificationOrder> wrapper1 = new LambdaQueryWrapper();
+            wrapper1.eq(FinancingRectificationOrder::getPeasantHouseholdId,financingInfo.getPeasantHouseholdId());
+            financingRectificationOrderService.getBaseMapper().delete(wrapper1);
+
+            this.deleteBySeq(financingInfo.getSequenceNbr());
         }
     }
 

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

@@ -228,12 +228,12 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
      * 分页查询
      */
 
-    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState)   {
+    public Page<PeasantHousehold> queryForPeasantHouseholdPage(Page<PeasantHousehold> page,String developerCode, String ownersName,Long developerId, Integer isCertified,String preparationMoneyState, String peasantHouseholdNo)   {
         int current = (int)page.getCurrent();
         int size = (int)page.getSize();
 
         PageHelper.startPage(current,size);
-        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState);
+        List<PeasantHousehold> records = peasantHouseholdMapper.queryForPage( developerCode,ownersName,developerId, isCertified,preparationMoneyState, peasantHouseholdNo);
         PageInfo<PeasantHousehold> objectPageInfo = new PageInfo<PeasantHousehold>(records);