|
|
|
@ -1,10 +1,8 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
package jnpf.paymentdoc.controller;
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.ExportParams;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
|
|
|
|
|
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
@ -14,31 +12,42 @@ import jnpf.base.vo.PaginationVO;
|
|
|
|
|
import jnpf.base.UserInfo;
|
|
|
|
|
import jnpf.base.vo.DownloadVO;
|
|
|
|
|
import jnpf.config.ConfigValueUtil;
|
|
|
|
|
import jnpf.contractfile.entity.ContractFileEntity;
|
|
|
|
|
import jnpf.contractfile.service.ContractFileService;
|
|
|
|
|
import jnpf.exception.DataException;
|
|
|
|
|
import jnpf.payment.entity.PaymentEntity;
|
|
|
|
|
import jnpf.payment.entity.Payment_item0Entity;
|
|
|
|
|
import jnpf.payment.mapper.PaymentMapper;
|
|
|
|
|
import jnpf.payment.model.payment.PaymentCrForm;
|
|
|
|
|
import jnpf.payment.service.PaymentService;
|
|
|
|
|
import jnpf.payment.service.Payment_item0Service;
|
|
|
|
|
import jnpf.purchaseback.entity.PurchaseorderEntity;
|
|
|
|
|
import jnpf.purchaseback.service.PurchaseorderService;
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
import jnpf.base.entity.ProvinceEntity;
|
|
|
|
|
import jnpf.paymentdoc.model.paymentdoc.*;
|
|
|
|
|
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
|
|
|
|
|
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
|
|
|
|
|
import jnpf.paymentdoc.entity.*;
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
|
|
|
|
|
import jnpf.util.*;
|
|
|
|
|
import jnpf.base.util.*;
|
|
|
|
|
import jnpf.base.vo.ListVO;
|
|
|
|
|
import jnpf.util.context.SpringContext;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
|
|
|
|
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
import jnpf.engine.entity.FlowTaskEntity;
|
|
|
|
|
import jnpf.base.entity.VisualdevEntity;
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocEntity;
|
|
|
|
|
import jnpf.paymentdoc.service.PaymentdocService;
|
|
|
|
|
import jnpf.paymentdoc.service.Paymentdoc_item0Service;
|
|
|
|
|
import jnpf.paymentdoc.entity.PaymentdocItem0Entity;
|
|
|
|
|
import jnpf.paymentdoc.service.PaymentdocItem0Service;
|
|
|
|
|
import jnpf.exception.WorkFlowException;
|
|
|
|
|
import jnpf.engine.enums.FlowStatusEnum;
|
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
|
|
|
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
import javax.validation.Valid;
|
|
|
|
|
import java.io.FileNotFoundException;
|
|
|
|
|
import java.io.FileOutputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import jnpf.util.GeneraterSwapUtil;
|
|
|
|
@ -47,25 +56,25 @@ import java.util.*;
|
|
|
|
|
import jnpf.util.file.UploadUtil;
|
|
|
|
|
import jnpf.util.enums.FileTypeEnum;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* paymentdoc
|
|
|
|
|
* @版本: V3.2.0
|
|
|
|
|
* @版权: LINKAGE-BOOT
|
|
|
|
|
* @作者: LINKAGE-BOOT研发团队
|
|
|
|
|
* @日期: 2023-02-09
|
|
|
|
|
* @日期: 2023-02-23
|
|
|
|
|
*/
|
|
|
|
|
@Slf4j
|
|
|
|
|
@RestController
|
|
|
|
|
@Api(tags = "paymentdoc" , value = "example")
|
|
|
|
|
@RequestMapping("/api/example/Paymentdoc")
|
|
|
|
|
@Api(tags = "paymentdoc" , value = "paymentdoc")
|
|
|
|
|
@RequestMapping("/api/paymentdoc/Paymentdoc")
|
|
|
|
|
public class PaymentdocController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private GeneraterSwapUtil generaterSwapUtil;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ConfigValueUtil configValueUtil;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private UserProvider userProvider;
|
|
|
|
@ -74,78 +83,13 @@ public class PaymentdocController {
|
|
|
|
|
private PaymentdocService paymentdocService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private Paymentdoc_item0Service paymentdoc_item0Service;
|
|
|
|
|
@Autowired
|
|
|
|
|
private PaymentService paymentService;
|
|
|
|
|
@Autowired
|
|
|
|
|
private PaymentMapper paymentMapper;
|
|
|
|
|
@Autowired
|
|
|
|
|
private Payment_item0Service payment_item0Service;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 付款申请
|
|
|
|
|
*
|
|
|
|
|
* @param
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
// @GetMapping("/{id}")
|
|
|
|
|
@PostMapping("/paymentapplylist")
|
|
|
|
|
public ActionResult paymentapplylist(@RequestBody PaymentdocCrForms paymentdocCrForms) throws DataException {
|
|
|
|
|
|
|
|
|
|
PaymentEntity paymentEntity = new PaymentEntity();
|
|
|
|
|
|
|
|
|
|
PaymentCrForm paymentCrForm =new PaymentCrForm();
|
|
|
|
|
// String mainId =RandomUtil.uuId();
|
|
|
|
|
// UserInfo userInfo=userProvider.get();
|
|
|
|
|
// paymentEntity.setCreatorUserName(paymentdocUpForms.getCreatorUserName());
|
|
|
|
|
// paymentEntity.setCreatorTime(new Date());
|
|
|
|
|
PaymentEntity entity = JsonUtil.getJsonToBean(paymentEntity, PaymentEntity.class);
|
|
|
|
|
// entity.setId(mainId);
|
|
|
|
|
|
|
|
|
|
PaymentdocEntity paymentdocEntity=paymentdocService.getById(paymentdocCrForms.getId());
|
|
|
|
|
//添加到付款单
|
|
|
|
|
// paymentEntity.setId(paymentdocUpForms.getId());
|
|
|
|
|
|
|
|
|
|
paymentEntity.setDocumentno(generaterSwapUtil.getBillNumber("payment" ,false));
|
|
|
|
|
paymentEntity.setPaymentno(paymentdocCrForms.getDocumentNo());
|
|
|
|
|
paymentEntity.setPaymentamount(paymentdocCrForms.getPaymentAmount());
|
|
|
|
|
paymentEntity.setRequestedamount(paymentdocCrForms.getRamount());
|
|
|
|
|
paymentEntity.setBusinessdate(paymentdocCrForms.getBusinessDate());
|
|
|
|
|
paymentEntity.setDuedate(paymentdocCrForms.getDueDate());
|
|
|
|
|
paymentEntity.setStatus(paymentdocCrForms.getStatus());
|
|
|
|
|
paymentEntity.setSuppliercode(paymentdocCrForms.getSupplierCode());
|
|
|
|
|
paymentEntity.setSuppliername(paymentdocCrForms.getSupplierName());
|
|
|
|
|
paymentEntity.setCurrency(paymentCrForm.getCurrency());
|
|
|
|
|
paymentEntity.setPaymenttype(paymentdocCrForms.getPaymentType());
|
|
|
|
|
paymentEntity.setSettlementtype(paymentdocCrForms.getSettlementType());
|
|
|
|
|
paymentEntity.setRemark(paymentdocCrForms.getRemark());
|
|
|
|
|
paymentEntity.setCollectionaccount(paymentdocCrForms.getCollectionAccount());
|
|
|
|
|
paymentEntity.setCollectionbank(paymentdocCrForms.getColectionBank());
|
|
|
|
|
paymentEntity.setCreatorUserId(paymentdocCrForms.getCreatorUserId());
|
|
|
|
|
paymentEntity.setCreatorUserName(paymentdocCrForms.getCreatorUserName());
|
|
|
|
|
paymentEntity.setCreatorTime(paymentdocCrForms.getCreatorTime());
|
|
|
|
|
paymentEntity.setLastModifyUserId(paymentdocCrForms.getLastModifyUserId());
|
|
|
|
|
paymentEntity.setLastModifyUserName(paymentdocCrForms.getLastModifyUserName());
|
|
|
|
|
paymentEntity.setLastModifyTime(paymentdocCrForms.getLastModifyTime());
|
|
|
|
|
paymentMapper.insert(paymentEntity);
|
|
|
|
|
|
|
|
|
|
//修改付款状态
|
|
|
|
|
paymentdocEntity.setIsPay("1");
|
|
|
|
|
paymentdocService.updateById(paymentdocEntity);
|
|
|
|
|
|
|
|
|
|
//子表
|
|
|
|
|
List<Paymentdoc_item0Entity> Paymentdoc_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPaymentdoc_item0List(),Paymentdoc_item0Entity.class);
|
|
|
|
|
List<Payment_item0Entity> Payment_item0List = JsonUtil.getJsonToList(paymentdocCrForms.getPayment_item0List(),Payment_item0Entity.class);
|
|
|
|
|
for(Payment_item0Entity entitys : Payment_item0List){
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setPaymentId(entity.getId());
|
|
|
|
|
payment_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("修改(付款)成功");
|
|
|
|
|
}
|
|
|
|
|
private PaymentdocItem0Service paymentdocItem0Service;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private PurchaseorderService purchaseorderService;
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
private ContractFileService contractFileService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 列表
|
|
|
|
@ -158,17 +102,28 @@ public class PaymentdocController {
|
|
|
|
|
List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(PaymentdocEntity entity:list){
|
|
|
|
|
Map<String,Object> supplierNameMap = new HashMap<>();
|
|
|
|
|
entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",entity.getSupplierName(),supplierNameMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
Map<String,Object> purchaseIdMap = new HashMap<>();
|
|
|
|
|
entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseId(),purchaseIdMap));
|
|
|
|
|
Map<String,Object> contractIdMap = new HashMap<>();
|
|
|
|
|
entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
|
|
|
|
|
Map<String,Object> supplierIdMap = new HashMap<>();
|
|
|
|
|
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
|
|
|
|
|
}
|
|
|
|
|
List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
|
|
|
|
|
for(PaymentdocListVO paymentdocVO:listVO){
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for(PaymentdocListVO vo:listVO){
|
|
|
|
|
FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(vo.getId(), FlowTaskEntity::getStatus);
|
|
|
|
|
if (flowTaskEntity!=null){
|
|
|
|
|
vo.setFlowState(flowTaskEntity.getStatus());
|
|
|
|
|
}else{
|
|
|
|
|
vo.setFlowState(null);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
PageListVO vo=new PageListVO();
|
|
|
|
|
vo.setList(listVO);
|
|
|
|
|
PaginationVO page=JsonUtil.getJsonToBean(paymentdocPagination,PaginationVO.class);
|
|
|
|
@ -180,198 +135,45 @@ public class PaymentdocController {
|
|
|
|
|
/**
|
|
|
|
|
* 创建
|
|
|
|
|
*
|
|
|
|
|
* @param paymentdocCrForm
|
|
|
|
|
* @param crData
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult create(@RequestBody @Valid PaymentdocCrForm paymentdocCrForm) throws DataException {
|
|
|
|
|
public ActionResult create(@RequestBody @Valid Map<String,Object> crData) throws DataException {
|
|
|
|
|
PaymentdocCrForm paymentdocCrForm = JsonUtil.getJsonToBean(crData,PaymentdocCrForm.class);
|
|
|
|
|
String visualId ="398482034802139205";
|
|
|
|
|
VisualdevEntity visualdevEntity =generaterSwapUtil.getVisualEntity(visualId);
|
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
paymentdocCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("fukuanshenqing", false));
|
|
|
|
|
paymentdocCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
paymentdocCrForm.setCreatorTime(userInfo.getUserId());
|
|
|
|
|
PaymentdocEntity entity = JsonUtil.getJsonToBean(paymentdocCrForm, PaymentdocEntity.class);
|
|
|
|
|
entity.setId(mainId);
|
|
|
|
|
paymentdocService.save(entity);
|
|
|
|
|
List<Paymentdoc_item0Entity> Paymentdoc_item0List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdoc_item0List(),Paymentdoc_item0Entity.class);
|
|
|
|
|
for(Paymentdoc_item0Entity entitys : Paymentdoc_item0List){
|
|
|
|
|
List<PaymentdocItem0Entity> PaymentdocItem0List = JsonUtil.getJsonToList(paymentdocCrForm.getPaymentdocitem0List(),PaymentdocItem0Entity.class);
|
|
|
|
|
|
|
|
|
|
for(PaymentdocItem0Entity entitys : PaymentdocItem0List){
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setPaymentdocId(entity.getId());
|
|
|
|
|
paymentdoc_item0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ActionResult.success("创建成功");
|
|
|
|
|
paymentdocItem0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 模板下载
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@ApiOperation("模板下载")
|
|
|
|
|
@GetMapping("/templateDownload")
|
|
|
|
|
public ActionResult<DownloadVO> TemplateDownload(){
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
DownloadVO vo=DownloadVO.builder().build();
|
|
|
|
|
if (FlowStatusEnum.submit.getMessage().equals(paymentdocCrForm.getStatus())){
|
|
|
|
|
try {
|
|
|
|
|
vo.setName("职员信息.xlsx");
|
|
|
|
|
vo.setUrl(UploaderUtil.uploaderFile("/api/Common/DownloadModel?encryption=" ,userInfo.getId()+"#"+"职员信息.xlsx"+"#"+"Temporary"));
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
log.error("信息导出Excel错误:{}" ,e.getMessage());
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
/**
|
|
|
|
|
* 导出Excel
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@ApiOperation("导出Excel")
|
|
|
|
|
@GetMapping("/Actions/Export")
|
|
|
|
|
public ActionResult Export(PaymentdocPaginationExportModel paymentdocPaginationExportModel) throws IOException {
|
|
|
|
|
if (StringUtil.isEmpty(paymentdocPaginationExportModel.getSelectKey())){
|
|
|
|
|
return ActionResult.fail("请选择导出字段");
|
|
|
|
|
}
|
|
|
|
|
PaymentdocPagination paymentdocPagination=JsonUtil.getJsonToBean(paymentdocPaginationExportModel, PaymentdocPagination.class);
|
|
|
|
|
List<PaymentdocEntity> list= paymentdocService.getTypeList(paymentdocPagination,paymentdocPaginationExportModel.getDataType());
|
|
|
|
|
//处理id字段转名称,若无需转或者为空可删除
|
|
|
|
|
for(PaymentdocEntity entity:list){
|
|
|
|
|
Map<String,Object> supplierNameMap = new HashMap<>();
|
|
|
|
|
entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",entity.getSupplierName(),supplierNameMap));
|
|
|
|
|
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
|
|
|
|
|
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
|
|
|
|
|
entity.setLastModifyUserName(generaterSwapUtil.userSelectValue(entity.getLastModifyUserName()));
|
|
|
|
|
}
|
|
|
|
|
List<PaymentdocListVO> listVO=JsonUtil.getJsonToList(list,PaymentdocListVO.class);
|
|
|
|
|
for(PaymentdocListVO paymentdocVO:listVO){
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//转换为map输出
|
|
|
|
|
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
|
|
|
|
|
String[]keys=!StringUtil.isEmpty(paymentdocPaginationExportModel.getSelectKey())?paymentdocPaginationExportModel.getSelectKey().split(","):new String[0];
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
//导出表格
|
|
|
|
|
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
|
|
|
|
|
DownloadVO vo=DownloadVO.builder().build();
|
|
|
|
|
List<ExcelExportEntity> entitys=new ArrayList<>();
|
|
|
|
|
if(keys.length>0){
|
|
|
|
|
for(String key:keys){
|
|
|
|
|
switch(key){
|
|
|
|
|
case "documentNo" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
|
|
|
|
|
break;
|
|
|
|
|
case "businessDate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("申请时间" ,"businessDate"));
|
|
|
|
|
break;
|
|
|
|
|
case "supplierName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
|
|
|
|
|
break;
|
|
|
|
|
case "paymentType" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("付款类型" ,"paymentType"));
|
|
|
|
|
break;
|
|
|
|
|
case "ramount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("申请金额" ,"ramount"));
|
|
|
|
|
break;
|
|
|
|
|
case "dueDate" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("应付日期" ,"dueDate"));
|
|
|
|
|
break;
|
|
|
|
|
case "currency" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
|
|
|
|
|
break;
|
|
|
|
|
case "collectionAccount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("收款账户" ,"collectionAccount"));
|
|
|
|
|
break;
|
|
|
|
|
case "colectionBank" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("收款银行" ,"colectionBank"));
|
|
|
|
|
break;
|
|
|
|
|
case "settlementType" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("结算类型" ,"settlementType"));
|
|
|
|
|
break;
|
|
|
|
|
case "remark" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("备注" ,"remark"));
|
|
|
|
|
break;
|
|
|
|
|
case "paymentAmount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("付款金额" ,"paymentAmount"));
|
|
|
|
|
break;
|
|
|
|
|
case "unpaymentAmount" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("未付款金额" ,"unpaymentAmount"));
|
|
|
|
|
break;
|
|
|
|
|
case "status" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "creatorTime" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("创建时间" ,"creatorTime"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyUserName" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改人名称" ,"lastModifyUserName"));
|
|
|
|
|
break;
|
|
|
|
|
case "lastModifyTime" :
|
|
|
|
|
entitys.add(new ExcelExportEntity("修改时间" ,"lastModifyTime"));
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ExportParams exportParams = new ExportParams(null, "表单信息");
|
|
|
|
|
exportParams.setType(ExcelType.XSSF);
|
|
|
|
|
try{
|
|
|
|
|
@Cleanup Workbook workbook = new HSSFWorkbook();
|
|
|
|
|
if (entitys.size()>0){
|
|
|
|
|
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list);
|
|
|
|
|
}
|
|
|
|
|
String name = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
|
|
|
|
|
|
|
|
|
|
String fileName = configValueUtil.getTemporaryFilePath() + name;
|
|
|
|
|
@Cleanup FileOutputStream output = new FileOutputStream(XSSEscape.escapePath(fileName));
|
|
|
|
|
workbook.write(output);
|
|
|
|
|
//上传文件
|
|
|
|
|
UploadUtil.uploadFile(configValueUtil.getFileType(), fileName, FileTypeEnum.TEMPORARY, name);
|
|
|
|
|
|
|
|
|
|
vo.setName(name);
|
|
|
|
|
vo.setUrl(UploaderUtil.uploaderFile(userInfo.getId() + "#" + name + "#" + "Temporary"));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error("信息导出Excel错误:{}", e.getMessage());
|
|
|
|
|
generaterSwapUtil.submitFlowTask(visualdevEntity,mainId,paymentdocCrForm,userInfo,paymentdocCrForm.getCandidateList());
|
|
|
|
|
} catch (WorkFlowException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
return vo;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 批量删除
|
|
|
|
|
*
|
|
|
|
|
* @param ids
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@DeleteMapping("/batchRemove/{ids}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult batchRemove(@PathVariable("ids") String ids){
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
int i =0;
|
|
|
|
|
for (String allId : idList){
|
|
|
|
|
this.delete(allId);
|
|
|
|
|
i++;
|
|
|
|
|
}
|
|
|
|
|
if (i == 0 ){
|
|
|
|
|
return ActionResult.fail("删除失败");
|
|
|
|
|
//提交流程,状态改为 1审批中
|
|
|
|
|
entity.setDocStatus("1");
|
|
|
|
|
paymentdocService.updateById(entity);
|
|
|
|
|
return ActionResult.success("提交成功,请耐心等待");
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|
return ActionResult.success("保存成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 信息
|
|
|
|
|
*
|
|
|
|
@ -382,53 +184,35 @@ public class PaymentdocController {
|
|
|
|
|
public ActionResult<PaymentdocInfoVO> info(@PathVariable("id") String id){
|
|
|
|
|
PaymentdocEntity entity= paymentdocService.getInfo(id);
|
|
|
|
|
PaymentdocInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentdocInfoVO.class);
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorTime(generaterSwapUtil.userSelectValue(vo.getCreatorTime()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
if(vo.getLastModifyTime()!=null){
|
|
|
|
|
vo.setLastModifyTime(vo.getLastModifyTime());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//子表
|
|
|
|
|
List<Paymentdoc_item0Entity> Paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id);
|
|
|
|
|
for(Paymentdoc_item0Entity paymentdoc_item0Entity : Paymentdoc_item0List){
|
|
|
|
|
}
|
|
|
|
|
vo.setPaymentdoc_item0List(JsonUtil.getJsonToList(Paymentdoc_item0List,Paymentdoc_item0Model.class ));
|
|
|
|
|
List<String> purchaseorderIdList = new ArrayList<>();
|
|
|
|
|
List<PurchaseorderEntity> purchaseorderEntityList = new ArrayList<>();
|
|
|
|
|
List<PaymentdocItem0Entity> PaymentdocItem0List = paymentdocService.GetPaymentdocItem0List(id);
|
|
|
|
|
List<PaymentdocItem0Model> list = JsonUtil.getJsonToList(PaymentdocItem0List,PaymentdocItem0Model.class );
|
|
|
|
|
for (PaymentdocItem0Model paymentdocItem0Model : list) {
|
|
|
|
|
PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(paymentdocItem0Model.getPurchaseorderId());
|
|
|
|
|
if(purchaseorderEntity != null && StringUtils.isNotEmpty(purchaseorderEntity.getContractCode())){
|
|
|
|
|
ContractFileEntity contractFileEntity = contractFileService.getById(purchaseorderEntity.getContractCode());
|
|
|
|
|
if(contractFileEntity != null && StringUtils.isNotEmpty(contractFileEntity.getContractName())){
|
|
|
|
|
purchaseorderEntity.setContractNo(contractFileEntity.getContractCode());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
paymentdocItem0Model.setAllAmount(purchaseorderEntity.getAmount());
|
|
|
|
|
paymentdocItem0Model.setPayPrice(purchaseorderEntity.getPayPrice());
|
|
|
|
|
paymentdocItem0Model.setDocumentNo(purchaseorderEntity.getDocumentNo());
|
|
|
|
|
paymentdocItem0Model.setContractNo(purchaseorderEntity.getContractNo());
|
|
|
|
|
paymentdocItem0Model.setNum(purchaseorderEntity.getNum());
|
|
|
|
|
paymentdocItem0Model.setAdvanceAmount(purchaseorderEntity.getAdvanceAmount());
|
|
|
|
|
paymentdocItem0Model.setRate(purchaseorderEntity.getRate());
|
|
|
|
|
paymentdocItem0Model.setNotAmount(purchaseorderEntity.getNotAmount());
|
|
|
|
|
paymentdocItem0Model.setCreatorTime(purchaseorderEntity.getCreatorTime());
|
|
|
|
|
}
|
|
|
|
|
vo.setPaymentdocItem0List(list);
|
|
|
|
|
//副表
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 表单信息(详情页)
|
|
|
|
|
*
|
|
|
|
|
* @param id
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@GetMapping("/detail/{id}")
|
|
|
|
|
public ActionResult<PaymentdocInfoVO> detailInfo(@PathVariable("id") String id){
|
|
|
|
|
PaymentdocEntity entity= paymentdocService.getInfo(id);
|
|
|
|
|
PaymentdocInfoVO vo=JsonUtil.getJsonToBean(entity, PaymentdocInfoVO.class);
|
|
|
|
|
|
|
|
|
|
//子表数据转换
|
|
|
|
|
List<Paymentdoc_item0Entity> jg_paymentdoc_item0List = paymentdocService.GetPaymentdoc_item0List(id);
|
|
|
|
|
List<Paymentdoc_item0Model> jg_paymentdoc_item0ModelList = JsonUtil.getJsonToList(jg_paymentdoc_item0List,Paymentdoc_item0Model.class);
|
|
|
|
|
for(Paymentdoc_item0Model jg_paymentdoc_item0Model : jg_paymentdoc_item0ModelList){
|
|
|
|
|
Map<String,Object> purchaseorderIdMap = new HashMap<>();
|
|
|
|
|
jg_paymentdoc_item0Model.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("393348986343324485","id","document_no",jg_paymentdoc_item0Model.getPurchaseorderId(),purchaseorderIdMap));
|
|
|
|
|
}
|
|
|
|
|
vo.setPaymentdoc_item0List(jg_paymentdoc_item0ModelList);
|
|
|
|
|
|
|
|
|
|
//附表数据转换
|
|
|
|
|
|
|
|
|
|
//添加到详情表单对象中
|
|
|
|
|
Map<String,Object> supplierNameMap = new HashMap<>();
|
|
|
|
|
vo.setSupplierName(generaterSwapUtil.getPopupSelectValue("393307526961100037","supplier_name","supplier_name",vo.getSupplierName(),supplierNameMap));
|
|
|
|
|
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
|
|
|
|
|
vo.setCreatorTime(generaterSwapUtil.userSelectValue(vo.getCreatorTime()));
|
|
|
|
|
vo.setLastModifyUserName(generaterSwapUtil.userSelectValue(vo.getLastModifyUserName()));
|
|
|
|
|
|
|
|
|
|
return ActionResult.success(vo);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -441,48 +225,46 @@ public class PaymentdocController {
|
|
|
|
|
*/
|
|
|
|
|
@PutMapping("/{id}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid PaymentdocUpForm paymentdocUpForm) throws DataException {
|
|
|
|
|
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid Map<String,Object> upData) throws DataException {
|
|
|
|
|
PaymentdocUpForm paymentdocUpForm = JsonUtil.getJsonToBean(upData,PaymentdocUpForm.class);
|
|
|
|
|
String visualId ="398482034802139205";
|
|
|
|
|
VisualdevEntity visualdevEntity =generaterSwapUtil.getVisualEntity(visualId);
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
PaymentdocEntity entity= paymentdocService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
paymentdocUpForm.setLastModifyUserName(userInfo.getUserId());
|
|
|
|
|
paymentdocUpForm.setLastModifyTime(DateUtil.getNow());
|
|
|
|
|
PaymentdocEntity subentity=JsonUtil.getJsonToBean(paymentdocUpForm, PaymentdocEntity.class);
|
|
|
|
|
subentity.setCreatorUserName(entity.getCreatorUserName());
|
|
|
|
|
subentity.setCreatorTime(entity.getCreatorTime());
|
|
|
|
|
paymentdocService.update(id, subentity);
|
|
|
|
|
|
|
|
|
|
QueryWrapper<Paymentdoc_item0Entity> Paymentdoc_item0queryWrapper = new QueryWrapper<>();
|
|
|
|
|
Paymentdoc_item0queryWrapper.lambda().eq(Paymentdoc_item0Entity::getPaymentdocId, entity.getId());
|
|
|
|
|
paymentdoc_item0Service.remove(Paymentdoc_item0queryWrapper);
|
|
|
|
|
|
|
|
|
|
List<Paymentdoc_item0Entity> Paymentdoc_item0List = JsonUtil.getJsonToList(paymentdocUpForm.getPaymentdoc_item0List(),Paymentdoc_item0Entity.class);
|
|
|
|
|
for(Paymentdoc_item0Entity entitys : Paymentdoc_item0List){
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QueryWrapper<PaymentdocItem0Entity> PaymentdocItem0queryWrapper = new QueryWrapper<>();
|
|
|
|
|
PaymentdocItem0queryWrapper.lambda().eq(PaymentdocItem0Entity::getPaymentdocId, entity.getId());
|
|
|
|
|
paymentdocItem0Service.remove(PaymentdocItem0queryWrapper);
|
|
|
|
|
|
|
|
|
|
List<PaymentdocItem0Entity> PaymentdocItem0List = JsonUtil.getJsonToList(paymentdocUpForm.getPaymentdocitem0List(),PaymentdocItem0Entity.class);
|
|
|
|
|
for(PaymentdocItem0Entity entitys : PaymentdocItem0List){
|
|
|
|
|
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setPaymentdocId(entity.getId());
|
|
|
|
|
paymentdoc_item0Service.save(entitys);
|
|
|
|
|
paymentdocItem0Service.save(entitys);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (FlowStatusEnum.submit.getMessage().equals(paymentdocUpForm.getStatus())){
|
|
|
|
|
try {
|
|
|
|
|
generaterSwapUtil.submitFlowTask(visualdevEntity,id,subentity,userInfo,paymentdocUpForm.getCandidateList());
|
|
|
|
|
//提交流程,状态改为 1审批中
|
|
|
|
|
entity.setDocStatus("1");
|
|
|
|
|
paymentdocService.updateById(entity);
|
|
|
|
|
} catch (WorkFlowException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("提交成功,请耐心等待");
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("更新失败,数据不存在");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 删除
|
|
|
|
|
*
|
|
|
|
@ -494,23 +276,22 @@ public class PaymentdocController {
|
|
|
|
|
public ActionResult delete(@PathVariable("id") String id){
|
|
|
|
|
PaymentdocEntity entity= paymentdocService.getInfo(id);
|
|
|
|
|
if(entity!=null){
|
|
|
|
|
FlowTaskEntity taskEntity = generaterSwapUtil.getInfoSubmit(id, FlowTaskEntity::getId, FlowTaskEntity::getStatus);
|
|
|
|
|
if (taskEntity != null) {
|
|
|
|
|
try {
|
|
|
|
|
generaterSwapUtil.deleteFlowTask(taskEntity);
|
|
|
|
|
} catch (WorkFlowException e) {
|
|
|
|
|
e.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
paymentdocService.delete(entity);
|
|
|
|
|
QueryWrapper<Paymentdoc_item0Entity> queryWrapperPaymentdoc_item0=new QueryWrapper<>();
|
|
|
|
|
queryWrapperPaymentdoc_item0.lambda().eq(Paymentdoc_item0Entity::getPaymentdocId,entity.getId());
|
|
|
|
|
paymentdoc_item0Service.remove(queryWrapperPaymentdoc_item0);
|
|
|
|
|
QueryWrapper<PaymentdocItem0Entity> queryWrapperPaymentdocItem0=new QueryWrapper<>();
|
|
|
|
|
queryWrapperPaymentdocItem0.lambda().eq(PaymentdocItem0Entity::getPaymentdocId,entity.getId());
|
|
|
|
|
paymentdocItem0Service.remove(queryWrapperPaymentdocItem0);
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("删除成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|