接口参数修改

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/WorkOrderPage.java

@@ -23,6 +23,12 @@ public class WorkOrderPage {
     @ApiModelProperty(value = "农户信息编号")
     private String peasantHouseholdNo;
 
+    @ApiModelProperty(value = "开发商")
+    private String developerName;
+
+    @ApiModelProperty(value = "区域公司")
+    private String regionalCompaniesName;
+
     @ApiModelProperty(value = "派工单编号")
     private String workOrderNum;
 

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

@@ -47,6 +47,12 @@
             <if test="map.amosDealerId!=null and map.amosDealerId!=''">
                 and hygf_work_order.amos_dealer_id = #{map.amosDealerId}
             </if>
+            <if test="map.developerName!=null and map.developerName!=''">
+                and hph.developer_name like concat('%',#{map.developerName},'%')
+            </if>
+            <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
+                and hph.regional_companies_name like concat('%',#{map.regionalCompaniesName},'%')
+            </if>
             <if test="map.regionCompanyId!=null and map.regionCompanyId!=''">
                 and hygf_work_order.region_company_id =#{map.regionCompanyId}
             </if>

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

@@ -61,6 +61,12 @@
             <if test="map.powerStationCode!=null and map.powerStationCode!=''">
                 and hph.peasant_household_no like concat('%',#{map.powerStationCode},'%')
             </if>
+            <if test="map.developerName!=null and map.developerName!=''">
+                and hph.developer_name like concat('%',#{map.developerName},'%')
+            </if>
+            <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName!=''">
+                and hph.regional_companies_name like concat('%',#{map.regionalCompaniesName},'%')
+            </if>
             <if test="map.formType != null and map.formType!=''">
                 AND hbga.grid_status IN ('2', '3', '4')
             </if>

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

@@ -18,6 +18,7 @@
         CONCAT(info.disbursement_money,'') as disbursementMoney,
         hph.regional_companies_code,
         hph.developer_code,
+        hph.developer_name developerName,
         hph.is_history isHistory,
         info.financing_companies_name financingCompaniesName
         FROM
@@ -29,6 +30,15 @@
             <if test="params.ownersName != null and params.ownersName !=''">
                 and hph.owners_name like concat('%',#{params.ownersName},'%')
             </if>
+            <if test="params.peasantHouseholdNo != null and params.peasantHouseholdNo !=''">
+                and hph.peasant_household_no like concat('%',#{params.peasantHouseholdNo},'%')
+            </if>
+            <if test="params.developerName != null and params.developerName !=''">
+                and hph.developer_name like concat('%',#{params.developerName},'%')
+            </if>
+            <if test="params.financingCompaniesName != null and params.financingCompaniesName !=''">
+                and info.financing_companies_name like concat('%',#{params.financingCompaniesName},'%')
+            </if>
             <if test="params.isHistory != null and params.isHistory !='' and params.type != 2 ">
                 and hph.is_history is not null
             </if>

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

@@ -73,6 +73,8 @@
         select
         hygf_peasant_household.sequence_nbr sequenceNbr,
         hygf_peasant_household.peasant_household_no peasantHouseholdNo,
+        hygf_peasant_household.developer_name developerName,
+        hygf_peasant_household.regional_companies_name regionalCompaniesName,
         substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province,
         hygf_work_order.work_order_num workOrderNum,
         hygf_peasant_household.owners_name ownersName,
@@ -126,6 +128,9 @@
         <if test="dto.peasantHouseholdNo!=null and dto.peasantHouseholdNo!=''">
             and hygf_peasant_household.peasant_household_no like concat(concat('%',#{dto.peasantHouseholdNo}),'%')
         </if>
+        <if test="dto.constructionRegionManager!=null and dto.constructionRegionManager!=''">
+            and hygf_work_order.construction_region_manager like concat(concat('%',#{dto.constructionRegionManager}),'%')
+        </if>
         <if test="dto.ownersName!=null and dto.ownersName!=''">
             and hygf_peasant_household.owners_name like concat(concat('%',#{dto.ownersName}),'%')
         </if>

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

@@ -206,7 +206,9 @@ public class AcceptanceCheckController extends BaseController {
 																@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
 																@RequestParam(required = false,value = "type") String type,
 																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime,
-																@RequestParam(required = false, value = "province") String province) throws Exception {
+																@RequestParam(required = false, value = "province") String province,
+																@RequestParam(required = false, value = "developerName") String developerName,
+																@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -235,7 +237,7 @@ public class AcceptanceCheckController extends BaseController {
 				basicGridNodes.add("ys-zichan");
 			}
 		}
-		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province, developerName, regionalCompaniesName);
 		//根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null){
 			for (AcceptanceCheckDto e : page.getRecords()) {

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

@@ -151,7 +151,9 @@ public class BasicGridAcceptanceController extends BaseController {
 			@RequestParam(required = false, value = "gridStatus") String gridStatus,
 			@RequestParam(required = false, value = "type") String type,
 			@RequestParam(required = false, value = "gridConnectionTime") String gridConnectionTime,
-			@RequestParam(required = false, value = "province") String province) throws Exception {
+			@RequestParam(required = false, value = "province") String province,
+			@RequestParam(required = false, value = "developerName") String developerName,
+			@RequestParam(required = false, value = "regionalCompaniesName") String regionalCompaniesName) throws Exception {
 		// 当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -178,7 +180,7 @@ public class BasicGridAcceptanceController extends BaseController {
 		}
 		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
 				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "", basicGridNodes, type,
-				province);
+				province, developerName, regionalCompaniesName);
 		// 根据角色及当前节点判断是否有操作权限
 		if (basicGridNodes != null) {
 			for (BasicGridRecordDto e : page.getRecords()) {
@@ -218,7 +220,7 @@ public class BasicGridAcceptanceController extends BaseController {
 		// 当前登录人所属场站
 
 		Page<BasicGridRecordDto> page = basicGridAcceptanceServiceImpl.selectPage(null, null, current, size,
-				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province);
+				projectAddress, powerStationCode, ownersName, gridStatus, gridConnectionTime, "check", null, null,province, null, null);
 		return ResponseHelper.buildResponse(page);
 	}
 

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

@@ -167,11 +167,14 @@ public class FinancingInfoController extends BaseController {
 																 @RequestParam(value = "batchNo" ,required = false) String batchNo ,
 																 @RequestParam(value = "isHistory" ,required = false) String isHistory ,
 																 @RequestParam(value = "ownersName",required = false) String ownersName,
-																 @RequestParam(value = "projectAddress",required = false) String projectAddress){
+																 @RequestParam(value = "projectAddress",required = false) String projectAddress,
+																 @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo,
+																 @RequestParam(value = "developerName",required = false) String developerName,
+																 @RequestParam(value = "financingCompaniesName",required = false) String financingCompaniesName){
 	    Page<Map<String, Object>> page = new Page<Map<String, Object>>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory, projectAddress));
+	    return ResponseHelper.buildResponse(financingInfoServiceImpl.queryForFinancingInfoPage(page,type,status,regionalCompaniesCode,ownersName, region,batchNo,isHistory, projectAddress, peasantHouseholdNo, developerName, financingCompaniesName));
 	}
 
 	/**

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

@@ -70,7 +70,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
 
     public Page<AcceptanceCheckDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
                                                String projectAddress, String powerStationCode, String ownersName, String acceptanceCheckStatus,
-                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province) throws Exception {
+                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province, String developerName, String regionalCompaniesName) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
         Date date = null;
@@ -88,6 +88,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
         map.put("province",province);
+        map.put("developerName", developerName);
+        map.put("regionalCompaniesName", regionalCompaniesName);
         List<AcceptanceCheckDto> list = acceptanceCheckMapper.selectPageList(map);
 
         if(list != null && list.size() > 0) {

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

@@ -100,7 +100,7 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 
 	public Page<BasicGridRecordDto> selectPage(Long regionCompanyId, Long amosDealerId, int current, int size,
 											   String projectAddress, String powerStationCode, String ownersName, String gridStatus,
-											   String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province)
+											   String gridConnectionTime, String formType, List<String> basicGridNodes, String type, String province, String developerName, String regionalCompaniesName)
 			throws Exception {
 		PageHelper.startPage(current, size);
 		Map<String, Object> map = new HashMap<>();
@@ -119,6 +119,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
 		map.put("basicGridNodes", basicGridNodes);
 		map.put("type", type);
 		map.put("province", province);
+		map.put("developerName", developerName);
+		map.put("regionalCompaniesName", regionalCompaniesName);
 		List<BasicGridRecordDto> list = basicGridAcceptanceMapper.selectPageList(map);
 		PageInfo<BasicGridRecordDto> page = new PageInfo(list);
 		Page<BasicGridRecordDto> pageNew = new Page<>();

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

@@ -87,7 +87,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
     private RedisLockUtil redisLockUtil;
 
     @UserLimits
-    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory, String projectAddress) {
+    public Page<Map<String, Object>> queryForFinancingInfoPage(Page<Map<String, Object>> page, String type, String status, String regionalCompaniesCode, String ownersName, String region,String batchNo,String isHistory, String projectAddress, String peasantHouseholdNo, String developerName, String financingCompaniesName) {
         StdUserEmpower orgCode = (StdUserEmpower) redisUtils.get("Emp_" + RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
         ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         List<String> amosOrgCodes = orgCode.getAmosOrgCode();
@@ -102,6 +102,9 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
         params.put("isHistory", isHistory);
         params.put("region", region);
         params.put("projectAddress", projectAddress);
+        params.put("peasantHouseholdNo", peasantHouseholdNo);
+        params.put("developerName", developerName);
+        params.put("financingCompaniesName", financingCompaniesName);
         // 1 投融人员  2.融资  3经销商管理员
         switch (type) {
             case "1":