From 36509d940d14361429516b9f66f62fa2d4b7a706 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期五, 16 一月 2026 14:24:01 +0800
Subject: [PATCH] 调整工单审批
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 5 +
fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java | 22 ++--
fzzy-igdss-core/src/main/resources/mapper/InoutNoticeInMapper.xml | 12 ++
fzzy-igdss-core/src/main/java/com/fzzy/work/data/WorkStatus.java | 44 ++++++++
fzzy-igdss-core/src/main/java/com/fzzy/work/mapper/WorkOrderMapper.java | 3
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | 43 ++++++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java | 2
fzzy-igdss-core/src/main/resources/mapper/InoutNoticeOutMapper.xml | 12 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java | 53 +++++++++-
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java | 1
/dev/null | 43 --------
fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java | 4
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 2
fzzy-igdss-core/src/main/resources/mapper/WorkOrderMapper.xml | 16 +++
16 files changed, 189 insertions(+), 79 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
index 1466ba1..e083f7b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeIn.java
@@ -2,8 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fzzy.work.data.WorkStatus;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.*;
@@ -78,18 +78,18 @@
@TableField("complete_number")
private Double completeNumber = 0.0;
- @Column(name = "audit_status", columnDefinition = "varchar(10) COMMENT '瀹℃牳鐘舵��(10=鐩戠瀹℃牳锛�20=閾惰瀹℃牳锛�30=閫氳繃)'")
+ @Column(name = "audit_status", columnDefinition = "varchar(10)")
@TableField("audit_status")
- private String auditStatus = "10";
+ private String auditStatus = WorkStatus.STATUS_10.getCode();
- @Column(name = "audit_user", columnDefinition = "varchar(20) COMMENT '瀹℃牳浜�'")
- @TableField("audit_user")
- private String auditUser;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Column(name = "audit_date", columnDefinition = "datetime COMMENT '瀹℃壒鏃堕棿'")
- @TableField("audit_date")
- private Date auditDate;
+// @Column(name = "audit_user", columnDefinition = "varchar(20) COMMENT '瀹℃牳浜�'")
+// @TableField("audit_user")
+// private String auditUser;
+//
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @Column(name = "audit_date", columnDefinition = "datetime COMMENT '瀹℃壒鏃堕棿'")
+// @TableField("audit_date")
+// private Date auditDate;
@Column(name = "complete_status", columnDefinition = "varchar(20) COMMENT '瀹屾垚鐘舵��(NONE=鏈畬鎴愶紝COMPLETE=宸插畬鎴�)'")
@TableField("complete_status")
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
index 486c811..b1b1ee1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutNoticeOut.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java
index 7e6a8bc..f2a5c0e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeInMapper.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.InoutNoticeIn;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface InoutNoticeInMapper extends BaseMapper<InoutNoticeIn> {
+ void auditComplete(@Param("businessId") String businessId, @Param("status") String status);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java
index a90c7ee..5fea53b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/InoutNoticeOutMapper.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.InoutNoticeOut;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface InoutNoticeOutMapper extends BaseMapper<InoutNoticeOut> {
+ void auditComplete(@Param("businessId") String businessId, @Param("status") String status);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index 04312f6..78013ef 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -185,7 +185,7 @@
//娴佺▼涓嶅惎鐢�
if (null == conf || Constant.YN_N.equals(conf.getValTag())) {
data.setAuditStatus(AuditStatus.STATUS_20.getCode());
- data.setAuditDate(data.getCreateTime());
+ //data.setAuditDate(data.getCreateTime());
} else {
BaseResp resp = workService.startByNoticeIn(data, conf);
log.info("---------鍚姩宸ュ崟娴佺▼------{}", resp);
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index d98af1e..5a95626 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -101,6 +101,11 @@
return null == user ? "绯荤粺" : user.getUserName();
}
+ public static String getLoginName() {
+ SysUser user = ShiroUtils.getSysUser();
+ return null == user ? "sys" : user.getLoginName();
+ }
+
public static SysUser getLoginUser() {
return ShiroUtils.getSysUser();
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/data/OrderStatus.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/data/OrderStatus.java
deleted file mode 100644
index c493865..0000000
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/data/OrderStatus.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.fzzy.work.data;
-
-/**
- * @Desc:
- * @Author: Andy.jia
- * @Date: 2025/12/18
- */
-public enum OrderStatus {
-
- STATUS_10("10", "宸叉彁浜�"),
- STATUS_20("20", "宸叉淳鍗�"),
- STATUS_30("30", "澶勭悊涓�"),
- STATUS_40("40", "宸茶В鍐�"),
- STATUS_50("50", "宸插叧闂�"),
- STATUS_60("60", "鎸傝捣");
-
- private String code;
- private String msg;
-
- OrderStatus(String code, String msg) {
- this.code = code;
- this.msg = msg;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public static String getMsg(String code) {
- if(null == code) return null;
- if(OrderStatus.STATUS_10.getCode().equals(code)) return OrderStatus.STATUS_10.getMsg();
- if(OrderStatus.STATUS_20.getCode().equals(code)) return OrderStatus.STATUS_20.getMsg();
- if(OrderStatus.STATUS_30.getCode().equals(code)) return OrderStatus.STATUS_30.getMsg();
- if(OrderStatus.STATUS_40.getCode().equals(code)) return OrderStatus.STATUS_40.getMsg();
- if(OrderStatus.STATUS_50.getCode().equals(code)) return OrderStatus.STATUS_50.getMsg();
- if(OrderStatus.STATUS_60.getCode().equals(code)) return OrderStatus.STATUS_60.getMsg();
- return code;
- }
-}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/data/WorkStatus.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/data/WorkStatus.java
new file mode 100644
index 0000000..bfbfc30
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/data/WorkStatus.java
@@ -0,0 +1,44 @@
+package com.fzzy.work.data;
+
+/**
+ * @Desc:
+ * @Author: Andy.jia
+ * @Date: 2025/12/18
+ */
+public enum WorkStatus {
+
+ STATUS_10("10", "宸叉彁浜�"),
+ STATUS_20("20", "宸叉淳鍗�"),
+ STATUS_30("30", "澶勭悊涓�"),
+ STATUS_40("40", "宸茶В鍐�"),
+ STATUS_50("50", "宸插畬鎴�"),
+ STATUS_60("60", "宸叉嫆缁�"),
+ STATUS_70("70", "鎸傝捣");
+
+ private String code;
+ private String msg;
+
+ WorkStatus(String code, String msg) {
+ this.code = code;
+ this.msg = msg;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public static String getMsg(String code) {
+ if(null == code) return null;
+ if(WorkStatus.STATUS_10.getCode().equals(code)) return WorkStatus.STATUS_10.getMsg();
+ if(WorkStatus.STATUS_20.getCode().equals(code)) return WorkStatus.STATUS_20.getMsg();
+ if(WorkStatus.STATUS_30.getCode().equals(code)) return WorkStatus.STATUS_30.getMsg();
+ if(WorkStatus.STATUS_40.getCode().equals(code)) return WorkStatus.STATUS_40.getMsg();
+ if(WorkStatus.STATUS_50.getCode().equals(code)) return WorkStatus.STATUS_50.getMsg();
+ if(WorkStatus.STATUS_60.getCode().equals(code)) return WorkStatus.STATUS_60.getMsg();
+ return code;
+ }
+}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/mapper/WorkOrderMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/mapper/WorkOrderMapper.java
index ac15208..29464d5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/mapper/WorkOrderMapper.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/mapper/WorkOrderMapper.java
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.work.domain.WorkOrder;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
@Mapper
public interface WorkOrderMapper extends BaseMapper<WorkOrder> {
+
+ void updateStatus(@Param("id") String id, @Param("status") String status);
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
index 3f8da0a..1261414 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/BizWorkService.java
@@ -5,7 +5,7 @@
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkNode;
import com.fzzy.work.domain.WorkOrder;
@@ -50,6 +50,7 @@
* @return 鍝嶅簲缁撴灉
*/
public BaseResp startByNoticeIn(InoutNoticeIn data, WorkOrderConf conf) {
+
if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("娴佺▼鏈惎鐢�");
@@ -67,7 +68,7 @@
work.setUpdateTime(new Date());
work.setTitle("鍏ュ簱閫氱煡鍗曞鎵�");
work.setConfId(conf.getId());
- work.setStatus(OrderStatus.STATUS_30.getCode());
+ work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
String nextNode = this.getNextNode(WorkNode.NODE_START.getCode(), conf).getCode();
@@ -95,7 +96,7 @@
* @return 鍝嶅簲缁撴灉
*/
public BaseResp startByNoticeOut(InoutNoticeOut data, WorkOrderConf conf) {
- if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_10);
+ if (null == conf) conf = confService.getByDeptId(data.getDeptId(), WorkBizType.TYPE_20);
if (Constant.YN_N.equals(conf.getValTag())) return BaseResp.error("娴佺▼鏈惎鐢�");
@@ -112,7 +113,7 @@
work.setUpdateTime(new Date());
work.setTitle("鍑哄簱閫氱煡鍗曞鎵�");
work.setConfId(conf.getId());
- work.setStatus(OrderStatus.STATUS_30.getCode());
+ work.setStatus(WorkStatus.STATUS_30.getCode());
work.setReceiveTime(new Date());
String nextNode = this.getNextNode(WorkNode.NODE_START.getCode(), conf).getCode();
@@ -165,24 +166,60 @@
* 鑾峰彇寰呭鐞嗗伐鍗�
* @return 澶勭悊缁撴灉
*/
- public BaseResp todoByProcess(WorkOrderProcess data) {
+ public BaseResp todoByProcess(WorkOrderProcess process) {
- log.info("-----宸ュ崟澶勭悊-----{}", data);
+ log.info("-----宸ュ崟澶勭悊-----{}", process);
//鑾峰彇宸ュ崟
- WorkOrder work = orderService.selectById(data.getOrderId());
+ WorkOrder work = orderService.selectById(process.getOrderId());
if (null == work) return BaseResp.error("褰撳墠宸ュ崟宸蹭笉瀛樺湪");
- String action = data.getAction();
+ String curNode = process.getNode();
+ //鑾峰彇澶勭悊浜�
+ if (!curNode.equals(work.getNode())) {
+ return BaseResp.error("褰撳墠宸ュ崟宸茶澶勭悊锛岃鍒锋柊椤甸潰閲嶈瘯锛侊紒");
+ }
+
+ //鑾峰彇閰嶇疆淇℃伅
+ WorkOrderConf conf = confService.selectById(work.getConfId());
+ if (null == conf) return BaseResp.error("褰撳墠宸ュ崟鏈厤缃祦绋�");
+
+
+ String action = process.getAction();
+ //娣诲姞璁板綍
+ process.setId(ContextUtil.UUID());
+ process.setCreateTime(new Date());
+ process.setOrderId(work.getId());
+ process.setAssigneeName(ContextUtil.getLoginUserName());
+ process.setAssigneeId(ContextUtil.getLoginName());
+
+ WorkNode node = this.getNextNode(work.getNode(), conf);
+
+ log.info("宸ュ崟瀹℃壒锛歿}锛屽綋鍓嶈妭鐐癸細{}锛屼笅涓�鑺傜偣锛歿}", work.getTitle(), work.getNode(), node);
+
//閫氳繃鎿嶄綔
if ("pass".equals(action)) {
+ process.setAction("閫氳繃");
+ process.setNode(node.getCode());
+ //缁撴潫鍒ゆ柇锛屽鏋滄槸缁撴潫鑺傜偣锛屽垯缁撴潫宸ュ崟
+ if(WorkNode.NODE_END.getCode().equals(process.getNode())){
+ work.setStatus(WorkStatus.STATUS_50.getCode());
+ orderService.complete(work);
+ }
}
//鎷掔粷鎿嶄綔
if ("refuse".equals(action)) {
+ process.setAction("鎷掔粷");
+ process.setNode(WorkNode.NODE_END.getCode());
+ work.setStatus(WorkStatus.STATUS_60.getCode());
+ orderService.complete(work);
}
+ //澧炲姞瀹℃壒璁板綍
+ orderProcessService.addData(process);
+
return BaseResp.success();
}
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
index 90c3b89..c8978c5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -2,9 +2,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fzzy.igds.constant.InoutConstant;
+import com.fzzy.igds.mapper.InoutNoticeInMapper;
+import com.fzzy.igds.mapper.InoutNoticeOutMapper;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.data.WorkBizType;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrder;
@@ -30,15 +33,18 @@
public class WorkOrderService {
@Resource
private WorkOrderMapper workOrderMapper;
-
+ @Resource
+ private InoutNoticeInMapper noticeInMapper;
+ @Resource
+ private InoutNoticeOutMapper noticeOutMapper;
public void addData(WorkOrder data) {
- if(null == data.getId()) data.setId(ContextUtil.generateOrderId("GD"));
+ if (null == data.getId()) data.setId(ContextUtil.generateOrderId("GD"));
- if(null == data.getCompanyId()) data.setCompanyId(ContextUtil.getCompanyId());
+ if (null == data.getCompanyId()) data.setCompanyId(ContextUtil.getCompanyId());
- if(null == data.getCreateBy()){
+ if (null == data.getCreateBy()) {
SysUser user = ContextUtil.getLoginUser();
data.setCreateBy(user.getUserName());
data.setCreateById(user.getLoginName());
@@ -77,7 +83,7 @@
public List<SysDictData> triggerStatus() {
List<SysDictData> list = new ArrayList<SysDictData>();
- for (OrderStatus w : OrderStatus.values()) {
+ for (WorkStatus w : WorkStatus.values()) {
list.add(new SysDictData(w.getMsg(), w.getCode()));
}
return list;
@@ -90,14 +96,14 @@
}
return list;
}
-
- public List<SysDictData> triggerBizType() {
- List<SysDictData> list = new ArrayList<SysDictData>();
+
+ public List<SysDictData> triggerBizType() {
+ List<SysDictData> list = new ArrayList<SysDictData>();
for (WorkBizType w : WorkBizType.values()) {
list.add(new SysDictData(w.getMsg(), w.getCode()));
}
return list;
- }
+ }
/**
* 鑾峰彇鐢ㄦ埛寰呭鐞嗗伐鍗曟暟
@@ -120,7 +126,22 @@
public WorkOrder selectById(String orderId) {
- if(null == orderId) return null;
+ if (null == orderId) return null;
return workOrderMapper.selectById(orderId);
}
+
+ public void complete(WorkOrder work) {
+ //鏇存柊宸ュ崟鐘舵��
+ workOrderMapper.updateStatus(work.getId(), work.getStatus());
+
+ //鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
+ if (work.getBizType().equals(WorkBizType.TYPE_10.getCode())) {
+ noticeInMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ }
+
+ //鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
+ if (work.getBizType().equals(WorkBizType.TYPE_20.getCode())) {
+ noticeOutMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ }
+ }
}
diff --git a/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeInMapper.xml b/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeInMapper.xml
new file mode 100644
index 0000000..576f175
--- /dev/null
+++ b/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeInMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fzzy.igds.mapper.InoutNoticeInMapper">
+
+ <update id="auditComplete" parameterType="String">
+ update d_inout_notice_out set audit_status = #{status},update_time = sysdate()
+ where id = #{businessId}
+ </update>
+
+</mapper>
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeOutMapper.xml b/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeOutMapper.xml
new file mode 100644
index 0000000..aa3fa71
--- /dev/null
+++ b/fzzy-igdss-core/src/main/resources/mapper/InoutNoticeOutMapper.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fzzy.igds.mapper.InoutNoticeOutMapper">
+
+ <update id="auditComplete" parameterType="String">
+ update d_inout_notice_out set audit_status = #{status},update_time = sysdate()
+ where id = #{businessId}
+ </update>
+
+</mapper>
\ No newline at end of file
diff --git a/fzzy-igdss-core/src/main/resources/mapper/WorkOrderMapper.xml b/fzzy-igdss-core/src/main/resources/mapper/WorkOrderMapper.xml
new file mode 100644
index 0000000..c664476
--- /dev/null
+++ b/fzzy-igdss-core/src/main/resources/mapper/WorkOrderMapper.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fzzy.work.mapper.WorkOrderMapper">
+
+ <update id="updateStatus" parameterType="String">
+ update work_order
+ <set>
+ <if test="status != null and status != ''">status = #{status},</if>
+ update_time = sysdate()
+ </set>
+ where id = #{id}
+ </update>
+
+</mapper>
\ No newline at end of file
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
index 8ddf2f9..c3ac938 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/work/WorkOrderPR.java
@@ -6,7 +6,7 @@
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.domain.WorkOrder;
import com.fzzy.work.data.WorkOrderParam;
import com.fzzy.work.domain.WorkOrderConf;
@@ -76,7 +76,7 @@
com.baomidou.mybatisplus.extension.plugins.pagination.Page<WorkOrder> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPageNo(), page.getPageSize());
if (null == param) param = new WorkOrderParam();
- param.setStatus(OrderStatus.STATUS_50.getCode());
+ param.setStatus(WorkStatus.STATUS_50.getCode());
param.setCompanyId(ContextUtil.getCompanyId());
workOrderService.pageQuery(corePage, param);
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
index cc00fcc..9ba2825 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/manager/CommonManager.java
@@ -9,7 +9,7 @@
import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
-import com.fzzy.work.data.OrderStatus;
+import com.fzzy.work.data.WorkStatus;
import com.fzzy.work.service.WorkOrderService;
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysDictData;
@@ -244,7 +244,7 @@
MainData mainData = new MainData();
//寰呭姙宸ュ崟鏁�
- Integer orderNum = workOrderService.getNumByUser(OrderStatus.STATUS_30.getCode(), user.getLoginName());
+ Integer orderNum = workOrderService.getNumByUser(WorkStatus.STATUS_30.getCode(), user.getLoginName());
mainData.setOrderNum(orderNum);
//缁熻鍑哄叆搴撲俊鎭�
--
Gitblit v1.9.3