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',