Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1、完善合约状态字典，以适应多部门流程化操作，初创版直接从申请阶段执行。合约审核后，需要执行完善会员信息和认领菜地2个操作。

Browse Source 
2、将菜单会员签约改成合约登记，将农场会员改成会员入驻（实际是执行合约的完善会员信息和认领菜地步骤）。
This commit is contained in:
jlt
2022-04-05 13:55:17 +08:00
parent c703bb5da1
commit 813671020b
4 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
private-farm/src/main/java/com/jlt/csa/controller/FarmerContractController.java
View File

@ -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());

17
private-farm/src/main/java/com/jlt/csa/service/impl/FarmerContractServiceImpl.java
View File

@ -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");
}
}