修复户用光伏区域公司

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

@@ -45,13 +45,18 @@ public class RegionalCompanies extends BaseEntity {
      */
 	@TableField("unit_id")
     private Long unitId;
+    /**
+     *  经销商业务单位id
+     */
+    @TableField("unit_info_id")
+    private Long unitInfoId;
 
-
-    public RegionalCompanies(Long regionalCompaniesSeq, String regionalCompaniesName, String regionalCompaniesCode, Long unitId) {
+    public RegionalCompanies(Long regionalCompaniesSeq, String regionalCompaniesName, String regionalCompaniesCode, Long unitId,Long unitInfoId) {
         this.regionalCompaniesSeq = regionalCompaniesSeq;
         this.regionalCompaniesName = regionalCompaniesName;
         this.regionalCompaniesCode = regionalCompaniesCode;
         this.unitId = unitId;
+        this.unitInfoId = unitInfoId;
     }
 
     public RegionalCompanies() {

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

@@ -182,6 +182,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             List<RegionalCompanies> regionalCompanies= regUnitInfo.getRegionalCompanies();
             for (RegionalCompanies regionalCompany : regionalCompanies) {
                 regionalCompany.setUnitId(regUnitInfo.getAmosCompanySeq());
+                regionalCompany.setUnitInfoId(regUnitInfo.getSequenceNbr());
             }
             regionalCompaniesService.saveBatch(regionalCompanies);
 
@@ -554,6 +555,15 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             publicAgencyUser.setLockStatus("UNLOCK");
             publicAgencyUserMapper.insert(publicAgencyUser);
 
+
+            LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
+            queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
+            List<RegionalCompanies> list=  regionalCompaniesMapper.selectList(queryWrapper);
+                for (RegionalCompanies companies : list) {
+                    companies.setUnitId(unitInfo.getAmosCompanySeq());
+                }
+             regionalCompaniesService.saveOrUpdateBatch(list);
+
             PersonnelBusiness re=new PersonnelBusiness();
             re.setAmosDealerId(unitInfo.getAmosCompanySeq());
             re.setAmosUnitId(unitInfo.getAmosCompanySeq());
@@ -561,6 +571,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
             re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
             re.setFoundationId(publicAgencyUser.getSequenceNbr());
             re.setUserType("2");
+
             personnelBusinessMapper.insert(re);
 
              // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
@@ -728,7 +739,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
            for (Object aLong : lisd) {
                for (CompanyModel compan : companyModel) {
                    if(compan.getSequenceNbr().longValue()==Long.valueOf(aLong.toString()).longValue()){
-                       RegionalCompanies re=  new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq());
+                       RegionalCompanies re=  new RegionalCompanies(Long.valueOf(aLong.toString()), compan.getCompanyName(), compan.getOrgCode(), unitInfo.getAmosCompanySeq(),unitInfo.getSequenceNbr());
                        regionalComp.add(re);
                        continue;
                    }