修改合同重新发起

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

@@ -198,13 +198,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 +237,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());