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/dto/BasicGridAcceptanceDto.java

@@ -73,4 +73,7 @@ public class BasicGridAcceptanceDto extends BaseDto {
     //并网登记id
 
     private Long fonGridId;
+
+//    电站安装规模(kW)
+    private String scale;
 }

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

@@ -158,6 +158,12 @@ public class HygfIcbcRecordDTO  {
          * */
         @ApiModelProperty(value = "区域公司名称")
         private String regionalCompaniesName;
+
+        /*
+         * 商务信息-电站安装规模
+         * */
+        @ApiModelProperty(value = "电站安装规模(kW)")
+        private String scale;
     }
 
 }
\ No newline at end of file

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

@@ -94,4 +94,7 @@ public class PowerStationDto  extends BaseDto {
     
     @ApiModelProperty(value = "合同状态")
     private String status;
+
+    @ApiModelProperty(value = "电站安装规模")
+    private String scale;
 }

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

@@ -257,4 +257,7 @@ public class HouseholdContract extends BaseEntity {
     //查询一个农户拥有的合同是否全是已废弃
     @TableField(exist = false)
     private Boolean isAllDisuse;
+
+    @TableField(exist = false)
+    private String scale;
 }

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

@@ -215,4 +215,10 @@ public class PeasantHousehold extends BaseEntity {
      */
     @TableField(exist = false)
     private Integer isAllRevoke;
+
+    /**
+     * 商务信息安装规模
+     */
+    @TableField(exist = false)
+    private String scale;
 }

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

@@ -19,4 +19,6 @@ public interface HouseholdContractMapper extends BaseMapper<HouseholdContract> {
 
     @UserEmpower(field ={"hygf_household_contract.regional_companies_code"} ,dealerField={"dealer_code","hygf_household_contract.regional_companies_code","developer_user_id"} ,fieldConditions ={"eq","in","eq"} ,relationship="and")
     IPage<HouseholdContract> selectPage(@Param("dto") HouseholdContractPageDto dto);
+
+    String getHygfCommercialScale(String peasantHouseholdNumber);
 }

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

@@ -50,4 +50,6 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
     void deleteHphByNo(String peasantHouseholdNo);
 
     void deleteHhcByNo(String peasantHouseholdNo);
+
+    String getHygfCommercialScale(Long surveyInformationId);
 }

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

@@ -53,4 +53,10 @@
             ORDER BY hygf_household_contract.rec_date DESC, hygf_household_contract.${orderBy} ${dto.isAsc}
         </if>
     </select>
+
+
+
+    <select id="getHygfCommercialScale" resultType="String">
+        select scale from hygf_commercial where survey_information_id =  (select survey_information_id from hygf_peasant_household where peasant_household_no = #{peasantHouseholdNumber} )
+    </select>
 </mapper>

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

@@ -133,4 +133,8 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
     <select id="deleteHhcByNo">
         DELETE FROM hygf_household_contract WHERE peasant_household_number=#{peasantHouseholdNo}
     </select>
+
+    <select id="getHygfCommercialScale" resultType="String">
+        select scale from hygf_commercial where survey_information_id=${surveyInformationId}
+    </select>
 </mapper>

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

@@ -54,6 +54,8 @@ public class BasicGridAcceptanceServiceImpl
 	@Autowired
 	PeasantHouseholdMapper peasantHouseholdMapper;
 	@Autowired
+	HouseholdContractMapper householdContractMapper;
+	@Autowired
 	private CommonServiceImpl commonService;
 
 	private final String OK = "0";
@@ -82,6 +84,15 @@ public class BasicGridAcceptanceServiceImpl
 		pageNew.setCurrent(current);
 		pageNew.setTotal(page.getTotal());
 		pageNew.setSize(size);
+
+		if(page.getList() != null && page.getList().size() > 0) {
+			page.getList().forEach(e -> {
+				if(e.getPeasantHouseholdNo() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+		}
+
 		pageNew.setRecords(page.getList());
 		return pageNew;
 	}

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

@@ -93,6 +93,16 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 //        }
         IPage<HouseholdContract> warningQuestionInfoIPage = householdContractMapper.selectPage(dto);
 
+        if(warningQuestionInfoIPage.getRecords() != null && warningQuestionInfoIPage.getRecords().size() > 0) {
+            warningQuestionInfoIPage.getRecords().forEach(e -> {
+                if(e.getPeasantHouseholdNumber() != null) {
+                    e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNumber()));
+                }
+            });
+
+        }
+
+
         return warningQuestionInfoIPage;
     }
 

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

@@ -22,6 +22,8 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -62,6 +64,9 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @Slf4j
 public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbcRecord, HygfIcbcRecordMapper>
