Merge branch 'hygf_dev_20230824' of http://39.98.45.134:8090/moa/amos-boot-biz…

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

@@ -23,7 +23,8 @@ public enum   HouseholdContractEnum {
     勘察状态_未勘察("未勘察", "未勘察"),
     勘察状态_已勘察("已勘察", "已勘察"),
     合同状态_未签署("未签署", "未签署"),
-    合同状态_已签署("已签署", "已签署"),
+    合同状态_农户已签署("农户已签署", "农户已签署"),
+    合同状态_双方已签署("双方已签署", "双方已签署"),
     合同状态_已作废("已作废", "已作废");
     /**
      * 名称，描述

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

@@ -31,7 +31,8 @@
         d.next_process_node nextProcessNode,
         d.flow_task_id flowTaskId,
         d.plan_instance_id planInstanceId,
-        u.admin_user_id  adminUserId
+        u.admin_user_id  adminUserId,
+        u.regional_companies_name regionalCompaniesName
         from  hygf_commerce_info c  LEFT JOIN hygf_unit_info u on c.unit_seq=u.sequence_nbr LEFT JOIN hygf_dealer_review d on d.unit_info_id=u.sequence_nbr
         <where>
             u.is_delete=0

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

@@ -158,6 +158,7 @@ public class HouseholdContractController extends BaseController {
 
         HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setSignStatus(HouseholdContractEnum.签字状态_已签字.getCode());
+        householdContrac.setStatus(HouseholdContractEnum.合同状态_农户已签署.getCode());
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -168,7 +169,7 @@ public class HouseholdContractController extends BaseController {
         HouseholdContract householdContrac=  householdContractServiceImpl.getById(sequenceNbr);
         householdContrac.setStampStatus(HouseholdContractEnum.盖章状态_已盖章.getCode());
         householdContrac.setSigningTime(new Date());
-        householdContrac.setStatus(HouseholdContractEnum.合同状态_已签署.getCode());
+        householdContrac.setStatus(HouseholdContractEnum.合同状态_双方已签署.getCode());
         householdContrac.setSealedUser(getUserInfo().getRealName());
         return ResponseHelper.buildResponse(householdContractServiceImpl.updateById(householdContrac));
     }
@@ -198,13 +199,27 @@ public class HouseholdContractController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-    @GetMapping(value = "/reissue/{sequenceNbr}")
+    @GetMapping(value = "/reissue")
     @ApiOperation(httpMethod = "GET", value = "重新发起", notes = "重新发起")
-    public ResponseModel<HouseholdContract> reissue(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        HouseholdContract peasantHousehold=  householdContractServiceImpl.getById(sequenceNbr);
+    public ResponseModel<HouseholdContract> reissue(@RequestBody HouseholdContract model ) {
+        HouseholdContract peasantHousehold=  householdContractServiceImpl.getById(model.getSequenceNbr());
         //生成合同
         HouseholdContract householdContract=new HouseholdContract();
-        householdContract.setPartyA(peasantHousehold.getPartyA());
+
+        householdContract.setPartyA(model.getPartyA());
+        householdContract.setPartyB(model.getPartyB());
+        householdContract.setContractTemplateId(model.getContractTemplateId());
+        householdContract.setRentFree(model.getRentFree());
+        householdContract.setRentCalculationDate(model.getRentCalculationDate());
+        householdContract.setLeaseEndDate(model.getLeaseEndDate());
+        householdContract.setConstructionScale(model.getConstructionScale());
+        householdContract.setComponentQuantityBlock(model.getComponentQuantityBlock());
+        householdContract.setTotalInvestment(model.getTotalInvestment());
+        householdContract.setComponentPower(model.getComponentPower());
+        householdContract.setStationPower(model.getStationPower());
+        householdContract.setName(model.getName());
+
+
         householdContract.setPeasantHouseholdNumber(peasantHousehold.getPeasantHouseholdNumber());
         householdContract.setPeasantHouseholdCard(peasantHousehold.getPeasantHouseholdCard());
         householdContract.setDealerId(peasantHousehold.getDealerId());
@@ -223,7 +238,7 @@ public class HouseholdContractController extends BaseController {
         householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
         householdContractServiceImpl.reissueHouseholdContract(householdContract);
 
-        householdContractServiceImpl.reissueinitiateHouseholdContract(peasantHousehold,householdContract.getSequenceNbr());
+        householdContractServiceImpl.reissueinitiateHouseholdContract(householdContract);
 
         return ResponseHelper.buildResponse(householdContract);
     }

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

@@ -191,26 +191,25 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
 
 
 
-    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model,Long sequenceNbr){
-        HouseholdContract householdContract=  householdContractMapper.selectById(sequenceNbr);
-        householdContract.setPartyA(model.getPartyA());
-        householdContract.setPartyB(model.getPartyB());
-        householdContract.setContractTemplateId(model.getContractTemplateId());
-        householdContract.setRentFree(model.getRentFree());
-        householdContract.setRentCalculationDate(model.getRentCalculationDate());
-        householdContract.setLeaseEndDate(model.getLeaseEndDate());
-        householdContract.setConstructionScale(model.getConstructionScale());
-        householdContract.setComponentQuantityBlock(model.getComponentQuantityBlock());
-        householdContract.setTotalInvestment(model.getTotalInvestment());
-        householdContract.setComponentPower(model.getComponentPower());
-        householdContract.setStationPower(model.getStationPower());
-        householdContract.setName(model.getName());
+    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract householdContract){
+  //      HouseholdContract householdContract=  householdContractMapper.selectById(sequenceNbr);
+//        householdContract.setPartyA(model.getPartyA());
+//        householdContract.setPartyB(model.getPartyB());
+//        householdContract.setContractTemplateId(model.getContractTemplateId());
+//        householdContract.setRentFree(model.getRentFree());
+//        householdContract.setRentCalculationDate(model.getRentCalculationDate());
+//        householdContract.setLeaseEndDate(model.getLeaseEndDate());
+//        householdContract.setConstructionScale(model.getConstructionScale());
+//        householdContract.setComponentQuantityBlock(model.getComponentQuantityBlock());
+//        householdContract.setTotalInvestment(model.getTotalInvestment());
+//        householdContract.setComponentPower(model.getComponentPower());
+//        householdContract.setStationPower(model.getStationPower());
+//        householdContract.setName(model.getName());
         ContractDataDto contractDataDto =new ContractDataDto();
-        contractDataDto.setUsername(model.getPartyA());
-        contractDataDto.setContact(model.getPeasantHouseholdPhone());
-        contractDataDto.setIDCard(model.getPeasantHouseholdCard());
-        contractDataDto.setSubject(model.getName());
-
+        contractDataDto.setUsername(householdContract.getPartyA());
+        contractDataDto.setContact(householdContract.getPeasantHouseholdPhone());
+        contractDataDto.setIDCard(householdContract.getPeasantHouseholdCard());
+        contractDataDto.setSubject(householdContract.getName());
 
 
         QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
@@ -225,9 +224,9 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
         contractDataDto.setSealId(listSealId);
 
         QueryWrapper<ContractTemplate> qu=new QueryWrapper();
-        qu.eq("template_id",model.getContractTemplateId());
+        qu.eq("template_id",householdContract.getContractTemplateId());
         ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
-        contractDataDto.setEmplateId(model.getContractTemplateId());
+        contractDataDto.setEmplateId(householdContract.getContractTemplateId());
         contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
         contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
         contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());