diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java index be2d7d9..92117d2 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TmplInscBsnRelController.java @@ -120,4 +120,19 @@ public class TmplInscBsnRelController implements BusinessControllerMarker { BeanUtils.toBean(list, TmplInscBsnRelRespVO.class)); } + + @GetMapping("/value-info") + @Operation(summary = "根据合Id和实例Id获取字段和条款") + @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')") + public CommonResult> valueInfo(@RequestParam("cttId") @Valid @NotEmpty(message = "合同Id不能为空") String cttId, @RequestParam("inscId") @Valid @NotEmpty(message = "模版实例id不能为空") String inscId) { + return success(tmplInscBsnRelService.valueInfo(cttId, inscId)); + } + + @GetMapping("/bsn-info") + @Operation(summary = "根据合id和实例id获取中间表") + @PreAuthorize("@ss.hasPermission('base:tmpl-insc-bsn-rel:query')") + public CommonResult bseInfo(@RequestParam("cttId") @Valid @NotEmpty(message = "合同Id不能为空") String cttId, @RequestParam("inscId") @Valid @NotEmpty(message = "模版实例id不能为空") String inscId) { + return success(tmplInscBsnRelService.bseInfo(cttId, inscId)); + } + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java index 70a16ed..e57b41f 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java @@ -5,6 +5,8 @@ import com.zt.plat.framework.common.pojo.CommonResult; import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.Action; import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.History; import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.OnlyOfficeCallback; +import com.zt.plat.module.base.dal.dataobject.tmpltp.TmplInscBsnRelDO; +import com.zt.plat.module.base.dal.mysql.tmpltp.TmplInscBsnRelMapper; import com.zt.plat.module.base.service.tmpltp.TemplateInstanceService; import com.zt.plat.module.infra.api.file.FileApi; import com.zt.plat.module.infra.api.file.dto.FileCreateReqDTO; @@ -29,7 +31,7 @@ import static com.zt.plat.module.base.controller.admin.templtp.onlyoffice.util.U public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService { private final FileApi fileApi; private final TemplateInstanceService templateInstanceService; - + private final TmplInscBsnRelMapper tmplInscBsnRelMapper; @Override public void processCallback(OnlyOfficeCallback callback, String id,String fileName) { log.info("收到OnlyOffice文档回调: {}", callback.getKey()); @@ -354,7 +356,10 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService fileInfo.put("name", fileRespDTO.getName()); fileInfo.put("directory", fileRespDTO.getDirectory()); fileInfo.put("key", callback.getKey()); - templateInstanceService.updateTemplateInstanceFileUrlByInstanceId(id, JSONObject.toJSONString(fileInfo)); + TmplInscBsnRelDO createReqVO = new TmplInscBsnRelDO(); + createReqVO.setId(Long.valueOf(id)); + createReqVO.setCntt(JSONObject.toJSONString(fileInfo)); + tmplInscBsnRelMapper.updateById(createReqVO); } else { // 创建文件失败,处理错误 log.error("文件创建失败,错误信息:{}", result.getMsg()); diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/FieldAndClauseRespVO.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/FieldAndClauseRespVO.java index ab8984a..26b07b4 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/FieldAndClauseRespVO.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/FieldAndClauseRespVO.java @@ -8,7 +8,7 @@ import java.util.List; @Schema(description = "管理后台 - 合同动态表单 响应 VO") @Data public class FieldAndClauseRespVO { - @Schema(description = "模板分类") + @Schema(description = "模板字段") List tmplFldRespVOS; @Schema(description = "条款") List tmplItmRespVOS; diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java index 8e57b3c..c990704 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelService.java @@ -70,9 +70,22 @@ public interface TmplInscBsnRelService { void getTmplInscBsnRelDetails(TmplInscBsnRelRespVO tmplInscBsnRelRespVO); /** - * 跟新cntt + * 更新cntt * * @param bsnId ,params */ void updateCntt(Long bsnId,String params); + /** + * 获取字段和条款 + * + * @param cttId ,inscId + */ + Map valueInfo(String cttId,String inscId); + + /** + * 获取中间表 + * + * @param cttId ,inscId + */ + TmplInscBsnRelRespVO bseInfo(String cttId,String inscId); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java index 3521570..ac0da63 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscBsnRelServiceImpl.java @@ -23,10 +23,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.module.infra.enums.ErrorCodeConstants.FILE_NOT_EXISTS; @@ -47,32 +44,37 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { private TmplInscBsnRelMapper tmplInscBsnRelMapper; @Resource private TemplateInstanceService templateInstanceService; + @Resource private TmplInscDatBsnService tmplInscDatBsnService; @Resource private TmplInscItmBsnService tmplInscItmBsnService; @Override + @Transactional(rollbackFor = Exception.class) public TmplInscBsnRelRespVO createTmplInscBsnRel(TmplInscBsnRelSaveReqVO createReqVO) { - TemplateInstanceRespVO templateInstance = templateInstanceService.getTemplateInstance(createReqVO.getInscId()); - if (templateInstance == null) { - throw exception(TEMPLATE_INSTANCE_NOT_EXISTS); - } - String type = "cntt"; - if (templateInstance.getCntt().isEmpty() && templateInstance.getOrigCntt().isEmpty()) { - throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS); - } - if (templateInstance.getCntt().isEmpty()) { - type = "origCntt"; - } - //下载文件并且上传文件 - fileUpload(createReqVO, templateInstance, type); +// TemplateInstanceRespVO templateInstance = templateInstanceService.getTemplateInstance(createReqVO.getInscId()); +// if (templateInstance == null) { +// throw exception(TEMPLATE_INSTANCE_NOT_EXISTS); +// } +// String type = "cntt"; +// if (templateInstance.getCntt().isEmpty() && templateInstance.getOrigCntt().isEmpty()) { +// throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS); +// } +// if (templateInstance.getCntt().isEmpty()) { +// type = "origCntt"; +// } +// //下载文件并且上传文件 +// fileUpload(createReqVO, templateInstance, type); // 插入 TmplInscBsnRelDO tmplInscBsnRel = BeanUtils.toBean(createReqVO, TmplInscBsnRelDO.class); + // tmplInscBsnRel.setBsnId(Long.valueOf(createReqVO.getUuid())); tmplInscBsnRelMapper.insert(tmplInscBsnRel); // 返回 return BeanUtils.toBean(tmplInscBsnRel, TmplInscBsnRelRespVO.class); } + + @Override public void updateTmplInscBsnRel(TmplInscBsnRelSaveReqVO updateReqVO) { // 校验存在 @@ -83,7 +85,7 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void deleteTmplInscBsnRel(Long id) { // 校验存在 validateTmplInscBsnRelExists(id); @@ -92,11 +94,10 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public void deleteTmplInscBsnRelListByIds(List ids) { // 校验存在 validateTmplInscBsnRelExists(ids); - // 删除 //删除业务实例字段值 deleteFldOrItmByIds(tmplInscBsnRelMapper.selectByIds(ids).stream().map(TmplInscBsnRelDO::getBsnId).map(String::valueOf).toList(), tmplInscDatBsnService); //删除业务实例字段值 @@ -154,11 +155,12 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { throw exception(TEMPLATE_INSTANCE_FILE_NOT_EXISTS); } TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelDOS.get(0); - tmplInscBsnRelDO.setCntt( params); + tmplInscBsnRelDO.setCntt(params); tmplInscBsnRelMapper.updateById(tmplInscBsnRelDO); log.info("更新业务实例cntt字段值成功"); } + //业务条款 private List setTmplInscItmBsnRespVOS(TmplInscBsnRelRespVO tmplInscBsnRelRespVO) { List tmplInscItmBsnRespVOS = BeanUtils.toBean(SpringUtil.getBean(TmplInscItmBsnMapper.class).selectList(new LambdaQueryWrapper() @@ -288,5 +290,69 @@ public class TmplInscBsnRelServiceImpl implements TmplInscBsnRelService { } } + @Override + public Map valueInfo(String cttId, String inscId) { + // 1、通过实例和合同Id获取业务 + TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectOne( + TmplInscBsnRelDO::getBsnId, cttId, + TmplInscBsnRelDO::getInscId, inscId + ); + if (tmplInscBsnRelDO == null) { + throw exception(TMPL_INSC_BSN_REL_NOT_EXISTS); + } + + List valueInfoS = new ArrayList<>(); + // 2、获取绑定的字段 + List tmplInscDatBsnList = tmplInscDatBsnService + .getTmplInscDatBsnListByBsnId(String.valueOf(tmplInscBsnRelDO.getBsnId())); + + + Optional.ofNullable(tmplInscDatBsnList) + .ifPresent(list -> list.forEach(tmplInscDatBsnRespVO -> { + ValueInfo valueInfo = new ValueInfo( + tmplInscDatBsnRespVO.getId(), + tmplInscDatBsnRespVO.getFldKy(), + tmplInscDatBsnRespVO.getFldVal(), + "field", + tmplInscDatBsnRespVO.getInscFldId() + ); + valueInfoS.add(valueInfo); + })); + + // 3、获取条款 + List tmplInscItmBsnList = tmplInscItmBsnService.getTmplInscItmBsnList(String.valueOf(tmplInscBsnRelDO.getBsnId())); + Optional.ofNullable(tmplInscItmBsnList) + .ifPresent(list -> list.forEach(tmplInscItmBsnRespVO -> { + ValueInfo valueInfo = new ValueInfo( + tmplInscItmBsnRespVO.getId(), + tmplInscItmBsnRespVO.getItmName(), + tmplInscItmBsnRespVO.getVal(), + "item", + tmplInscItmBsnRespVO.getItmId() + ); + valueInfoS.add(valueInfo); + })); + + return Map.of("data", valueInfoS, "id", tmplInscBsnRelDO.getId()); + } + + @Override + public TmplInscBsnRelRespVO bseInfo(String cttId, String inscId) { + TmplInscBsnRelDO tmplInscBsnRelDO = tmplInscBsnRelMapper.selectOne( + TmplInscBsnRelDO::getBsnId, cttId, + TmplInscBsnRelDO::getInscId, inscId + ); + return BeanUtils.toBean(tmplInscBsnRelDO, TmplInscBsnRelRespVO.class); + } + + + private record ValueInfo( + String id, + String label, + String value, + String type, + String codeNumber + ) { + } } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java index 184b2f0..a85fd5a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnService.java @@ -69,5 +69,12 @@ public interface TmplInscDatBsnService { * */ void deleteTmplInscDatBsnListByBsnIds(@Valid @NotEmpty(message = "业务编号不能为空") List ids); + /** + * 通过业务id查询业务字段 + * + * @param id 业务id + * + */ + List getTmplInscDatBsnListByBsnId(@Valid @NotEmpty(message = "业务编号不能为空") String id); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java index 4704d96..cabbfdc 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscDatBsnServiceImpl.java @@ -24,6 +24,7 @@ import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.e import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.base.enums.ErrorCodeConstants.*; +import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_INSC_DAT_BSN_EXISTS; import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_INSC_DAT_BSN_NOT_EXISTS; /** @@ -40,12 +41,20 @@ public class TmplInscDatBsnServiceImpl implements TmplInscDatBsnService { @Override public TmplInscDatBsnRespVO createTmplInscDatBsn(TmplInscDatBsnSaveReqVO createReqVO) { + //判断存在 + validateTmplInscDatBsnExistsByKey(createReqVO); // 插入 TmplInscDatBsnDO tmplInscDatBsn = BeanUtils.toBean(createReqVO, TmplInscDatBsnDO.class); tmplInscDatBsnMapper.insert(tmplInscDatBsn); // 返回 return BeanUtils.toBean(tmplInscDatBsn, TmplInscDatBsnRespVO.class); } + private void validateTmplInscDatBsnExistsByKey(TmplInscDatBsnSaveReqVO createReqVO) { + List tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getInscFldId, createReqVO.getInscFldId()); + if (!tmplInscDatBsnDOS.isEmpty()) { + throw exception(TMPL_INSC_DAT_BSN_EXISTS); + } + } @Override public void updateTmplInscDatBsn(TmplInscDatBsnSaveReqVO updateReqVO) { @@ -101,4 +110,10 @@ public class TmplInscDatBsnServiceImpl implements TmplInscDatBsnService { tmplInscDatBsnMapper.update(new LambdaUpdateWrapper().in(TmplInscDatBsnDO::getBsnId, ids).set(TmplInscDatBsnDO::getDeleted, 1)); } + @Override + public List getTmplInscDatBsnListByBsnId(String id) { + List tmplInscDatBsnDOS = tmplInscDatBsnMapper.selectList(TmplInscDatBsnDO::getBsnId, id); + return BeanUtils.toBean(tmplInscDatBsnDOS, TmplInscDatBsnRespVO.class); + } + } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnService.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnService.java index 4e12ee6..e4de75a 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnService.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnService.java @@ -67,5 +67,12 @@ public interface TmplInscItmBsnService { * @param ids 编号 */ void deleteTmplInscDatBsnListByBsnIds(@Valid @NotEmpty(message = "业务编号不能为空") List ids); + /** + * 获取条款值列表 + * + * @param bsnId 业务编号 + * @return TmplInscItmBsnRespVO + */ + List getTmplInscItmBsnList(@Valid @NotEmpty(message = "创建信息不能为空")String bsnId); } diff --git a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java index 84a81e5..dce8514 100644 --- a/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java +++ b/zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplInscItmBsnServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; + import com.zt.plat.module.base.controller.admin.templtp.vo.*; import com.zt.plat.framework.common.pojo.PageResult; @@ -19,11 +20,11 @@ import com.zt.plat.framework.common.pojo.PageParam; import com.zt.plat.framework.common.util.object.BeanUtils; - import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.framework.common.util.collection.CollectionUtils.diffList; import static com.zt.plat.module.base.enums.ErrorCodeConstants.*; +import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_INSC_ITM_BSN_EXISTS; import static com.zt.plat.module.tmpltp.enums.ErrorCodeConstants.TMPL_INSC_ITM_BSN_NOT_EXISTS; /** @@ -40,6 +41,8 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService { @Override public TmplInscItmBsnRespVO createTmplInscItmBsn(TmplInscItmBsnSaveReqVO createReqVO) { + //校验存在 + validateTmplInscItmBsnExistsByKey(createReqVO); // 插入 TmplInscItmBsnDO tmplInscItmBsn = BeanUtils.toBean(createReqVO, TmplInscItmBsnDO.class); tmplInscItmBsnMapper.insert(tmplInscItmBsn); @@ -47,6 +50,13 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService { return BeanUtils.toBean(tmplInscItmBsn, TmplInscItmBsnRespVO.class); } + void validateTmplInscItmBsnExistsByKey(TmplInscItmBsnSaveReqVO createReqVO) { + List tmplInscItmBsnDOS = tmplInscItmBsnMapper.selectList(TmplInscItmBsnDO::getBsnId, createReqVO.getBsnId(), TmplInscItmBsnDO::getInscItmId, createReqVO.getBsnId()); + if (!tmplInscItmBsnDOS.isEmpty()){ + throw exception(TMPL_INSC_ITM_BSN_EXISTS); + } + } + @Override public void updateTmplInscItmBsn(TmplInscItmBsnSaveReqVO updateReqVO) { // 校验存在 @@ -65,12 +75,12 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService { } @Override - public void deleteTmplInscItmBsnListByIds(List ids) { + public void deleteTmplInscItmBsnListByIds(List ids) { // 校验存在 validateTmplInscItmBsnExists(ids); // 删除 tmplInscItmBsnMapper.deleteByIds(ids); - } + } private void validateTmplInscItmBsnExists(List ids) { List list = tmplInscItmBsnMapper.selectByIds(ids); @@ -101,4 +111,10 @@ public class TmplInscItmBsnServiceImpl implements TmplInscItmBsnService { tmplInscItmBsnMapper.update(new LambdaUpdateWrapper().in(TmplInscItmBsnDO::getBsnId, ids).set(TmplInscItmBsnDO::getDeleted, 1)); } + @Override + public List getTmplInscItmBsnList(String bsnId) { + List tmplInscItmBsnDOS = tmplInscItmBsnMapper.selectList(TmplInscItmBsnDO::getBsnId, bsnId); + return BeanUtils.toBean(tmplInscItmBsnDOS, TmplInscItmBsnRespVO.class); + } + } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrderDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrderDTO.java index 3925ffb..c507738 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrderDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrderDTO.java @@ -283,6 +283,11 @@ public class OrderDTO { */ @TableField("PYER_NUM") private String payerNum; + /** + * 货权准转移类型 + */ + private String meteringType; + /** * 订单明细 diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PurchaseOrderWithDetailsDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PurchaseOrderWithDetailsDTO.java index a67db32..99558e9 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PurchaseOrderWithDetailsDTO.java +++ b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/PurchaseOrderWithDetailsDTO.java @@ -198,6 +198,11 @@ public class PurchaseOrderWithDetailsDTO { * 税码 */ private String taxNum; + + /** + * 货权准转移类型 + */ + private String meteringType; /** * 采购订单明细 */ diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java index 264bec3..722bd03 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderPageReqVO.java @@ -1,5 +1,6 @@ package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo; +import com.alibaba.excel.annotation.ExcelProperty; import lombok.*; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; @@ -133,5 +134,8 @@ public class PurchaseOrderPageReqVO extends PageParam { @Schema(description = "订单分类") private String splyBsnTp; + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java index e929725..0afdcb6 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java @@ -196,4 +196,8 @@ public class PurchaseOrderRespVO { @ExcelProperty(" 审批意见") private String reviewOpinion; + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java index 7b1d2c6..9e535b7 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java @@ -178,4 +178,21 @@ public class PurchaseOrderSaveReqVO { @Schema(description = "订单分类(字典:SPLY_BSN_TP)", example = "2") @ExcelProperty("订单分类") private String splyBsnTp; + + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; + + @Schema(description = "产品组名") + @ExcelProperty("产品组名") + private String pdtGrpName; + @Schema(description = "产品组编码") + @ExcelProperty("产品组编码") + private String pdtGrpCdg; + @Schema(description = "付款方名称") + @ExcelProperty("付款方名称") + private String payerName; + @Schema(description = "付款方编码") + @ExcelProperty("付款方编码") + private String payerNum; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java index fa33874..cc19053 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java @@ -156,4 +156,7 @@ public class SalesOrderPageReqVO extends PageParam { @ExcelProperty("产品组编码") private String pdtGrpCdg; + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java index 0ea0bc9..0a02101 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java @@ -220,5 +220,8 @@ public class SalesOrderRespVO { @Schema(description = "付款方编码") @ExcelProperty("付款方编码") private String payerNum; + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java index 1083eb1..c81d92f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java @@ -198,4 +198,8 @@ public class SalesOrderSaveReqVO { @Schema(description = "付款方编码") @ExcelProperty("付款方编码") private String payerNum; + @Schema(description = "货权转移类型(字典:ASY_MTNG_TP)") + @ExcelProperty("货权转移类型(字典:ASY_MTNG_TP)") + private String meteringType; + } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java index 239e6eb..b17c2a1 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java @@ -283,4 +283,10 @@ public class PurchaseOrderDO extends BusinessBaseDO { */ @TableField("TAX_RTE") private BigDecimal taxRte; + + /** + * 货权准转移类型 + */ + @TableField("MTRG_TP") + private String meteringType; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java index b57601f..c375f28 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java @@ -303,9 +303,8 @@ public class SalesOrderDO extends BusinessBaseDO { */ @TableField("PYER_NUM") private String payerNum; -// /** -// * 税码 -// */ -// @TableField("TAX_NUM") -// private String taxNum; + /** + * 货权准转移类型 + */ + private String meteringType; } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java index 08363db..a6fa05e 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/purchaseorder/PurchaseOrderMapper.java @@ -61,6 +61,7 @@ public interface PurchaseOrderMapper extends BaseMapperX { .eqIfPresent(PurchaseOrderDO::getSplyBsnTp, reqVO.getSplyBsnTp() != null ? reqVO.getSplyBsnTp() : "PUR") .eqIfPresent(PurchaseOrderDO::getCause, reqVO.getCause()) .eqIfPresent(PurchaseOrderDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PurchaseOrderDO::getMeteringType, reqVO.getMeteringType()) .likeIfPresent(PurchaseOrderDO::getPurchaseGroupName, reqVO.getPurchaseGroupName()) .orderByDesc(PurchaseOrderDO::getId)); } diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java index 92976d9..d54853f 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java +++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/mysql/salesorder/SalesOrderMapper.java @@ -27,6 +27,7 @@ public interface SalesOrderMapper extends BaseMapperX { .eqIfPresent(SalesOrderDO::getSupplierNumber, reqVO.getSupplierNumber()) .likeIfPresent(SalesOrderDO::getSupplierName, reqVO.getSupplierName()) .eqIfPresent(SalesOrderDO::getType, reqVO.getType()) + .eqIfPresent(SalesOrderDO::getMeteringType, reqVO.getMeteringType()) .betweenIfPresent(SalesOrderDO::getVoucherDate, reqVO.getVoucherDate()) .eqIfPresent(SalesOrderDO::getPurchaseOrganizationCustomsDeclaration, reqVO.getPurchaseOrganizationCustomsDeclaration()) .likeIfPresent(SalesOrderDO::getReceiveFactoryName, reqVO.getReceiveFactoryName())