yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整请领单作废指令工单逻辑

This commit is contained in:
1378012178@qq.com 2025-12-31 09:27:53 +08:00
parent 2f654817c0
commit 228e32762f
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nursing-unit-common/src/main/java/com/nu/entity/InvoicingDirectiveEntity.java
View File

@ -96,6 +96,8 @@ public class InvoicingDirectiveEntity implements Serializable {
private String izPackage; private String izPackage;
/**执行类型 1单人 2协助 3转单*/ /**执行类型 1单人 2协助 3转单*/
private String optType; private String optType;
/**是否作废 Y已作废 N未作废*/
private String izCancel;
/**单号*/ /**单号*/
private String orderNo; private String orderNo;
@ -135,10 +137,10 @@ public class InvoicingDirectiveEntity implements Serializable {
private String updateEmp; private String updateEmp;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
private String delFlag; private String delFlag;
/**删除日期*/ /**作废日期*/
private Date delTime; private Date cancelTime;
/**删除人*/ /**作废人*/
private String delEmp; private String cancelEmp;
/**发起人ID*/ /**发起人ID*/
private String initiatorId; private String initiatorId;
/**发起人姓名*/ /**发起人姓名*/

10
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/entity/InvoicingOrders.java
View File

@ -127,12 +127,12 @@ public class InvoicingOrders implements Serializable {
private Date updateTime; private Date updateTime;
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
private String delFlag; private String delFlag;
/**删除日期*/ /**作废日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date delTime; private Date cancelTime;
/**删除人*/ /**作废人*/
private String delEmp; private String cancelEmp;
/**发起人ID*/ /**发起人ID*/
private String initiatorId; private String initiatorId;
/**发起人姓名*/ /**发起人姓名*/
@ -143,6 +143,8 @@ public class InvoicingOrders implements Serializable {
private String padPath; private String padPath;
/**执行类型 1单人 2协助 3转单*/ /**执行类型 1单人 2协助 3转单*/
private String optType; private String optType;
/**是否作废 Y已作废 N未作废*/
private String izCancel;
/**接单上限*/ /**接单上限*/
@TableField(exist = false) @TableField(exist = false)

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
View File

@ -203,9 +203,9 @@
<update id="cancelOrder"> <update id="cancelOrder">
update nu_biz_nu_invoicing_directive_order update nu_biz_nu_invoicing_directive_order
set del_flag = '1', set iz_cancel = 'Y',
del_time = #{delTime}, cancel_time = #{cancelTime},
del_emp = #{delEmp}, cancel_emp = #{cancelEmp},
remarks = #{remarks} remarks = #{remarks}
where biz_id = #{bizId} where biz_id = #{bizId}
</update> </update>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java
View File

@ -410,8 +410,8 @@ public class QlOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Invo
log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId()); log.info("UpdateBy:"+invoicingOrdersEntity.getInitiatorId());
InvoicingOrders entity = new InvoicingOrders(); InvoicingOrders entity = new InvoicingOrders();
entity.setBizId(invoicingOrdersEntity.getBizId()); entity.setBizId(invoicingOrdersEntity.getBizId());
entity.setDelEmp(invoicingOrdersEntity.getInitiatorId()); entity.setCancelEmp(invoicingOrdersEntity.getInitiatorId());
entity.setDelTime(new Date()); entity.setCancelTime(new Date());
entity.setRemarks("请领工单作废"); entity.setRemarks("请领工单作废");
baseMapper.cancelOrder(entity); baseMapper.cancelOrder(entity);