[fix]销售管理:

修改销售订单：
1、税率增加“*”必填表示
2、目前如果不填写计划交付时间，点击确认按钮后系统会报错，去掉必填判断
修改销售订单：前端录入时间和更新时间错误显示问题

ruoyi-activiti/src/main/java/com/ruoyi/process/todoitem/mapper/BizTodoItemMapper.java

@@ -71,7 +71,7 @@ public interface BizTodoItemMapper {
     
     public List<BizTodoItem> getTodoItemListNoPaging(Map<String, Object> 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<String> selectTodoUserListByTaskId(@Param(value = "taskId") String taskId);
 
     @Select("SELECT * FROM BIZ_TODO_ITEM WHERE TASK_ID = #{taskId} AND TODO_USER_ID = #{todoUserId}")

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<SysSalesOrderChild> sysSalesOrderChildList = sysSalesOrder.getSysSalesOrderChildList();
         if (sysSalesOrderChildList.isEmpty()){

ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@@ -192,9 +192,9 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">税率：</label>
+                <label class="col-sm-3 control-label is-required">税率：</label>
                 <div class="col-sm-8">
-                    <input name="taxRate" id="taxRate_add" class="form-control" type="number">
+                    <input name="taxRate" id="taxRate_add" class="form-control" type="number" required>
                 </div>
             </div>
             <div class="form-group">

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