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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -232,4 +232,7 @@ public class PeasantHousehold extends BaseEntity {
      */
     @TableField(exist = false)
     private Double disbursementMoney;
+    
+    @TableField(exist = false)
+    private String province;
 }

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

@@ -30,7 +30,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, String peasantHouseholdNo);
+    List<PeasantHousehold> queryForPage( String developerCode,String ownersName,Long developerId,Integer isCertified,String preparationMoneyState, String peasantHouseholdNo,String province);
 
 
     List<Map<String,Object>> selectUserIsHouse(String telephone);

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

@@ -52,7 +52,8 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
 
     </select>
     <select id="queryForPage" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.PeasantHousehold">
-        SELECT *
+        SELECT *,
+        substring_index ( hygf_peasant_household.project_address_name, '/', 1 ) AS province
         FROM hygf_peasant_household
         WHERE IS_CERTIFIED = #{isCertified}
         <if test="ownersName!=null and ownersName !=''">
@@ -73,6 +74,9 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         <if test="peasantHouseholdNo!=null and peasantHouseholdNo !=''">
             and peasant_household_no like concat ('%',#{peasantHouseholdNo},'%')
         </if>
+        <if test="province != null and province != ''">
+            and project_address like concat(concat('%',#{province}),'%')
+        </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

@@ -121,8 +121,8 @@
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
-        <if test="province != null and province != ''">
-            and hygf_peasant_household.project_address like concat(concat('%',#{province}),'%')
+        <if test="dto.province != null and dto.province != ''">
+            and hygf_peasant_household.project_address like concat(concat('%',#{dto.province}),'%')
         </if>
         </where>
         ORDER BY

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

@@ -7,10 +7,10 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.AcceptanceCheck;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfRectificationOrder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
+
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
 import java.util.ArrayList;
@@ -205,7 +205,8 @@ public class AcceptanceCheckController extends BaseController {
 																@RequestParam(required = false,value = "ownersName") String ownersName,
 																@RequestParam(required = false,value = "acceptanceCheckStatus") String acceptanceCheckStatus,
 																@RequestParam(required = false,value = "type") String type,
-																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime) throws Exception {
+																@RequestParam(required = false,value = "acceptanceTime") String acceptanceTime,
+																@RequestParam(required = false, value = "province") String province) throws Exception {
 		//当前登录人所属场站
 //        UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
 
@@ -234,7 +235,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);
+		Page<AcceptanceCheckDto> page = acceptanceCheckServiceImpl.selectPage(null,null,current, size, projectAddress, powerStationCode, ownersName, acceptanceCheckStatus, acceptanceTime, "",basicGridNodes,type,province);
 		//根据角色及当前节点判断是否有操作权限
 		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/PeasantHouseholdController.java

@@ -210,7 +210,8 @@ public class PeasantHouseholdController extends BaseController {
 															  @RequestParam(value = "ownersName",required = false)String ownersName,
 															  @RequestParam(value = "preparationMoneyState",required = false)String preparationMoneyState,
 															  @RequestParam(value = "developerId",required = false)Long developerId,
-															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo) {
+															  @RequestParam(value = "peasantHouseholdNo",required = false) String peasantHouseholdNo,
+															  @RequestParam(value = "province",required = false) String province) {
 	    Page<PeasantHousehold> page = new Page<PeasantHousehold>();
 	    page.setCurrent(current);
 	    page.setSize(size);
@@ -223,7 +224,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, peasantHouseholdNo));
+		return ResponseHelper.buildResponse(peasantHouseholdServiceImpl.queryForPeasantHouseholdPage(page, null,ownersName,developerId,isCertified,preparationMoneyState, peasantHouseholdNo,province));
 	}
 
 	/**

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

@@ -73,7 +73,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) throws Exception {
+                                               String gridConnectionTime, String formType, List<String> basicGridNodes, String type,String province) throws Exception {
         PageHelper.startPage(current, size);
         Map<String, Object> map = new HashMap<>();
         Date date = null;
@@ -90,6 +90,7 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
         map.put("amosDealerId", amosDealerId);
         map.put("basicGridNodes",basicGridNodes);
         map.put("type",type);
+        map.put("province",province);
         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/PeasantHouseholdServiceImpl.java

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