From b98df034707a61fd2857dbccd5a232605076ca59 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:26:08 +0800
Subject: [PATCH] 标准版初始化

---
 WebApi/Gs.Wom/WorkService/WorkProController.cs |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/WebApi/Gs.Wom/WorkService/WorkProController.cs b/WebApi/Gs.Wom/WorkService/WorkProController.cs
index 95d19cf..6ce5e6c 100644
--- a/WebApi/Gs.Wom/WorkService/WorkProController.cs
+++ b/WebApi/Gs.Wom/WorkService/WorkProController.cs
@@ -49,15 +49,22 @@
             sbSql.Append("( ");
             sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
                          sortName + " " + model.sortOrder +
-                         ") as rowIndex,cast(0 as bit) as chkInt,  a.*,(a.processNo+':'+a.processName) as processNoAndName,(case  a.isStatus when 1 then '姝e父' when -1 then  '绂佺敤'  else  cast(a.isStatus as nvarchar(4))  end) as isStatusTxt from WORK_PROCESS a  where 1=1" +
-                         keyWhere);
+                         ") as rowIndex,cast(0 as bit) as chkInt,a.*," +
+                         "(a.processNo+':'+a.processName) as processNoAndName," +
+                         "(case a.isStatus when 1 then '姝e父' when -1 then  '绂佺敤'  else  cast(a.isStatus as nvarchar(4))  end) as isStatusTxt," +
+                         "cj.USER_NAME as createByName," +
+                         "isnull(gx.USER_NAME,a.lastUpdateBy) as lastupdateByName " +
+                         "from WORK_PROCESS a " +
+                         "left join SYS_USER cj on cj.ACCOUNT=a.createBy " +
+                         "left join SYS_USER gx on gx.ACCOUNT=a.lastUpdateBy " +
+                         "where 1=1" + keyWhere);
             sbSql.Append(") as T ");
             sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
                          everyPageSize + " and  T.rowindex<=" + currentPage + "*" +
                          everyPageSize);
             sbSql.Append(" order by rowindex asc ");
             sbSql.Append(
-                " select count(1) as intTotal  from WORK_PROCESS a  where 1=1 " +
+                " select count(1) as intTotal  from WORK_PROCESS a  left join SYS_USER cj on cj.ACCOUNT=a.createBy left join SYS_USER gx on gx.ACCOUNT=a.lastUpdateBy where 1=1 " +
                 keyWhere);
             var dset = new DataSet();
             try
@@ -153,18 +160,20 @@
             string remark = model.remark;
             string isBack = model.isBack;
             string isStatus = model.isStatus;
+            string isZsm = model.isZsm;
+            string isTbm = model.isTbm;
             string description = model.description;
             int? rtnInt = (int)ReturnCode.Default;
             System.Text.StringBuilder sbSql = new StringBuilder();
             if (!CheckGuid(guid))
             {
                 guid= Guid.NewGuid().ToString();
-                sbSql.Append("INSERT INTO [dbo].[WORK_PROCESS] ([guid] ,[processNo] ,[processName] ,[remark] ,[isBack] ,[isStatus] ,[description] ,[createBy] ,[createDate] ,[lastUpdateBy] ,[lastUpdateDate])");
-                sbSql.Append(" values( '"+ guid + "',@processNo,@processName,@remark,@isBack,@isStatus,@description,'" + _userCode + "',getdate(),'" + _userCode + "',getdate())");
+                sbSql.Append("INSERT INTO [dbo].[WORK_PROCESS] ([guid] ,[processNo] ,[processName] ,[remark] ,[isBack] ,[isStatus] ,[description] ,[createBy] ,[createDate] ,[lastUpdateBy] ,[lastUpdateDate],isZsm,isTbm)");
+                sbSql.Append(" values( '"+ guid + "',@processNo,@processName,@remark,@isBack,@isStatus,@description,'" + _userCode + "',getdate(),'" + _userCode + "',getdate(),@isZsm,@isTbm)");
             }
             else
             {
-                sbSql.Append("UPDATE [dbo].[WORK_PROCESS]  SET [processNo] =@processNo,[processName] =@processName,[remark] =@remark,[isBack] =@isBack,[isStatus] =@isStatus,[description] =@description,[lastUpdateBy] ='" + _userCode + "',[lastUpdateDate] =getdate() where guid='"+guid.ToString()+"'");
+                sbSql.Append("UPDATE [dbo].[WORK_PROCESS]  SET [processNo] =@processNo,[processName] =@processName,[remark] =@remark,[isBack] =@isBack,[isStatus] =@isStatus,[description] =@description,[lastUpdateBy] ='" + _userCode + "',[lastUpdateDate] =getdate(),isZsm=@isZsm,isTbm=@isTbm where guid='" + guid.ToString()+"'");
             }
             SqlParameter[] parameters =
                    {
@@ -174,6 +183,8 @@
                         new("@isBack", isBack),
                         new("@isStatus", isStatus),
                         new("@description", description),
+                        new("@isZsm", isZsm),
+                        new("@isTbm", isTbm),
                     };
             try
             {

--
Gitblit v1.9.3