zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、修改bug

Browse Source
This commit is contained in:
潘荣晟
2025-10-28 17:52:42 +08:00
parent 1f68b47345
commit 475609b3b2
10 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmpItmPageReqVO.java
View File

@@ -32,4 +32,7 @@ public class TmpItmPageReqVO extends PageParam {
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDate[] createTime;
@Schema(description = "状态")
private String sts;
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TmplFldPageReqVO.java
View File

@@ -28,6 +28,10 @@ public class TmplFldPageReqVO extends PageParam {
@Schema(description = "备注")
private String rmk;
@Schema(description = "状态")
private String sts;
@Schema(description = "是否必填")
private String isMust;

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplItmMapper.java
View File

@@ -15,6 +15,7 @@ public interface TmplItmMapper extends BaseMapperX<TmplItmDO> {
.likeIfPresent(TmplItmDO::getItmName, reqVO.getItmName())
.likeIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum())
.eqIfPresent(TmplItmDO::getRmk, reqVO.getRmk())
.eqIfPresent(TmplItmDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplItmDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplItmDO::getId));
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpFldMapper.java
View File

@@ -17,6 +17,7 @@ public interface TmplTpFldMapper extends BaseMapperX<TmplTpFldDO> {
.eqIfPresent(TmplTpFldDO::getFldDoc, reqVO.getFldDoc())
.eqIfPresent(TmplTpFldDO::getIsMust, reqVO.getIsMust())
.eqIfPresent(TmplTpFldDO::getDatTp, reqVO.getDatTp())
.eqIfPresent(TmplTpFldDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplTpFldDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplTpFldDO::getId));
}

1
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TmplTpMapper.java
View File

@@ -29,6 +29,7 @@ public interface TmplTpMapper extends BaseMapperX<TmplTpDO> {
.eqIfPresent(TmplTpDO::getPrnId, reqVO.getPrnId())
.eqIfPresent(TmplTpDO::getSrt, reqVO.getSrt())
.eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
.eqIfPresent(TmplTpDO::getSts, reqVO.getSts())
.betweenIfPresent(TmplTpDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(TmplTpDO::getId));
}

4
zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TmplTpServiceImpl.java
View File

@@ -252,8 +252,8 @@ public class TmplTpServiceImpl extends ServiceImpl<TmplTpMapper, TmplTpDO> imple
// 1. 根据条件查询匹配的节点
List<TmplTpDO> matchedNodes = baseMapper.selectList(new LambdaQueryWrapper<TmplTpDO>()
.eq(name != null && !name.isEmpty(), TmplTpDO::getName, name)
.eq(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
.like(name != null && !name.isEmpty(), TmplTpDO::getName, name)
.like(num != null && !num.isEmpty(), TmplTpDO::getNum, num));
if (matchedNodes.isEmpty()) {
return new ArrayList<>();

2
zt-module-base/zt-module-base-server/src/main/resources/mapper/tmpltp/TmplTpMapper.xml
View File

@@ -21,6 +21,7 @@
AND rel.DELETED = 0
AND tp.DELETED = 0
AND tp.id = #{id}
and itm.sts=1
</select>
<select id="getField" resultType="com.zt.plat.module.base.controller.admin.templtp.vo.TmplFldRespVO">
@@ -33,6 +34,7 @@
AND r.DELETED = '0'
AND t.DELETED = '0'
AND t.id = #{id}
AND f.sts=1
ORDER BY t.SRT, f.FLD_KY
</select>

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderSaveReqVO.java
View File

@@ -30,7 +30,7 @@ public class PurchaseOrderSaveReqVO {
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "公司编码;推送ERP（必须）不能为空")
private String companyNumber;
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商编码;推送ERP（必须）不能为空")

8
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderServiceImpl.java
View File

@@ -555,6 +555,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
}
@Override
@Transactional(rollbackFor=Exception.class)
public boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO) {
PurchaseOrderDO purchaseOrderDO = purchaseOrderMapper.selectById(purchaseorderReqVO.getId());
if (ObjectUtils.isEmpty(purchaseOrderDO)) {
@@ -570,9 +571,9 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id
BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData();
//如果审核通过
if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(approvalDetail.getStatus())) {
if ("WAIT_PUSH".equals(purchaseorderReqVO.getStatus())) {
purchaseOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());
} else if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(approvalDetail.getStatus())) {
} else {
//如果审核不通过
purchaseOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode());
}
@@ -582,7 +583,6 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
purchaseOrderDO.setTaskId(undoTask.getId());
}
purchaseOrderMapper.updateById(purchaseOrderDO); //更新状态
// 需要调用bpm 审核接口更新审批中的状态
if (DictEnum.BSE_CTRT_STS_WAIT_PUSH.getCode().equals(purchaseorderReqVO.getStatus()) && ObjectUtils.isNotEmpty(undoTask)) {
if (approvalDetail.getStatus().equals(BpmProcessInstanceStatusEnum.RUNNING.getStatus())) {
@@ -599,7 +599,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
bpmProcessInstanceApi.rejectTask(btrrDto);
}
}
return false;
return true;
}
@Override

6
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
View File

@@ -328,9 +328,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
badrDto.setTaskId(undoTask.getId()); // 当前审核任务节点id
BpmApprovalDetailRespDTO approvalDetail = bpmProcessInstanceApi.getApprovalDetail(SecurityFrameworkUtils.getLoginUserId(), badrDto).getData();
//如果审核通过
if (BpmProcessInstanceStatusEnum.APPROVE.getStatus().equals(approvalDetail.getStatus())) {
if ("WAIT_PUSH".equals(salesOrderReviewReqVO.getStatus())) {
salesOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());
} else if (BpmProcessInstanceStatusEnum.REJECT.getStatus().equals(approvalDetail.getStatus())) {
} else {
//如果审核不通过
salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode());
}
@@ -357,7 +357,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
bpmProcessInstanceApi.rejectTask(btrrDto);
}
}
return false;
return true;
}
@Override