From 813671020b816a8b83bdfc4f8b3d14d11c6258ac Mon Sep 17 00:00:00 2001 From: jlt Date: Tue, 5 Apr 2022 13:55:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E5=96=84=E5=90=88=E7=BA=A6?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=AD=97=E5=85=B8=EF=BC=8C=E4=BB=A5=E9=80=82?= =?UTF-8?q?=E5=BA=94=E5=A4=9A=E9=83=A8=E9=97=A8=E6=B5=81=E7=A8=8B=E5=8C=96?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=88=9D=E5=88=9B=E7=89=88=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BB=8E=E7=94=B3=E8=AF=B7=E9=98=B6=E6=AE=B5=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E3=80=82=E5=90=88=E7=BA=A6=E5=AE=A1=E6=A0=B8=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=89=A7=E8=A1=8C=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF=E5=92=8C=E8=AE=A4=E9=A2=86?= =?UTF-8?q?=E8=8F=9C=E5=9C=B02=E4=B8=AA=E6=93=8D=E4=BD=9C=E3=80=82=202?= =?UTF-8?q?=E3=80=81=E5=B0=86=E8=8F=9C=E5=8D=95=E4=BC=9A=E5=91=98=E7=AD=BE?= =?UTF-8?q?=E7=BA=A6=E6=94=B9=E6=88=90=E5=90=88=E7=BA=A6=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E5=86=9C=E5=9C=BA=E4=BC=9A=E5=91=98=E6=94=B9?= =?UTF-8?q?=E6=88=90=E4=BC=9A=E5=91=98=E5=85=A5=E9=A9=BB=EF=BC=88=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E6=98=AF=E6=89=A7=E8=A1=8C=E5=90=88=E7=BA=A6=E7=9A=84?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF=E5=92=8C?= =?UTF-8?q?=E8=AE=A4=E9=A2=86=E8=8F=9C=E5=9C=B0=E6=AD=A5=E9=AA=A4=EF=BC=89?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FarmerContractController.java | 3 +- .../impl/FarmerContractServiceImpl.java | 17 ++-- ruoyi-ui/src/views/csa/contract/index.vue | 6 +- sql/csa.sql | 94 ++++++++++++++----- 4 files changed, 81 insertions(+), 39 deletions(-) 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 @@