日计划管道气销售结算
This commit is contained in:
@ -4,6 +4,8 @@ import java.math.BigDecimal;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -178,5 +180,11 @@ public class LngPngSettleHdrPurVo extends com.xjrsoft.common.model.base.BaseMode
|
|||||||
@ApiModelProperty("lngPngSettlePur子表")
|
@ApiModelProperty("lngPngSettlePur子表")
|
||||||
private List<LngPngSettlePurVo> lngPngSettlePurList;
|
private List<LngPngSettlePurVo> lngPngSettlePurList;
|
||||||
|
|
||||||
|
//附件
|
||||||
|
private List<LngFileUploadVo> lngFileUploadList;
|
||||||
|
|
||||||
|
//对账单
|
||||||
|
private List<LngFileUploadVo> billList;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -202,7 +202,7 @@ public class PngMeasureSalesPurController {
|
|||||||
|
|
||||||
@DeleteMapping
|
@DeleteMapping
|
||||||
@ApiOperation(value = "删除")
|
@ApiOperation(value = "删除")
|
||||||
//@SaCheckPermission("pngMeasureSalesPur:delete")
|
@SaCheckPermission("pngMeasureSalesPur:delete")
|
||||||
public R delete(@Valid @RequestBody List<Long> ids){
|
public R delete(@Valid @RequestBody List<Long> ids){
|
||||||
return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids));
|
return R.ok(dataService.deleteByIds(UpdateLngPngMeasureSalesPurDto.class, ids));
|
||||||
|
|
||||||
|
|||||||
@ -24,8 +24,10 @@ import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
|
|||||||
import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto;
|
import com.xjrsoft.module.dayPlan.dto.LngPngSettleHdrPageDto;
|
||||||
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
|
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
|
||||||
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService;
|
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService;
|
||||||
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
|
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPageVo;
|
||||||
|
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo;
|
||||||
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
|
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrVo;
|
||||||
|
|
||||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||||
@ -57,18 +59,13 @@ public class PngSettleHdrPurController {
|
|||||||
@SaCheckPermission("pngSettleHdrPur:list")
|
@SaCheckPermission("pngSettleHdrPur:list")
|
||||||
public R page(@Valid LngPngSettleHdrPageDto dto){
|
public R page(@Valid LngPngSettleHdrPageDto dto){
|
||||||
|
|
||||||
LambdaQueryWrapper<LngPngSettleHdr> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<LngPngSettleHdrPur> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper
|
queryWrapper
|
||||||
.eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdr::getId,dto.getId())
|
.eq(ObjectUtil.isNotNull(dto.getId()),LngPngSettleHdrPur::getId,dto.getId())
|
||||||
.like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdr::getCpCode,dto.getCpCode())
|
.like(StrUtil.isNotBlank(dto.getCpCode()),LngPngSettleHdrPur::getCpCode,dto.getCpCode())
|
||||||
.like(StrUtil.isNotBlank(dto.getSettleDesc()),LngPngSettleHdr::getSettleDesc,dto.getSettleDesc())
|
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdrPur::getApproCode,dto.getApproCode())
|
||||||
.eq(ObjectUtil.isNotNull(dto.getQtySettleGj()),LngPngSettleHdr::getQtySettleGj,dto.getQtySettleGj())
|
.orderByDesc(LngPngSettleHdrPur::getId);
|
||||||
.eq(ObjectUtil.isNotNull(dto.getQtySettleM3()),LngPngSettleHdr::getQtySettleM3,dto.getQtySettleM3())
|
IPage<LngPngSettleHdrPur> page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper);
|
||||||
.eq(ObjectUtil.isNotNull(dto.getAmount()),LngPngSettleHdr::getAmount,dto.getAmount())
|
|
||||||
.like(StrUtil.isNotBlank(dto.getApproCode()),LngPngSettleHdr::getApproCode,dto.getApproCode())
|
|
||||||
.orderByDesc(LngPngSettleHdr::getId)
|
|
||||||
.select(LngPngSettleHdr.class,x -> VoToColumnUtil.fieldsToColumns(LngPngSettleHdrPageVo.class).contains(x.getProperty()));
|
|
||||||
IPage<LngPngSettleHdr> page = pngSettleHdrPurService.page(ConventPage.getPage(dto), queryWrapper);
|
|
||||||
PageOutput<LngPngSettleHdrPageVo> pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class);
|
PageOutput<LngPngSettleHdrPageVo> pageOutput = ConventPage.getPageOutput(page, LngPngSettleHdrPageVo.class);
|
||||||
return R.ok(pageOutput);
|
return R.ok(pageOutput);
|
||||||
}
|
}
|
||||||
@ -77,11 +74,8 @@ public class PngSettleHdrPurController {
|
|||||||
@ApiOperation(value="根据id查询LngPngSettleHdr信息")
|
@ApiOperation(value="根据id查询LngPngSettleHdr信息")
|
||||||
@SaCheckPermission("pngSettleHdrPur:detail")
|
@SaCheckPermission("pngSettleHdrPur:detail")
|
||||||
public R info(@RequestParam Long id){
|
public R info(@RequestParam Long id){
|
||||||
LngPngSettleHdr lngPngSettleHdr = pngSettleHdrPurService.getByIdDeep(id);
|
LngPngSettleHdrPurVo lngPngSettleHdrVo = pngSettleHdrPurService.getInfoById(id);
|
||||||
if (lngPngSettleHdr == null) {
|
return R.ok(lngPngSettleHdrVo);
|
||||||
return R.error("找不到此数据!");
|
|
||||||
}
|
|
||||||
return R.ok(BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = "/datalog")
|
@GetMapping(value = "/datalog")
|
||||||
@ -116,5 +110,11 @@ public class PngSettleHdrPurController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping(value="/cancel")
|
||||||
|
@ApiOperation(value = "取消结算")
|
||||||
|
@SaCheckPermission("pngSettleHdrPur:cancel")
|
||||||
|
public R cancel(@Valid @RequestBody List<Long> ids){
|
||||||
|
pngSettleHdrPurService.cancel(ids);
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@ -47,7 +47,7 @@ import lombok.AllArgsConstructor;
|
|||||||
@RequestMapping("/dayPlan/pngSettleHdr")
|
@RequestMapping("/dayPlan/pngSettleHdr")
|
||||||
@Api(value = "/dayPlan" + "/pngSettleHdr",tags = "管道气销售结算代码")
|
@Api(value = "/dayPlan" + "/pngSettleHdr",tags = "管道气销售结算代码")
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class PngSettleHdrController {
|
public class PngSettleHdrSalesController {
|
||||||
|
|
||||||
|
|
||||||
private final IPngSettleHdrService pngSettleHdrService;
|
private final IPngSettleHdrService pngSettleHdrService;
|
||||||
@ -159,5 +159,13 @@ public class PngSettleHdrController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping(value="/cancel")
|
||||||
|
@ApiOperation(value = "取消结算")
|
||||||
|
@SaCheckPermission("pngSettleHdr:cancel")
|
||||||
|
public R cancel(@Valid @RequestBody List<Long> ids){
|
||||||
|
pngSettleHdrService.cancel(ids);
|
||||||
|
return R.ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -186,12 +186,6 @@ public class LngPngSettleHdrPur implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@EntityMapping(thisField = "id", joinField = "settleHdrId")
|
@EntityMapping(thisField = "id", joinField = "settleHdrId")
|
||||||
private List<LngPngSettlePur> lngPngSettlePurList;
|
private List<LngPngSettlePur> lngPngSettlePurList;
|
||||||
/**
|
|
||||||
* lngPngSettlePurDtl
|
|
||||||
*/
|
|
||||||
@ApiModelProperty("lngPngSettlePurDtl子表")
|
|
||||||
@TableField(exist = false)
|
|
||||||
@EntityMapping(thisField = "id", joinField = "settleId")
|
|
||||||
private List<LngPngSettlePurDtl> lngPngSettlePurDtlList;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -276,6 +276,12 @@ public class LngPngSettlePur implements Serializable {
|
|||||||
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
@TableField(fill = FieldFill.INSERT, updateStrategy = FieldStrategy.IGNORED)
|
||||||
private Long ruleUserId;
|
private Long ruleUserId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* lngPngSettlePurDtl
|
||||||
|
*/
|
||||||
|
@ApiModelProperty("lngPngSettlePurDtl子表")
|
||||||
|
@TableField(exist = false)
|
||||||
|
@EntityMapping(thisField = "id", joinField = "settleId")
|
||||||
|
private List<LngPngSettlePurDtl> lngPngSettlePurDtlList;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -3,6 +3,8 @@ package com.xjrsoft.module.dayPlan.mapper;
|
|||||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||||
import com.github.yulichang.base.MPJBaseMapper;
|
import com.github.yulichang.base.MPJBaseMapper;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
|
||||||
|
|
||||||
import org.apache.ibatis.annotations.Mapper;
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -12,6 +14,6 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
* @Version 1.0
|
* @Version 1.0
|
||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface LngPngSettleHdrPurMapper extends MPJBaseMapper<LngPngSettleHdr>,BaseMapper<LngPngSettleHdr> {
|
public interface LngPngSettleHdrPurMapper extends MPJBaseMapper<LngPngSettleHdrPur>,BaseMapper<LngPngSettleHdrPur> {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,9 +1,15 @@
|
|||||||
package com.xjrsoft.module.dayPlan.service;
|
package com.xjrsoft.module.dayPlan.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
import com.github.yulichang.base.MPJBaseService;
|
import com.github.yulichang.base.MPJBaseService;
|
||||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
|
||||||
|
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @title: service
|
* @title: service
|
||||||
@ -12,6 +18,10 @@ import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
|||||||
* @Version 1.0
|
* @Version 1.0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public interface IPngSettleHdrPurService extends MPJBaseService<LngPngSettleHdr>, MPJDeepService<LngPngSettleHdr>, MPJRelationService<LngPngSettleHdr> {
|
public interface IPngSettleHdrPurService extends MPJBaseService<LngPngSettleHdrPur>, MPJDeepService<LngPngSettleHdrPur>, MPJRelationService<LngPngSettleHdrPur> {
|
||||||
|
|
||||||
|
LngPngSettleHdrPurVo getInfoById(Long id);
|
||||||
|
|
||||||
|
void cancel(@Valid List<Long> ids);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,9 @@
|
|||||||
package com.xjrsoft.module.dayPlan.service;
|
package com.xjrsoft.module.dayPlan.service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
import com.github.yulichang.base.MPJBaseService;
|
import com.github.yulichang.base.MPJBaseService;
|
||||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||||
@ -17,4 +21,6 @@ public interface IPngSettleHdrService extends MPJBaseService<LngPngSettleHdr>, M
|
|||||||
|
|
||||||
LngPngSettleHdrVo getInfoById(Long id);
|
LngPngSettleHdrVo getInfoById(Long id);
|
||||||
|
|
||||||
|
void cancel(@Valid List<Long> ids);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,21 +1,39 @@
|
|||||||
package com.xjrsoft.module.dayPlan.service.impl;
|
package com.xjrsoft.module.dayPlan.service.impl;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
||||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur;
|
|
||||||
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper;
|
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl;
|
|
||||||
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper;
|
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
|
||||||
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrMapper;
|
|
||||||
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService;
|
|
||||||
import lombok.AllArgsConstructor;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.stream.Collectors;
|
import javax.validation.Valid;
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||||
|
import com.pictc.datalog.DataOperationContent;
|
||||||
|
import com.pictc.datalog.DataOperationListener;
|
||||||
|
import com.pictc.enums.ApproveCodeEnum;
|
||||||
|
import com.pictc.enums.BusinessCode;
|
||||||
|
import com.pictc.enums.ExceptionCommonCode;
|
||||||
|
import com.pictc.jdbc.JdbcTools;
|
||||||
|
import com.pictc.jdbc.model.JdbcParam;
|
||||||
|
import com.pictc.utils.CollectionUtils;
|
||||||
|
import com.pictc.utils.StringUtils;
|
||||||
|
import com.xjrsoft.common.exception.BusinessException;
|
||||||
|
import com.xjrsoft.module.datalog.service.DatalogService;
|
||||||
|
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrPurDto;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdrPur;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePur;
|
||||||
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettlePurDtl;
|
||||||
|
import com.xjrsoft.module.dayPlan.mapper.LngPngSettleHdrPurMapper;
|
||||||
|
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurDtlMapper;
|
||||||
|
import com.xjrsoft.module.dayPlan.mapper.LngPngSettlePurMapper;
|
||||||
|
import com.xjrsoft.module.dayPlan.service.IPngSettleHdrPurService;
|
||||||
|
import com.xjrsoft.module.dayPlan.vo.LngPngSettleHdrPurVo;
|
||||||
|
import com.xjrsoft.module.system.client.IFileClient;
|
||||||
|
import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
||||||
|
|
||||||
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import shade.powerjob.com.google.common.collect.Lists;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @title: service
|
* @title: service
|
||||||
@ -25,11 +43,88 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrMapper, LngPngSettleHdr> implements IPngSettleHdrPurService {
|
public class PngSettleHdrPurServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrPurMapper, LngPngSettleHdrPur> implements IPngSettleHdrPurService {
|
||||||
private final LngPngSettleHdrMapper pngSettleHdrPurLngPngSettleHdrMapper;
|
|
||||||
|
|
||||||
private final LngPngSettlePurMapper pngSettleHdrPurLngPngSettlePurMapper;
|
private final LngPngSettleHdrPurMapper lngPngSettleHdrPurMapper;
|
||||||
private final LngPngSettlePurDtlMapper pngSettleHdrPurLngPngSettlePurDtlMapper;
|
|
||||||
|
private final LngPngSettlePurMapper lngPngSettlePurMapper;
|
||||||
|
|
||||||
|
private final LngPngSettlePurDtlMapper lngPngSettlePurDtlMapper;
|
||||||
|
|
||||||
|
private final IFileClient fileClient;
|
||||||
|
|
||||||
|
private final DatalogService dataService;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public LngPngSettleHdrPurVo getInfoById(Long id) {
|
||||||
|
LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id);
|
||||||
|
if(lngPngSettleHdr == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(CollectionUtils.isNotEmpty(lngPngSettleHdr.getLngPngSettlePurList())) {
|
||||||
|
for(LngPngSettlePur ss:lngPngSettleHdr.getLngPngSettlePurList()) {
|
||||||
|
List<LngPngSettlePurDtl> list = lngPngSettlePurDtlMapper.selectList(new LambdaQueryWrapper<LngPngSettlePurDtl>()
|
||||||
|
.eq(LngPngSettlePurDtl::getSettleId, ss.getId()));
|
||||||
|
ss.setLngPngSettlePurDtlList(list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
LngPngSettleHdrPurVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrPurVo.class);
|
||||||
|
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId());
|
||||||
|
vo.setLngFileUploadList(fileList);
|
||||||
|
|
||||||
|
List<LngFileUploadVo> billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId());
|
||||||
|
vo.setLngFileUploadList(billFileList);
|
||||||
|
return vo;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void cancel(@Valid List<Long> ids) {
|
||||||
|
List<UpdateLngPngSettleHdrPurDto> tempList = Lists.newArrayList();
|
||||||
|
for(Long id:ids) {
|
||||||
|
LngPngSettleHdrPur lngPngSettleHdr = this.getByIdDeep(id);
|
||||||
|
if (lngPngSettleHdr == null) {
|
||||||
|
throw new BusinessException(BusinessCode.of(10500,"找不到此数据!"));
|
||||||
|
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) &&
|
||||||
|
!ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) {
|
||||||
|
throw new BusinessException(BusinessCode.of(10500,"审批状态变化,不能提交"));
|
||||||
|
}
|
||||||
|
**/
|
||||||
|
lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode());
|
||||||
|
|
||||||
|
tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrPurDto.class));
|
||||||
|
}
|
||||||
|
dataService.updateBatch(tempList,new DataOperationListener<UpdateLngPngSettleHdrPurDto>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UpdateLngPngSettleHdrPurDto before(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UpdateLngPngSettleHdrPurDto after(DataOperationContent<UpdateLngPngSettleHdrPurDto> content) {
|
||||||
|
|
||||||
|
String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}",
|
||||||
|
content.getTableName());
|
||||||
|
List<JdbcParam> params = Lists.newArrayList();
|
||||||
|
JdbcParam outParam = JdbcParam.ofString(null).setOut(true);
|
||||||
|
params.add(outParam);
|
||||||
|
params.add(JdbcParam.ofLong(content.getIdValue()));
|
||||||
|
JdbcTools.call(sql,params);
|
||||||
|
String error = outParam.getStringValue();
|
||||||
|
if (StringUtils.isNotEmpty(error)) {
|
||||||
|
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error));
|
||||||
|
}
|
||||||
|
return content.getObj();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,13 +1,25 @@
|
|||||||
package com.xjrsoft.module.dayPlan.service.impl;
|
package com.xjrsoft.module.dayPlan.service.impl;
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||||
|
import com.pictc.datalog.DataOperationContent;
|
||||||
|
import com.pictc.datalog.DataOperationListener;
|
||||||
|
import com.pictc.enums.ApproveCodeEnum;
|
||||||
|
import com.pictc.enums.BusinessCode;
|
||||||
|
import com.pictc.enums.ExceptionCommonCode;
|
||||||
|
import com.pictc.jdbc.JdbcTools;
|
||||||
|
import com.pictc.jdbc.model.JdbcParam;
|
||||||
import com.pictc.utils.CollectionUtils;
|
import com.pictc.utils.CollectionUtils;
|
||||||
|
import com.pictc.utils.StringUtils;
|
||||||
|
import com.xjrsoft.common.exception.BusinessException;
|
||||||
|
import com.xjrsoft.module.datalog.service.DatalogService;
|
||||||
|
import com.xjrsoft.module.dayPlan.dto.UpdateLngPngSettleHdrDto;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleHdr;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSales;
|
||||||
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
|
import com.xjrsoft.module.dayPlan.entity.LngPngSettleSalesDtl;
|
||||||
@ -21,6 +33,7 @@ import com.xjrsoft.module.system.vo.LngFileUploadVo;
|
|||||||
|
|
||||||
import cn.hutool.core.bean.BeanUtil;
|
import cn.hutool.core.bean.BeanUtil;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
|
import shade.powerjob.com.google.common.collect.Lists;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @title: service
|
* @title: service
|
||||||
@ -39,6 +52,8 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrM
|
|||||||
|
|
||||||
private final IFileClient fileClient;
|
private final IFileClient fileClient;
|
||||||
|
|
||||||
|
private final DatalogService dataService;
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public LngPngSettleHdrVo getInfoById(Long id) {
|
public LngPngSettleHdrVo getInfoById(Long id) {
|
||||||
@ -57,8 +72,57 @@ public class PngSettleHdrServiceImpl extends MPJBaseServiceImpl<LngPngSettleHdrM
|
|||||||
LngPngSettleHdrVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class);
|
LngPngSettleHdrVo vo = BeanUtil.toBean(lngPngSettleHdr, LngPngSettleHdrVo.class);
|
||||||
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId());
|
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_settle_hdr", "lngFileUploadList", vo.getId());
|
||||||
vo.setLngFileUploadList(fileList);
|
vo.setLngFileUploadList(fileList);
|
||||||
|
|
||||||
|
List<LngFileUploadVo> billFileList = fileClient.getTableFiles("lng_png_settle_hdr", "billList", vo.getId());
|
||||||
|
vo.setLngFileUploadList(billFileList);
|
||||||
return vo;
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void cancel(@Valid List<Long> ids) {
|
||||||
|
List<UpdateLngPngSettleHdrDto> tempList = Lists.newArrayList();
|
||||||
|
for(Long id:ids) {
|
||||||
|
LngPngSettleHdr lngPngSettleHdr = this.getByIdDeep(id);
|
||||||
|
if (lngPngSettleHdr == null) {
|
||||||
|
throw new BusinessException(BusinessCode.of(10500,"找不到此数据!"));
|
||||||
|
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
if(!ApproveCodeEnum.WTJ.getCode().equals(lngPngDemand.getApproCode()) &&
|
||||||
|
!ApproveCodeEnum.YBH.getCode().equals(lngPngDemand.getApproCode()) ) {
|
||||||
|
throw new BusinessException(BusinessCode.of(10500,"审批状态变化,不能提交"));
|
||||||
|
}
|
||||||
|
**/
|
||||||
|
lngPngSettleHdr.setApproCode(ApproveCodeEnum.WTJ.getCode());
|
||||||
|
|
||||||
|
tempList.add(BeanUtil.copyProperties(lngPngSettleHdr,UpdateLngPngSettleHdrDto.class));
|
||||||
|
}
|
||||||
|
dataService.updateBatch(tempList,new DataOperationListener<UpdateLngPngSettleHdrDto>() {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UpdateLngPngSettleHdrDto before(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UpdateLngPngSettleHdrDto after(DataOperationContent<UpdateLngPngSettleHdrDto> content) {
|
||||||
|
|
||||||
|
String sql = StringUtils.format("{? = call pc_lng_png_settle.f_submit_x(?)}",
|
||||||
|
content.getTableName());
|
||||||
|
List<JdbcParam> params = Lists.newArrayList();
|
||||||
|
JdbcParam outParam = JdbcParam.ofString(null).setOut(true);
|
||||||
|
params.add(outParam);
|
||||||
|
params.add(JdbcParam.ofLong(content.getIdValue()));
|
||||||
|
JdbcTools.call(sql,params);
|
||||||
|
String error = outParam.getStringValue();
|
||||||
|
if (StringUtils.isNotEmpty(error)) {
|
||||||
|
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_DELETE_EXEC_ERROR, error));
|
||||||
|
}
|
||||||
|
return content.getObj();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user