From 7d1e6feffd017e88983355a5bb58a03f0ae179a0 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 18 Apr 2024 11:01:20 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E9=94=80=E5=94=AE=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=9A?= =?UTF-8?q?=201=E3=80=81=E7=A8=8E=E7=8E=87=E5=A2=9E=E5=8A=A0=E2=80=9C*?= =?UTF-8?q?=E2=80=9D=E5=BF=85=E5=A1=AB=E8=A1=A8=E7=A4=BA=202=E3=80=81?= =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=A6=82=E6=9E=9C=E4=B8=8D=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=BA=A4=E4=BB=98=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E5=90=8E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=9A=E6=8A=A5=E9=94=99=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=BF=85=E5=A1=AB=E5=88=A4=E6=96=AD=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=EF=BC=9A=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E5=92=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java | 2 +- .../ruoyi/system/service/impl/SysSalesOrderServiceImpl.java | 4 ++-- .../src/main/resources/templates/system/salesOrder/add.html | 4 ++-- .../resources/templates/system/salesOrder/salesOrder.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java index a17067fd..99cb42f6 100644 --- a/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java +++ b/ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java @@ -71,7 +71,7 @@ public interface BizTodoItemMapper { public List getTodoItemListNoPaging(Map paraMap); - @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ = (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})") + @Select("SELECT USER_ID_ FROM ACT_ID_MEMBERSHIP WHERE GROUP_ID_ in (SELECT GROUP_ID_ FROM ACT_RU_IDENTITYLINK WHERE TASK_ID_ = #{taskId})") List selectTodoUserListByTaskId(@Param(value = "taskId") String taskId); @Select("SELECT * FROM BIZ_TODO_ITEM WHERE TASK_ID = #{taskId} AND TODO_USER_ID = #{todoUserId}") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java index 95a21328..0c6f1c0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysSalesOrderServiceImpl.java @@ -170,7 +170,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService public int insertSysSalesOrder(SysSalesOrder sysSalesOrder){ String loginName = ShiroUtils.getLoginName(); sysSalesOrder.setCreateBy(loginName); - sysSalesOrder.setCreateTime(DateUtils.getNowDate()); + sysSalesOrder.setCreateTime(new Date()); sysSalesOrder.setApplyUser(loginName); int result = sysSalesOrderMapper.insertSysSalesOrder(sysSalesOrder); sysSalesOrder.getSalesOrderId(); @@ -200,7 +200,7 @@ public class SysSalesOrderServiceImpl implements ISysSalesOrderService SysUser user = userMapper.selectUserByLoginName(sysSalesOrder.getApplyUser()); String loginName = ShiroUtils.getLoginName(); sysSalesOrder.setUpdateBy(loginName); - sysSalesOrder.setUpdateTime(DateUtils.getNowDate()); + sysSalesOrder.setUpdateTime(new Date()); // 存在提交完就流程结束的情况 List sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList(); if (sysSalesOrderChildList.isEmpty()){ diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html index ca727474..a4ae0d08 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html @@ -192,9 +192,9 @@
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html index d0c80770..06ef5d4d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html +++ b/ruoyi-admin/src/main/resources/templates/system/salesOrder/salesOrder.html @@ -315,9 +315,9 @@ {title: '已出库数量',field: 'outBoundQuantity'}, {title: '实收金额(RMB)',field:'standbyOne'}, {title: '实收金额(美元)',field:'standbyTwo'}, - {title: '录入时间',field:'firstAddTime'}, + {title: '录入时间',field:'createTime'}, {title: '更新人',field:'updateBy'}, - {title: '更新时间',field:'updateInfoTime'}, + {title: '更新时间',field:'updateTime'}, {title: '备注',field:'remark'}, {title: '操作', align: 'center',