diff --git a/private-farm/src/main/java/com/jlt/csa/controller/FarmerContractController.java b/private-farm/src/main/java/com/jlt/csa/controller/FarmerContractController.java index e71527d06..b042db819 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/FarmerContractController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/FarmerContractController.java @@ -74,7 +74,7 @@ public class FarmerContractController extends BaseController public AjaxResult add(@RequestBody FarmerContract farmerContract) { farmerContract.countDays(); - farmerContract.setStatus(DictUtils.getDictValue("csa_contract_status", "待定")); + farmerContract.setStatus(DictUtils.getDictValue("csa_contract_status", "申请")); farmerContract.setCreateBy(getUsername()); return toAjax(farmerContractService.insertFarmerContract(farmerContract)); } @@ -87,7 +87,6 @@ public class FarmerContractController extends BaseController @PutMapping public AjaxResult edit(@RequestBody FarmerContract farmerContract) { - logger.error("--==> AAA"); farmerContract.countDays(); farmerContract.setStatus(null); farmerContract.setUpdateBy(getUsername()); diff --git a/private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java b/private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java index b536e248c..50c8dc0bd 100644 --- a/private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java +++ b/private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java @@ -57,13 +57,15 @@ public class FarmerContractServiceImpl implements IFarmerContractService } // 合约不符合审核条件,返回错误提示 - if (!contract.getStatus().equals(DictUtils.getDictValue("csa_contract_status", "待定"))) { + if (!contract.getStatus().equals(DictUtils.getDictValue("csa_contract_status", "申请"))) { throw new RuntimeException("该合约不符合审核条件!"); } + // 是否是新地主 + boolean isNewFarmer = contract.getFarmerId() == null; Farmer farmer = null; - if (contract.getFarmerId() == null) { + if (isNewFarmer) { // 如果是新签,新建地主信息 farmer = new Farmer(); farmer.setName("待绑定"); @@ -87,13 +89,13 @@ public class FarmerContractServiceImpl implements IFarmerContractService farmer.setWeight(farmer.getWeight().add(contract.getWeight())); farmer.setArchedYears(farmer.getArchedYears() + contract.getArchedYears()); - // 构建合约更新字段 + // 构建审核的合约更新字段 contract = new FarmerContract(); contract.setContractId(contractId); - contract.setStatus("0"); + contract.setStatus("2"); contract.setUpdateBy(getUsername()); - if (contract.getFarmerId() == null) { + if (isNewFarmer) { // 新地主新签 farmerService.insertFarmer(farmer); contract.setFarmerId(farmer.getFarmerId()); @@ -151,7 +153,6 @@ public class FarmerContractServiceImpl implements IFarmerContractService @Override public int updateFarmerContract(FarmerContract farmerContract) { - System.out.println("----------------=====> 111"); farmerContract.setUpdateTime(DateUtils.getNowDate()); return farmerContractMapper.updateFarmerContract(farmerContract); } @@ -165,7 +166,7 @@ public class FarmerContractServiceImpl implements IFarmerContractService @Override public int deleteFarmerContractByContractIds(Long[] contractIds) { - return farmerContractMapper.deleteFarmerContractByContractIds(contractIds, "1"); + return farmerContractMapper.deleteFarmerContractByContractIds(contractIds, "3"); } /** @@ -177,6 +178,6 @@ public class FarmerContractServiceImpl implements IFarmerContractService @Override public int deleteFarmerContractByContractId(Long contractId) { - return farmerContractMapper.deleteFarmerContractByContractId(contractId, "1"); + return farmerContractMapper.deleteFarmerContractByContractId(contractId, "3"); } } diff --git a/ruoyi-ui/src/views/csa/contract/index.vue b/ruoyi-ui/src/views/csa/contract/index.vue index 90474bd63..ad8f946a9 100644 --- a/ruoyi-ui/src/views/csa/contract/index.vue +++ b/ruoyi-ui/src/views/csa/contract/index.vue @@ -138,7 +138,7 @@