修改bug

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

@@ -202,43 +202,9 @@ public class HouseholdContractController extends BaseController {
     @PostMapping (value = "/reissue")
     @ApiOperation(httpMethod = "post", value = "重新发起", notes = "重新发起")
     public ResponseModel<HouseholdContract> reissue(@RequestBody HouseholdContract model ) {
-        HouseholdContract peasantHousehold=  householdContractServiceImpl.getById(model.getSequenceNbr());
-        //生成合同
-        HouseholdContract householdContract=new HouseholdContract();
-
-        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());
-        householdContract.setDealerCode(peasantHousehold.getDealerCode());
-        householdContract.setDealerName(peasantHousehold.getDealerName());
-        householdContract.setPeasantHouseholdId(peasantHousehold.getPeasantHouseholdId());
-        householdContract.setRegionalCompaniesCode(peasantHousehold.getRegionalCompaniesCode());
-        householdContract.setRegionalCompaniesName(peasantHousehold.getRegionalCompaniesName());
-        householdContract.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
-        householdContract.setPeasantHouseholdPhone(peasantHousehold.getPeasantHouseholdPhone());
-        householdContract.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
-        householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
-        householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
-        householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
-        householdContract.setProjectUserId(peasantHousehold.getProjectUserId());
-        householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
-        householdContractServiceImpl.reissueHouseholdContract(householdContract);
-
-        householdContractServiceImpl.reissueinitiateHouseholdContract(householdContract);
+
+
+        HouseholdContract   householdContract= householdContractServiceImpl.reissueinitiateHouseholdContract(model);
 
         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

@@ -15,6 +15,7 @@ import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -190,21 +191,51 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
     }
 
 
+     @Transactional
+    public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model){
+
+
+
+        HouseholdContract peasantHousehold=  this.getById(model.getSequenceNbr());
+        //生成合同
+        HouseholdContract householdContract=new HouseholdContract();
+
+        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());
+        householdContract.setDealerCode(peasantHousehold.getDealerCode());
+        householdContract.setDealerName(peasantHousehold.getDealerName());
+        householdContract.setPeasantHouseholdId(peasantHousehold.getPeasantHouseholdId());
+        householdContract.setRegionalCompaniesCode(peasantHousehold.getRegionalCompaniesCode());
+        householdContract.setRegionalCompaniesName(peasantHousehold.getRegionalCompaniesName());
+        householdContract.setRegionalCompaniesSeq(peasantHousehold.getRegionalCompaniesSeq());
+        householdContract.setPeasantHouseholdPhone(peasantHousehold.getPeasantHouseholdPhone());
+        householdContract.setProjectAddressDetail(peasantHousehold.getProjectAddressDetail());
+        householdContract.setProjectAddressName(peasantHousehold.getProjectAddressName());
+        householdContract.setPermanentAddressDetail(peasantHousehold.getPermanentAddressDetail());
+        householdContract.setPermanentAddressName(peasantHousehold.getPermanentAddressName());
+        householdContract.setProjectUserId(peasantHousehold.getProjectUserId());
+        householdContract.setSurveyStatus(peasantHousehold.getSurveyStatus());
+        this.reissueHouseholdContract(householdContract);
+
+
+
+
 
-    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(householdContract.getPartyA());
         contractDataDto.setContact(householdContract.getPeasantHouseholdPhone());

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

@@ -227,7 +227,7 @@ public class QiyuesuoServiceImpl {
         if(responseObj.getCode() == 0) {
             logger.info("合同发起成功");
         } else {
-            throw new RuntimeException("请求失败");
+            throw new RuntimeException("请求失败"+responseObj.getMessage());
         }
         return responseObj;
     }