bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: bonus:e58d6822fd1542a8b5c6a017c07e60f78da83b61
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528
..
compare: bonus:894bd4e91aa4418ea590c78600a45939b9b087d5
Branches Tags
bonus:master
bonus:test0606
bonus:testjob
bonus:removedishbase
bonus:order
bonus:test0530
bonus:rs0527
bonus:liuxin0527
bonus:liuxin0528

No commits in common. "e58d6822fd1542a8b5c6a017c07e60f78da83b61" and "894bd4e91aa4418ea590c78600a45939b9b087d5" have entirely different histories.
e58d6822fd ... 894bd4e91a

5 changed files with 27 additions and 65 deletions
Show Stats Expand all files Collapse all files

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/controller/PurchaseContractController.java
View File

@ -1,11 +1,9 @@
package com.bonus.canteen.core.ims.controller;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractAdd;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractQuery;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractUpdate;
@ -94,7 +92,9 @@ public class PurchaseContractController extends BaseController {
@PostMapping
public AjaxResult add(@RequestBody @Valid PurchaseContractAdd purchaseContractAdd) {
try {
return toAjax(purchaseContractService.insertPurchaseContract(purchaseContractAdd));
PurchaseContract purchaseContract = new PurchaseContract();
BeanUtils.copyProperties(purchaseContractAdd, purchaseContract);
return toAjax(purchaseContractService.insertPurchaseContract(purchaseContract));
} catch (Exception e) {
return error(e.getMessage());
}
@ -110,7 +110,9 @@ public class PurchaseContractController extends BaseController {
@PostMapping("/edit")
public AjaxResult edit(@RequestBody @Valid PurchaseContractUpdate purchaseContractUpdate) {
try {
return toAjax(purchaseContractService.updatePurchaseContract(purchaseContractUpdate));
PurchaseContract purchaseContract = new PurchaseContract();
BeanUtils.copyProperties(purchaseContractUpdate, purchaseContract);
return toAjax(purchaseContractService.updatePurchaseContract(purchaseContract));
} catch (Exception e) {
return error(e.getMessage());
}

3
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchaseContractDetailAdd.java
View File

@ -60,8 +60,5 @@ public class PurchaseContractDetailAdd implements Serializable {
@ApiModelProperty(value = "计量单位名称")
private String unitName;
@ApiModelProperty(value = "备注")
private String remark;
}

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchaseContractDetailUpdate.java
View File

@ -60,7 +60,5 @@ public class PurchaseContractDetailUpdate implements Serializable {
@ApiModelProperty(value = "计量单位名称")
private String unitName;
@ApiModelProperty(value = "备注")
private String remark;
}

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchaseContractService.java
View File

@ -2,8 +2,6 @@ package com.bonus.canteen.core.ims.service;
import java.util.List;
import com.bonus.canteen.core.ims.domain.PurchaseContract;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractAdd;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractUpdate;
import com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO;
/**
@ -32,18 +30,18 @@ public interface IPurchaseContractService {
/**
* 新增采购合同主
*
* @param purchaseContractAdd 采购合同主
* @param purchaseContract 采购合同主
* @return 结果
*/
public int insertPurchaseContract(PurchaseContractAdd purchaseContractAdd);
public int insertPurchaseContract(PurchaseContract purchaseContract);
/**
* 修改采购合同主
*
* @param purchaseContractUpdate 采购合同主
* @param purchaseContract 采购合同主
* @return 结果
*/
public int updatePurchaseContract(PurchaseContractUpdate purchaseContractUpdate);
public int updatePurchaseContract(PurchaseContract purchaseContract);
/**
* 批量删除采购合同主

67
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java
View File

@ -9,11 +9,6 @@ import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.ims.domain.PurchaseContractDetail;
import com.bonus.canteen.core.ims.domain.constants.ApproveStatusEnum;
import com.bonus.canteen.core.ims.domain.constants.PurchaseContractStatusEnum;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractAdd;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractDetailAdd;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractDetailUpdate;
import com.bonus.canteen.core.ims.domain.param.PurchaseContractUpdate;
import com.bonus.canteen.core.ims.domain.vo.PurchaseContractDetailVO;
import com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO;
import com.bonus.canteen.core.ims.service.IPurchaseContractDetailService;
import com.bonus.canteen.core.ims.utils.NoGenerateUtils;
@ -54,20 +49,10 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
if(Objects.nonNull(purchaseContract)) {
PurchaseContractDetail purchaseContractDetail = new PurchaseContractDetail();
purchaseContractDetail.setContractId(contractId);
List<PurchaseContractDetail> purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
purchaseContract.setPurchaseContractDetailList(purchaseContractDetails);
purchaseContract.setPurchaseContractDetailList(inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail));
calContractStatus(purchaseContract);
purchaseContractVO = new PurchaseContractVO();
BeanUtils.copyProperties(purchaseContract, purchaseContractVO);
if(CollUtil.isNotEmpty(purchaseContractDetails)) {
List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>();
purchaseContractDetails.forEach(detail -> {
PurchaseContractDetailVO purchaseContractDetailVO = new PurchaseContractDetailVO();
BeanUtils.copyProperties(detail, purchaseContractDetailVO);
purchaseContractDetailVOList.add(purchaseContractDetailVO);
});
purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetailVOList);
}
}
return purchaseContractVO;
}
@ -86,20 +71,10 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
for(PurchaseContract contract : purchaseContracts) {
PurchaseContractDetail purchaseContractDetail = new PurchaseContractDetail();
purchaseContractDetail.setContractId(contract.getContractId());
List<PurchaseContractDetail> purchaseContractDetailList = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
contract.setPurchaseContractDetailList(purchaseContractDetailList);
contract.setPurchaseContractDetailList(inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail));
calContractStatus(contract);
PurchaseContractVO purchaseContractVO = new PurchaseContractVO();
BeanUtils.copyProperties(contract, purchaseContractVO);
if(CollUtil.isNotEmpty(purchaseContractDetailList)) {
List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>();
purchaseContractDetailList.forEach(detail -> {
PurchaseContractDetailVO purchaseContractDetailVO = new PurchaseContractDetailVO();
BeanUtils.copyProperties(detail, purchaseContractDetailVO);
purchaseContractDetailVOList.add(purchaseContractDetailVO);
});
purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetailVOList);
}
purchaseContractVOList.add(purchaseContractVO);
}
}
@ -124,14 +99,12 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
/**
* 新增采购合同主
*
* @param purchaseContractAdd 采购合同主
* @param purchaseContract 采购合同主
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int insertPurchaseContract(PurchaseContractAdd purchaseContractAdd) {
PurchaseContract purchaseContract = new PurchaseContract();
BeanUtils.copyProperties(purchaseContractAdd, purchaseContract);
public int insertPurchaseContract(PurchaseContract purchaseContract) {
purchaseContract.setContractId(null);
purchaseContract.setCreateTime(DateUtils.getNowDate());
purchaseContract.setCreateBy(SecurityUtils.getUsername());
@ -140,14 +113,12 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
purchaseContract.setContractCode(contractCode);
purchaseContract.setApproveStatus(ApproveStatusEnum.APPROVED.getKey());
int result = purchaseContractMapper.insertPurchaseContract(purchaseContract);
List<PurchaseContractDetailAdd> purchaseContractDetails = purchaseContractAdd.getPurchaseContractDetailList();
List<PurchaseContractDetail> purchaseContractDetails = purchaseContract.getPurchaseContractDetailList();
if(CollUtil.isNotEmpty(purchaseContractDetails)) {
for(PurchaseContractDetailAdd purchaseContractDetailAdd : purchaseContractDetails) {
PurchaseContractDetail purchaseDetailContract = new PurchaseContractDetail();
BeanUtils.copyProperties(purchaseContractDetailAdd, purchaseDetailContract);
purchaseDetailContract.setContractId(purchaseContract.getContractId());
purchaseDetailContract.setContractCode(contractCode);
inspectGoodsDetailService.insertPurchaseContractDetail(purchaseDetailContract);
for(PurchaseContractDetail purchaseContractDetail : purchaseContractDetails) {
purchaseContractDetail.setContractId(purchaseContract.getContractId());
purchaseContractDetail.setContractCode(contractCode);
inspectGoodsDetailService.insertPurchaseContractDetail(purchaseContractDetail);
}
}
return result;
@ -159,14 +130,12 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
/**
* 修改采购合同主
*
* @param purchaseContractUpdate 采购合同主
* @param purchaseContract 采购合同主
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public int updatePurchaseContract(PurchaseContractUpdate purchaseContractUpdate) {
PurchaseContract purchaseContract = new PurchaseContract();
BeanUtils.copyProperties(purchaseContractUpdate, purchaseContract);
public int updatePurchaseContract(PurchaseContract purchaseContract) {
if(Objects.isNull(purchaseContract.getContractId())) {
throw new ServiceException("采购合同ID不能为空");
}
@ -181,14 +150,12 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
purchaseContract.setUpdateBy(SecurityUtils.getUsername());
try {
inspectGoodsDetailService.deletePurchaseContractDetailByContractId(purchaseContract.getContractId());
List<PurchaseContractDetailUpdate> purchaseContractDetailsUpdate = purchaseContractUpdate.getPurchaseContractDetailList();
if(CollUtil.isNotEmpty(purchaseContractDetailsUpdate)) {
for(PurchaseContractDetailUpdate purchaseContractDetailUpdate : purchaseContractDetailsUpdate) {
PurchaseContractDetail purchaseDetailContract = new PurchaseContractDetail();
BeanUtils.copyProperties(purchaseContractDetailUpdate, purchaseDetailContract);
purchaseDetailContract.setContractId(purchaseContract.getContractId());
purchaseDetailContract.setContractCode(purchaseContractVO.getContractCode());
inspectGoodsDetailService.insertPurchaseContractDetail(purchaseDetailContract);
List<PurchaseContractDetail> purchaseContractDetails = purchaseContract.getPurchaseContractDetailList();
if(CollUtil.isNotEmpty(purchaseContractDetails)) {
for(PurchaseContractDetail purchaseContractDetail : purchaseContractDetails) {
purchaseContractDetail.setContractId(purchaseContract.getContractId());
purchaseContractDetail.setContractCode(purchaseContractVO.getContractCode());
inspectGoodsDetailService.insertPurchaseContractDetail(purchaseContractDetail);
}
}
return purchaseContractMapper.updatePurchaseContract(purchaseContract);