+
+
+
 		implements IHygfIcbcService {
 
 	private static final String trxChannel = "05"; // 05表示小程序
@@ -126,6 +131,9 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 	@Resource(type = HygfIcbcRecordMapper.class)
 	private HygfIcbcRecordMapper hygfIcbcRecordMapper;
 
+	@Resource(type = HouseholdContractMapper.class)
+	private HouseholdContractMapper householdContractMapper;
+
 	@Resource(type = HygfIcbcRequestMapper.class)
 	private HygfIcbcRequestMapper hygfIcbcRequestMapper;
 
@@ -412,6 +420,15 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 		Map<String, List<PeasantHousehold>> peasantHouseholdMap = peasantHouseholds.stream()
 				.collect(Collectors.groupingBy(PeasantHousehold::getAmosUserId));// 根据农户 ID 分组
 		List<PeasantHousehold> peasantHouseholdList = peasantHouseholdMap.get(amosUserId);
+
+		if(peasantHouseholdList != null && peasantHouseholdList.size() > 0) {
+			peasantHouseholdList.forEach(e -> {
+				if(e.getSurveyInformationId() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPeasantHouseholdNo()));
+				}
+			});
+		}
+
 		hygfIcbcRecordDTO.setPeasantHouseholds(
 				Bean.toModels(peasantHouseholdList, HygfIcbcRecordDTO.IcbcPeasantHousehold.class));
 		return hygfIcbcRecordDTO;

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

@@ -271,6 +271,16 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         pagenew.setCurrent(current);
         pagenew.setTotal(objectPageInfo.getTotal());
         pagenew.setSize(size);
+
+        if(newRecords != null && newRecords.size() > 0) {
+            newRecords.forEach(e -> {
+                if(e.getSurveyInformationId() != null) {
+                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                }
+            });
+
+        }
+
         pagenew.setRecords(newRecords);
 
         return pagenew;
@@ -914,6 +924,18 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getRegionalCompaniesName()),"regional_companies_name", "%"+peasantHouseholdPageDto.getRegionalCompaniesName()+"%");
         queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getDeveloperName()),"developer_name", "%"+peasantHouseholdPageDto.getDeveloperName()+"%");
         queryWrapper.orderByDesc("rec_date");
-        return this.baseMapper.selectPage(new Page<>(peasantHouseholdPageDto.getCurrent(),peasantHouseholdPageDto.getSize()),queryWrapper);
+        IPage<PeasantHousehold> peasantHouseholdIPage = this.baseMapper.selectPage(new Page<>(peasantHouseholdPageDto.getCurrent(), peasantHouseholdPageDto.getSize()), queryWrapper);
+
+
+        if(peasantHouseholdIPage.getRecords() != null && peasantHouseholdIPage.getRecords().size() > 0) {
+            peasantHouseholdIPage.getRecords().forEach(e -> {
+                if(e.getSurveyInformationId() != null) {
+                    e.setScale(peasantHouseholdMapper.getHygfCommercialScale(e.getSurveyInformationId()));
+                }
+            });
+
+        }
+
+        return peasantHouseholdIPage;
     }
 }
\ No newline at end of file

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

@@ -94,7 +94,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 	private RedisLockUtil redisLockUtil;
 
 	public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode,
