增加经销商区域公司管理功能，修复合同预览，合同下载，增加开发区域范围

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/CodeEnum.java

+package com.yeejoin.amos.boot.module.hygf.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/12/13
+ */
+@Getter
+@AllArgsConstructor
+public enum  CodeEnum {
+
+
+    合同("HT", "HT"),
+
+    农户("NH", "NH"),
+
+    文件("WJ", "WJ"),
+
+    勘察("KC", "KC"),
+
+    档案("DA", "DA");
+
+    /**
+     * 名称，描述
+     */
+    private String name;
+    /**
+     * 编码
+     */
+    private String code;
+
+    public static ContractStatusEnum getNodeByCode(String code) {
+        ContractStatusEnum dealerReviewEnum = null;
+        for(ContractStatusEnum type: ContractStatusEnum.values()) {
+            if (type.getCode().equals(code)) {
+                dealerReviewEnum = type;
+                break;
+            }
+        }
+        return dealerReviewEnum;
+    }
+
+}

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

@@ -78,4 +78,10 @@ public class PowerStationDto  extends BaseDto {
 
     @ApiModelProperty(value = "设计图纸审核")
     private String drawingReview;
+
+    @ApiModelProperty(value = "合同状态")
+    private String initiateStatus;
+
+    @ApiModelProperty(value = "契约锁合同id")
+    private String contractLockId;
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -32,5 +34,18 @@ public class RegionalCompaniesDto  extends BaseDto {
 
     @ApiModelProperty(value = " 经销商业务单位id")
     private Long unitId;
+    /**
+     *  经销商业务单位id
+     */
+    private Long unitInfoId;
+
+    private String developmentArea;	//开发区域
+    private String consignee;	//收货人
+    private String phone;	//收货人电话
+    private String consigneeRegion;	//收货区域
+    private List<Integer>  consigneeRegionCode;	//收货区域code
+    private String address;	//收货详细地址
+
+    private String regionalAddress;
 
 }

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -17,7 +19,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("hygf_regional_companies")
+@TableName(value = "hygf_regional_companies",autoResultMap = true)
 public class RegionalCompanies extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -51,6 +53,36 @@ public class RegionalCompanies extends BaseEntity {
     @TableField("unit_info_id")
     private Long unitInfoId;
 
+
+    @TableField("development_area")
+    private String developmentArea;	//开发区域
+    @TableField("consignee")
+    private String consignee;	//收货人
+    @TableField("phone")
+    private String phone;	//收货人电话
+    @TableField("consignee_region")
+    private String consigneeRegion;	//收货区域
+    @TableField(value = "consignee_region_code",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> consigneeRegionCode;	//收货区域code
+    @TableField("address")
+    private String address;	//收货详细地址
+
+    @TableField(exist = false)
+    private String regionalAddress;//区域公司归属地
+
+    @TableField(exist = false)
+    private String companyCode;
+
+
+
+
+
+
+
+
+
+
+
     public RegionalCompanies(Long regionalCompaniesSeq, String regionalCompaniesName, String regionalCompaniesCode, Long unitId,Long unitInfoId) {
         this.regionalCompaniesSeq = regionalCompaniesSeq;
         this.regionalCompaniesName = regionalCompaniesName;

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -10,5 +16,7 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStation;
  * @date 2023-07-15
  */
 public interface PowerStationMapper extends BaseMapper<PowerStation> {
-
+    List<PowerStationDto> queryPage(@Param("powerStationCode") String powerStationCode,
+                                    @Param("ownersName")String ownersName,
+                                    @Param("serviceAgent")String serviceAgent);
 }

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

@@ -2,6 +2,9 @@ package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
 import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  *  Mapper 接口
@@ -10,5 +13,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2023-08-29
  */
 public interface RegionalCompaniesMapper extends BaseMapper<RegionalCompanies> {
+    List<RegionalCompanies> selectListData(@Param("regionalCompaniesName") String regionalCompaniesName,@Param("unitId")Long unitId,@Param("sequenceNbr")Long sequenceNbr);
+
+    RegionalCompanies selectByid(@Param("sequenceNbr")Long sequenceNbr);
 
+    RegionalCompanies selectRegionName(@Param("sequenceNbr")Long sequenceNbr);
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/NumberUtil.java

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/12/12
+ */
+public class NumberUtil {
+
+    private static java.util.LinkedHashMap<String, Integer> needQueryResProductList = new java.util.LinkedHashMap<String, Integer>();
+    //年月日
+    public static String dateFormat() {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        return dateFormat.format(new Date());
+    }
+    //获取首字母
+    public static String getChineseStr( String ChineseStr){
+        StringBuilder sb = new StringBuilder();
+        for (char c : ChineseStr.toCharArray()) {
+            String[] pinyin = PinyinHelper.toHanyuPinyinStringArray(c);
+            if (pinyin != null) {
+                sb.append(pinyin[0].charAt(0));
+            } else {
+                sb.append(c);
+            }
+        }
+        return sb.toString().toUpperCase();
+    }
+    //当天生成4位随机不重复数
+    public static Integer getnum(){
+        Random rand = new Random();
+     if(needQueryResProductList.containsKey("num")&&needQueryResProductList.get("num")!=null&&needQueryResProductList.get("num")<9999){
+         Integer num= needQueryResProductList.get("num")+rand.nextInt(100) + 1;
+         needQueryResProductList.put("num",num);
+         return num;
+     }else{
+      int num=  1000+ rand.nextInt(100) + 1;
+      needQueryResProductList.put("num",num);
+
+         return num;
+     }
+    }
+
+    public static String getCode(String type,String code, String address ){
+
+
+
+        code= code+ address.replace("省","")
+                    .replace("市","")
+                    .replace("区","")
+                    .replace("县","")
+                    .replace(",","");
+        code= type+code+dateFormat()+getnum();
+
+       return  code;
+    }
+
+}

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.PowerStationMapper">
+<select id="queryPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto">
+    select * from (select
+    hygf_power_station.*,
+    hygf_household_contract.initiate_status,
+    hygf_household_contract.contract_lock_id
+    from hygf_power_station LEFT JOIN hygf_household_contract on
+    hygf_household_contract.peasant_household_id=hygf_power_station.peasant_household_id
+    where hygf_power_station.is_delete=0 and hygf_household_contract.status !='已作废'
 
+    <if test="powerStationCode!=null and powerStationCode!=''">
+        and hygf_power_station.power_station_code like concat(concat("%",#{powerStationCode}),"%")
+    </if>
+    <if test="ownersName!=null and ownersName!=''">
+        and hygf_power_station.owners_name like concat(concat("%",#{ownersName}),"%")
+    </if>
+    <if test="serviceAgent!=null and serviceAgent!=''">
+        and hygf_power_station.service_agent=#{service_agent}
+    </if>
+    ) a
+</select>
 </mapper>

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

@@ -2,4 +2,86 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper">
 
+    <select id="selectListData" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
+        select * from (
+
+        select
+        hygf_regional_companies.*,
+        (SELECT GROUP_CONCAT(REGION_NAME) from
+        (SELECT T2.REGION_NAME
+        FROM (
+        SELECT
+        @r AS _id,
+        (SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
+        @l := @l + 1 AS lvl
+        FROM
+        (SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
+        systemctl_region h
+        WHERE @r != 0) T1
+        JOIN systemctl_region T2
+        ON T1._id = T2.sequence_nbr
+        ORDER BY T1.lvl DESC) s) regionalAddress
+        from hygf_regional_companies LEFT JOIN privilege_company on
+        hygf_regional_companies.regional_companies_seq=privilege_company.SEQUENCE_NBR
+        where hygf_regional_companies.is_delete=0
+
+        <if test="regionalCompaniesName!=null and regionalCompaniesName!=''">
+            and hygf_regional_companies.regional_companies_name like concat(concat("%",#{regionalCompaniesName}),"%")
+        </if>
+
+        <if test="unitId!=null and unitId!=''">
+            and hygf_regional_companies.unit_id=#{unitId}
+        </if>
+        <if test="sequenceNbr!=null and sequenceNbr!=''">
+            and hygf_regional_companies.unit_info_id=#{sequenceNbr}
+        </if>
+        ) a
+    </select>
+
+    <select id="selectByid" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
+
+
+        select
+        (SELECT GROUP_CONCAT(REGION_NAME) from
+        (SELECT T2.REGION_NAME
+        FROM (
+        SELECT
+        @r AS _id,
+        (SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
+        @l := @l + 1 AS lvl
+        FROM
+        (SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
+        systemctl_region h
+        WHERE @r != 0) T1
+        JOIN systemctl_region T2
+        ON T1._id = T2.sequence_nbr
+        ORDER BY T1.lvl DESC) s) regionalAddress
+        from hygf_regional_companies LEFT JOIN privilege_company on
+        hygf_regional_companies.regional_companies_seq=privilege_company.SEQUENCE_NBR
+        where hygf_regional_companies.is_delete=0 and   hygf_regional_companies.sequence_nbr=#{sequenceNbr}
+
+
+
+    </select>
+
+    <select id="selectRegionName" resultType="com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies">
+         select
+	    privilege_company.COMPANY_CODE companyCode,
+        (SELECT GROUP_CONCAT(REGION_NAME) from
+        (SELECT T2.REGION_NAME
+        FROM (
+        SELECT
+        @r AS _id,
+        (SELECT @r := parent_id FROM systemctl_region WHERE sequence_nbr = _id) AS parent_id,
+        @l := @l + 1 AS lvl
+        FROM
+        (SELECT @r := privilege_company.REGION_SEQ, @l := 0) vars,
+        systemctl_region h
+        WHERE @r != 0) T1
+        JOIN systemctl_region T2
+        ON T1._id = T2.sequence_nbr
+        ORDER BY T1.lvl DESC) s) regionalAddress
+        from privilege_company where privilege_company.SEQUENCE_NBR=#{sequenceNbr}
+
+    </select>
 </mapper>

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

@@ -9,12 +9,11 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractPageDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.PeasantHouseholdServiceImpl;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.ToDoTasksServiceImpl;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.*;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import net.sourceforge.pinyin4j.PinyinHelper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,12 +22,13 @@ import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 
+import java.text.Collator;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
 import java.util.stream.Collectors;
 
-import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
 import org.typroject.tyboot.component.emq.EmqKeeper;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -78,6 +78,10 @@ public class HouseholdContractController extends BaseController {
 
     @Autowired
     ContractFillDataMapper contractFillDataMapper;
+    @Autowired
+    PowerStationServiceImpl powerStationServiceImpl;
+    @Autowired
+    HouseholdContractMapper householdContractMapper;
     /**
      * 新增
      *
@@ -137,10 +141,10 @@ public class HouseholdContractController extends BaseController {
 
         householdContract.setContractFillData(da);
 
-	    if(householdContract.getContractLockId()!=null&&householdContract.getContractUrl()==null){
+	    if(householdContract.getContractLockId()!=null){
          String url=   qiyuesuoServiceImpl.getdownloadUrl(householdContract.getContractLockId());
          householdContract.setContractUrl(url);
-            householdContractServiceImpl.updateById(householdContract);
+//            householdContractServiceImpl.updateById(householdContract);
         }
 	    return ResponseHelper.buildResponse(householdContract);
 	}
@@ -315,4 +319,42 @@ public class HouseholdContractController extends BaseController {
         String url = qiyuesuoServiceImpl.getUrl(contractLockId);
         return ResponseHelper.buildResponse(url);
     }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getdownloadUrl")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+    public ResponseModel<HouseholdContract> getdownloadUrl(Long sequenceNbr) {
+
+        PowerStation pd= powerStationServiceImpl.getById(sequenceNbr);
+
+        LambdaQueryWrapper<HouseholdContract> qu=new LambdaQueryWrapper<>();
+        qu.ne(HouseholdContract::getStatus,"已作废");
+        qu.eq(HouseholdContract::getIsDelete,false);
+        qu.eq(HouseholdContract::getPeasantHouseholdId,pd.getPeasantHouseholdId());
+
+        HouseholdContract householdContract = householdContractMapper.selectOne(qu);
+
+        if(householdContract.getContractLockId()!=null){
+            String url=   qiyuesuoServiceImpl.getdownloadUrl(householdContract.getContractLockId());
+            householdContract.setContractUrl(url);
+        }
+        return ResponseHelper.buildResponse(householdContract);
+    }
+
+
+//    public static void main(String[] args) {
+//        String ChineseStr = "北京";
+//        StringBuilder sb = new StringBuilder();
+//        for (char c : ChineseStr.toCharArray()) {
+//            String[] pinyin = PinyinHelper.toHanyuPinyinStringArray(c);
+//            if (pinyin != null) {
+//                sb.append(pinyin[0].charAt(0));
+//            } else {
+//                sb.append(c);
+//            }
+//        }
+//        System.out.println(sb.toString().toUpperCase());
+//    }
+
 }

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

@@ -131,7 +131,7 @@ public class PeasantHouseholdWxController extends BaseController {
         validatedPeasantHouseholdDto(model);
         AgencyUserModel userInfo = getUserInfo();
         model.setAmosUserId(userInfo.getUserId());// 绑定平台userId
-        model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo());
+        model.setPeasantHouseholdNo(peasantHouseholdServiceImpl.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
         model.setIsCertified(1);// 这里就实名认证
         model.setSurveyOrNot(0);
         model.setReview(0);

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
+import com.yeejoin.amos.boot.module.hygf.api.entity.RegionalCompanies;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 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;
+import java.util.Collection;
 import java.util.List;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.RegionalCompaniesServiceImpl;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -31,6 +47,15 @@ public class RegionalCompaniesController extends BaseController {
     @Autowired
     RegionalCompaniesServiceImpl regionalCompaniesServiceImpl;
 
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
+
+    @Autowired
+    PersonnelBusinessMapper personnelBusinessMapper;
+
+    @Autowired
+    RedisUtils redisUtil;
+    private static final String regionRedis="app_region_redis";
     /**
      * 新增
      *
@@ -53,9 +78,31 @@ public class RegionalCompaniesController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@PutMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-	public ResponseModel<RegionalCompaniesDto> updateBySequenceNbrRegionalCompanies(@RequestBody RegionalCompaniesDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+	public ResponseModel<RegionalCompanies> updateBySequenceNbrRegionalCompanies(@RequestBody RegionalCompanies model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
 	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(regionalCompaniesServiceImpl.updateWithModel(model));
+        JSONArray regionName = getRegionName();
+        List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+        String ConsigneeRegion="";
+       List<Integer>  da=model.getConsigneeRegionCode();
+       if(da!=null&&!da.isEmpty()){
+        for (int i = 0; i < da.size(); i++) {
+            for (RegionModel re : list) {
+                if (re.getRegionCode().equals(Integer.valueOf(da.get(i)))) {
+                    if(da.size()-1==i){
+                        ConsigneeRegion = ConsigneeRegion + re.getRegionName();
+                    }else{
+                        ConsigneeRegion = ConsigneeRegion + re.getRegionName() + "-";
+                    }
+                    break;
+                }
+            }
+        }
+
+        model.setConsigneeRegion(ConsigneeRegion);
+       }
+        regionalCompaniesMapper.updateById(model);
+
+	    return ResponseHelper.buildResponse(null);
 	}
 
 	/**
@@ -80,8 +127,11 @@ public class RegionalCompaniesController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<RegionalCompaniesDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(regionalCompaniesServiceImpl.queryBySeq(sequenceNbr));
+	public ResponseModel<RegionalCompanies> selectOne(@PathVariable Long sequenceNbr) {
+        RegionalCompanies regionalCompaniesData=regionalCompaniesMapper.selectById(sequenceNbr);
+        RegionalCompanies regionalCompanies= regionalCompaniesMapper.selectByid(sequenceNbr);
+        regionalCompaniesData.setRegionalAddress(regionalCompanies.getRegionalAddress());
+	    return ResponseHelper.buildResponse(regionalCompaniesData);
 	}
 
 	/**
@@ -110,7 +160,58 @@ public class RegionalCompaniesController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
 	@GetMapping(value = "/list")
-	public ResponseModel<List<RegionalCompaniesDto>> selectForList() {
-	    return ResponseHelper.buildResponse(regionalCompaniesServiceImpl.queryForRegionalCompaniesList());
+	public ResponseModel<Page<RegionalCompanies> > selectForList(
+	        @RequestParam(required=false) String regionalCompaniesName,
+            @RequestParam(required=false) Long sequenceNbr,
+            @RequestParam(value = "current") int current,
+            @RequestParam(value = "size") int size
+            ) {
+        //获取用户所在经销商单位
+        Long unitId=null;
+        if(sequenceNbr==null){
+            UserUnitInformationDto userUnitInformationDto=personnelBusinessMapper.getUserUnitInformationDto( getUserInfo().getUserId());
+            unitId=userUnitInformationDto.getAmosUnitId();
+        }
+        PageHelper.startPage(current, size);
+        List<RegionalCompanies> date=regionalCompaniesMapper.selectListData( regionalCompaniesName,unitId,sequenceNbr);
+
+        PageInfo<RegionalCompanies> pages = new PageInfo(date);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<RegionalCompanies> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<RegionalCompanies>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(pages.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(pages.getList());
+	    return ResponseHelper.buildResponse(pagenew);
 	}
+
+    public JSONArray getRegionName() {
+        JSONArray jsonArray = new JSONArray();
+        if (redisUtil.hasKey(regionRedis)) {
+            jsonArray = JSONArray.parseArray(redisUtil.get(regionRedis).toString());
+        } else {
+            Collection<RegionModel> regionChild = new ArrayList<>();
+            RegionModel regionModel1 = new RegionModel();
+            regionChild.add(regionModel1);
+            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L);
+            Collection<RegionModel> result = collectionFeignClientResult.getResult();
+            for (RegionModel regionModel : result) {
+                if (null != regionModel && null != regionModel.getChildren()) {
+                    for (RegionModel child : regionModel.getChildren()) {
+                        if (null != child && null != child.getChildren()) {
+                            for (RegionModel childChild : child.getChildren()) {
+                                jsonArray.add(childChild);
+                            }
+                            child.setChildren(regionChild);
+                            jsonArray.add(child);
+                        }
+                    }
+                    regionModel.setChildren(regionChild);
+                    jsonArray.add(regionModel);
+                }
+            }
+
+            redisUtil.set(regionRedis, jsonArray);
+        }
+        return jsonArray;
+    }
 }

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

@@ -2,15 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractFillDataMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
+import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,6 +18,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -55,6 +55,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     PeasantHouseholdServiceImpl peasantHouseholdServiceImpl;
     @Autowired
     ContractFillDataMapper contractFillDataMapper;
+
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
     /**
      * 列表查询 示例
      */
@@ -96,7 +99,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
     public void addHouseholdContract(HouseholdContract householdContract){
 
-        householdContract.setContractNumber(this.getnum());//合同编号
+        householdContract.setContractNumber(this.getnum(householdContract.getRegionalCompaniesSeq()));//合同编号
         householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
         householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
         householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
@@ -106,7 +109,7 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     }
     public void reissueHouseholdContract(HouseholdContract householdContract){
 
-        householdContract.setContractNumber(this.getnum());//合同编号
+        householdContract.setContractNumber(this.getnum(householdContract.getRegionalCompaniesSeq()));//合同编号
         householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
         householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
         householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
@@ -114,11 +117,16 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         householdContractMapper.insert(householdContract);
     }
 
-    public String getnum() {
-        SimpleDateFormat format = new SimpleDateFormat("YYYYMMddHHmmssSSS");
-        Date date = new Date();
-        String s = "HT"+format.format(date);
-        return s;
+    public String getnum(Long sequenceNbr) {
+        RegionalCompanies da= regionalCompaniesMapper.selectRegionName(sequenceNbr);
+        if(da.getCompanyCode()==null||da.getCompanyCode().isEmpty()){
+            throw new BadRequest("区域公司编号为空, 请设置编号");
+        }
+        if(da.getRegionalAddress()==null||da.getRegionalAddress().isEmpty()){
+            throw new BadRequest("区域公司省市区为空, 请设置省市区");
+        }
+        String code=  NumberUtil.getCode(CodeEnum.勘察.getCode(),da.getCompanyCode(),da.getRegionalAddress());
+        return code;
     }
 
 

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PeasantHouseholdEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PhoneRegisterTypeEum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
@@ -11,8 +12,10 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService;
 import com.yeejoin.amos.boot.module.hygf.api.service.IWxService;
+import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
@@ -132,12 +135,15 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
     AmosRequestContext requestContext;
     @Autowired
     ToDoTasksServiceImpl toDoTasksServiceImpl;
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
 
     public static final String SECRETKEY = "qaz";
 
     @Transactional (rollbackFor = Exception.class)
     public PeasantHouseholdDto savePeasantHousehold(PeasantHouseholdDto model, AgencyUserModel userInfo) {
         SurveyInformationDto surveyInformationDto = new SurveyInformationDto();
+        surveyInformationDto.setSurveyNumber(this.getkcNo(model.getRegionalCompaniesSeq()));
         surveyInformationServiceImpl.createWithModel(surveyInformationDto);
 
         model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
@@ -146,7 +152,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         if (model.getCreationTime() == null) {
             model.setCreationTime(new Date());
         }
-        model.setPeasantHouseholdNo(this.getPeasantHouseholdNo());
+        model.setPeasantHouseholdNo(this.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
         model.setIsCertified(model.getIsCertified() == null ? 0 : model.getIsCertified());// 未认证
 
         if (model.getSequenceNbr() == null) {
@@ -215,6 +221,18 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         return this.deleteBySeq(sequenceNbr);
     }
 
+    public String getkcNo(Long sequenceNbr) {
+        RegionalCompanies da= regionalCompaniesMapper.selectRegionName(sequenceNbr);
+        if(da.getCompanyCode()==null||da.getCompanyCode().isEmpty()){
+            throw new BadRequest("区域公司编号为空, 请设置编号");
+        }
+        if(da.getRegionalAddress()==null||da.getRegionalAddress().isEmpty()){
+            throw new BadRequest("区域公司省市区为空, 请设置省市区");
+        }
+        String code=  NumberUtil.getCode(CodeEnum.勘察.getCode(),da.getCompanyCode(),da.getRegionalAddress());
+        return code;
+    }
+
     /**
      * 分页查询
      */
@@ -621,14 +639,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
      * @author Provence
      * @throws
      */
-    public String getPeasantHouseholdNo() {
-        String redisKey = "getPeasantHouseholdNo";
-        String sdf = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        long increment = redisUtils.incr(redisKey, 1);
-        if (increment == 0) {
-            redisUtils.expire(redisKey, nextDay());
+    public String getPeasantHouseholdNo(Long sequenceNbr) {
+        RegionalCompanies da= regionalCompaniesMapper.selectRegionName(sequenceNbr);
+        if(da.getCompanyCode()==null||da.getCompanyCode().isEmpty()){
+            throw new BadRequest("区域公司编号为空, 请设置编号");
+        }
+        if(da.getRegionalAddress()==null||da.getRegionalAddress().isEmpty()){
+            throw new BadRequest("区域公司省市区为空, 请设置省市区");
         }
-        return "N" + sdf + String.format("%05d", increment);
+        String code=  NumberUtil.getCode(CodeEnum.农户.getCode(),da.getCompanyCode(),da.getRegionalAddress());
+        return code;
     }
 
     private long nextDay() {

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

@@ -5,11 +5,15 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.sun.org.apache.bcel.internal.generic.RETURN;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
+import com.yeejoin.amos.boot.module.hygf.api.dto.ReviewDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
@@ -77,6 +81,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
     ToDoTasksServiceImpl toDoTasksServiceImpl;
     @Autowired
     UserMessageMapper userMessageMapper;
+    @Autowired
+    PowerStationMapper powerStationMapper;
+
+
     public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
         String serviceAgent =null;
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
@@ -100,11 +108,35 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
             serviceAgent=userUnitInformationDto.getAmosDealerName();
         }
 
-        return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
+       /// return this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
+        return this.queryPage((int) page.getCurrent(), (int) page.getSize(),powerStationCode,ownersName,serviceAgent);
     }
-    /**
-     * 分页查询
-     */
+
+    //查询电站审核记录
+
+    public Page<PowerStationDto> queryPage(int current, int size,
+            String powerStationCode,
+            String ownersName,String serviceAgent)   {
+
+        PageHelper.startPage(current, size);
+        List<PowerStationDto> list=   powerStationMapper.queryPage(powerStationCode,ownersName,serviceAgent);
+
+
+        PageInfo<PowerStationDto> pages = new PageInfo(list);
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<PowerStationDto>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(pages.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(pages.getList());
+
+        return pagenew;
+    }
+
+
+
+        /**
+         * 分页查询
+         */
     public Page<PowerStationDto> queryForPowerStationPage(Page<PowerStationDto> page,@Condition(Operator.like) String powerStationCode,@Condition(Operator.like) String ownersName,String serviceAgent)   {
         return this.queryForPage(page, "rec_date", false,powerStationCode,ownersName,serviceAgent);
     }

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

@@ -252,6 +252,25 @@ public class QiyuesuoServiceImpl {
     }
 
 
+
+    public  String getPageUrl(Long contractId ) {
+        String url=null;
+        SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
+        ContractViewPageRequest request = new ContractViewPageRequest(contractId);
+        String response = sdkClient.service(request);
+        SdkResponse<ContractPageResult> responseObj = JSONUtils.toQysResponse(response, ContractPageResult.class);
+        if (responseObj.getCode() == 0) {
+            ContractPageResult result = responseObj.getResult();
+            url=result.getPageUrl();
+            logger.info("合同页面地址为:{}", result.getPageUrl());
+        } else {
+            logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
+        }
+      return url;
+    }
+
+
+
     public  String getdownloadUrl(Long contractId ) {
 
           String url=null;

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

@@ -7,21 +7,20 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.hygf.api.Enum.CodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
 import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.SurveyInformationMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.ToDoTasksMapper;
-import com.yeejoin.amos.boot.module.hygf.api.mapper.UserMessageMapper;
+import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
 import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
 import com.yeejoin.amos.boot.module.hygf.api.service.ISurveyInformationService;
 import com.yeejoin.amos.boot.module.hygf.api.util.BeanDtoUtils;
 import com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation;
+import com.yeejoin.amos.boot.module.hygf.api.util.NumberUtil;
 import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -81,7 +80,8 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
 
     @Autowired
     IdxFeginService idxFeginService;
-
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
     @Autowired
     IPowerStationService powerStationService;
     @Autowired
@@ -154,16 +154,18 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         commercial.setProjectAddressName(paddressName.substring(0, paddressName.length() - 2));
         commercial.setSurveyInformationId(surveyInformation.getSequenceNbr());
         commercialService.saveOrUpdate(commercial);
+        //勘察后，更新状态
+        QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();
+        peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformation.getSequenceNbr());
+        PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdQueryWrapper);
 
         //更新资料归档信息
         Information information = BeanDtoUtils.convert(surveyInfoAllDto.getInformation(), Information.class);
+        information.setArchivesNumber(this.getNo(CodeEnum.档案.getCode(),peasantHousehold.getRegionalCompaniesSeq()));
+        information.setFileNumber(this.getNo(CodeEnum.文件.getCode(),peasantHousehold.getRegionalCompaniesSeq()));
         information.setSurveyInformationId(surveyInformation.getSequenceNbr());
         informationService.saveOrUpdate(information);
 
-        //勘察后，更新状态
-        QueryWrapper<PeasantHousehold> peasantHouseholdQueryWrapper = new QueryWrapper<>();
-        peasantHouseholdQueryWrapper.eq("survey_information_id", surveyInformation.getSequenceNbr());
-        PeasantHousehold peasantHousehold = peasantHouseholdServiceImpl.getBaseMapper().selectOne(peasantHouseholdQueryWrapper);
 
         peasantHousehold.setOwnersName(surveyInfoAllDto.getSurveyInformation().getOwnersName());
         peasantHousehold.setTelephone(surveyInfoAllDto.getSurveyInformation().getTelephone());
@@ -230,6 +232,18 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
         return surveyInfoAllDto;
     }
 
+    public String getNo(String type,Long sequenceNbr) {
+        RegionalCompanies da= regionalCompaniesMapper.selectRegionName(sequenceNbr);
+        if(da.getCompanyCode()==null||da.getCompanyCode().isEmpty()){
+            throw new BadRequest("区域公司编号为空, 请设置编号");
+        }
+        if(da.getRegionalAddress()==null||da.getRegionalAddress().isEmpty()){
+            throw new BadRequest("区域公司省市区为空, 请设置省市区");
+        }
+        String code=  NumberUtil.getCode(type,da.getCompanyCode(),da.getRegionalAddress());
+        return code;
+    }
+
     private void submitExamine(PeasantHousehold peasantHousehold) {
         PowerStation powerStation = powerStationService.getObjByNhId(String.valueOf(peasantHousehold.getSequenceNbr()), PowerStationProcessStateEnum.作废.getCode());