From 91b92422716cb4c5d0433f77fd2d6d45a69639c4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 15 八月 2023 18:35:17 +0800
Subject: [PATCH] # 工资表配置表 联调修改
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index 0c8029b..b5e1a8a 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -343,6 +343,7 @@
result.setStartNum(workorderExtMapper.selectCount(param));
param.setStatusList(new ArrayList<>());
param.getStatusList().add(Constants.WORKORDER_STATUS.done);
+ param.getStatusList().add(Constants.WORKORDER_STATUS.producing);
param.getStatusList().add(Constants.WORKORDER_STATUS.check);
//杩涜涓暟閲�
result.setIngNum(workorderExtMapper.selectCount(param));
@@ -410,6 +411,8 @@
tModle.setUnqualifiedNum(0);
tModle.setProUserId(w.getProUserId());
tModle.setProUserName(w.getProUserName());
+ tModle.setProUserName(w.getProUserName());
+ tModle.setCreateUser(w.getCreateUser());
if(w.getProUserId()!=null){
//鏌ヨ鐝粍淇℃伅
QueryCompanyUserExtDTO queryCompanyUserExtDTO = new QueryCompanyUserExtDTO();
--
Gitblit v1.9.3