-			String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
+															   String ownersName, AgencyUserModel userInfo, String serviceAgent, String regionalCompaniesName, String processStatus) {
 //        Map<Long, List<RoleModel>> orgRoles = userInfo.getOrgRoles();
 //        Collection<List<RoleModel>> roleModels = orgRoles.values();
 //        if(roleModels !=null){
@@ -118,13 +118,26 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 		// return
 		// this.queryForPowerStationPage(page,powerStationCode,ownersName,serviceAgent);
-		return this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
-				serviceAgent,regionalCompaniesName,processStatus);
+
+		Page<PowerStationDto> powerStationDtoPage = this.queryPage((int) page.getCurrent(), (int) page.getSize(), powerStationCode, ownersName,
+				serviceAgent, regionalCompaniesName, processStatus);
+
+		if(powerStationDtoPage.getRecords() != null && powerStationDtoPage.getRecords().size() > 0) {
+			powerStationDtoPage.getRecords().forEach(e -> {
+				if(e.getPowerStationCode() != null) {
+					e.setScale(householdContractMapper.getHygfCommercialScale(e.getPowerStationCode()));
+				}
+			});
+
+		}
+
+
+		return powerStationDtoPage;
 	}
 
 	// 查询电站审核记录
 	public Page<PowerStationDto> queryPage(int current, int size, String powerStationCode, String ownersName,
-			String serviceAgent,String regionalCompaniesName,String processStatus) {
+										   String serviceAgent,String regionalCompaniesName,String processStatus) {
 
 		PageHelper.startPage(current, size);
 		List<PowerStationDto> list = powerStationMapper.queryPage(powerStationCode, ownersName, serviceAgent,regionalCompaniesName,processStatus);
@@ -241,7 +254,7 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 	@Override
 	public String powerStationExamine(long pageId, String nodeCode, String stationId, String taskId,
-			String planInstanceId, Map<String, Object> kv) {
+									  String planInstanceId, Map<String, Object> kv) {
 		String lockName = String.format("LockName:powerStationExamine:%s", stationId);
 		Boolean isLocked = redisLockUtil.tryLock(lockName, lockName, 10, 1);
 		if (BooleanUtils.isNotTrue(isLocked)) {
@@ -266,33 +279,33 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 			}
 			PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
 			switch (nodeByCode) {
-			case 设计审核:
-				powerStation.setTechnologyStatus(resultObj.getName());
-
-				break;
-			case 投融审核:
-				powerStation.setDesignStatus(resultObj.getName());
-				break;
-			case 法务审核:
-				powerStation.setBusinessStatus(resultObj.getName());
-
-				if (VERIFY_RESULT_YES.equals(result)) {
-					LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
-					lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
-					lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
-					householdContractServiceImpl.update(lambdaUw);
-				}
+				case 设计审核:
+					powerStation.setTechnologyStatus(resultObj.getName());
+
+					break;
+				case 投融审核:
+					powerStation.setDesignStatus(resultObj.getName());
+					break;
+				case 法务审核:
+					powerStation.setBusinessStatus(resultObj.getName());
+
+					if (VERIFY_RESULT_YES.equals(result)) {
+						LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
+						lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
+						lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
+						householdContractServiceImpl.update(lambdaUw);
+					}
 
-				break;
-			case 文件审核:
-				if (VERIFY_RESULT_YES.equals(result)) {
-					flag = false;
-					powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
-				}
-				powerStation.setDrawingReview(resultObj.getName());
-				break;
-			default:
-				break;
+					break;
+				case 文件审核:
+					if (VERIFY_RESULT_YES.equals(result)) {
+						flag = false;
+						powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
+					}
+					powerStation.setDrawingReview(resultObj.getName());
+					break;
+				default:
+					break;
 			}
 		}
 		meg = "任务明细：" + nodeByCode + (VERIFY_RESULT_YES.equals(result) ? "通过" : "不通过");
@@ -462,45 +475,45 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
 
 	public WorkDto getNodeInfoCode(String flowTaskId) {
 		WorkDto workDto = null;
-			FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
-			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
-				JSONObject js = jSONObject.getResult();
-				if (js == null) {
-					throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
-				}
-				LinkedHashMap taskInfo = js.get("taskInfo") != null ? (LinkedHashMap) js.get("taskInfo") : null;
-				String nextProcessNode = taskInfo != null ? taskInfo.get("taskDefinitionKey").toString() : null;
-				List<LinkedHashMap> executor = js.get("executor") != null ? (List<LinkedHashMap>) js.get("executor")
-						: null;
-				String nodeRole = null;
-				if (!executor.isEmpty()) {
-					List<String> idList = executor.stream().map(e -> e.get("groupId").toString())
-							.collect(Collectors.toList());
-					nodeRole = StringUtils.join(idList, ",");
-				}
-
-				LinkedHashMap extensionInfo = js.get("extensionInfo") != null ? (LinkedHashMap) js.get("extensionInfo")
-						: null;
-				String nodeRouting = extensionInfo != null ? extensionInfo.get("nodeRole").toString() : null;
-				workDto = new WorkDto(nodeRouting, nodeRole, nextProcessNode);
+		FeignClientResult<JSONObject> jSONObject = workflowFeignClient.getNodeInfo(flowTaskId);
+		if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.getStatus()))) {
+			JSONObject js = jSONObject.getResult();
+			if (js == null) {
+				throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
 			}
+			LinkedHashMap taskInfo = js.get("taskInfo") != null ? (LinkedHashMap) js.get("taskInfo") : null;
+			String nextProcessNode = taskInfo != null ? taskInfo.get("taskDefinitionKey").toString() : null;
+			List<LinkedHashMap> executor = js.get("executor") != null ? (List<LinkedHashMap>) js.get("executor")
+					: null;
+			String nodeRole = null;
+			if (!executor.isEmpty()) {
+				List<String> idList = executor.stream().map(e -> e.get("groupId").toString())
+						.collect(Collectors.toList());
+				nodeRole = StringUtils.join(idList, ",");
+			}
+
+			LinkedHashMap extensionInfo = js.get("extensionInfo") != null ? (LinkedHashMap) js.get("extensionInfo")
+					: null;
+			String nodeRouting = extensionInfo != null ? extensionInfo.get("nodeRole").toString() : null;
+			workDto = new WorkDto(nodeRouting, nodeRole, nextProcessNode);
+		}
 
-			return workDto;
+		return workDto;
 
 	}
 
 	public String getTaskNoAuth(String processInstanceId) {
 		String flowTaskId = null;
 
-			JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
-			if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
-				LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
-				flowTaskId = jsd != null ? jsd.get("id").toString() : null;
-			}
-			if (flowTaskId == null) {
-				throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
-			}
-			return flowTaskId;
+		JSONObject jSONObject = workflowFeignClient.getTaskNoAuth(processInstanceId);
+		if (IDX_REQUEST_STATE.equals(String.valueOf(jSONObject.get("code")))) {
+			LinkedHashMap jsd = jSONObject.get("data") != null ? (LinkedHashMap) jSONObject.get("data") : null;
+			flowTaskId = jsd != null ? jsd.get("id").toString() : null;
+		}
+		if (flowTaskId == null) {
+			throw new BaseException("获取工作流节点失败！", "400", "获取工作流节点失败！");
+		}
+		return flowTaskId;
 
 	}