Merge remote-tracking branch 'origin/master'

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderManageController.java

@@ -349,6 +349,7 @@ public class WorkOrderManageController {
             workOrderManageDto.setEndDate(endDate);
         }
         workOrderManageDto.setOrderStatus(orderStatus);
+        workOrderManageDto.setOrderStatus(orderStatus);
         workOrderManageDto.setEventType(eventType);
         workOrderManageDto.setTenantId(loginUser.getTenantId());
         workOrderManageDto.setOrderTypeId(orderTypeId);
@@ -489,8 +490,9 @@ public class WorkOrderManageController {
         Map<String,Object> vars = new HashMap<>();
         vars.put("assineeFormUserId",orderUserId);
         //巡检发送系统消息所需参数
-        vars.put("任务类型",orderType);
-        vars.put("任务编号",workOrderManage.getId());
+        vars.put("工单类型",orderType);
+        vars.put("工单编号",workOrderManage.getTaskNo());
+        vars.put("url",workOrderManage.getId());
         vars.put("templateId",7);
         vars.put("msgType",7);
         String startProcess = workFlowService.startProcess(processDefinition,vars);
@@ -500,7 +502,6 @@ public class WorkOrderManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
-        //currentUsers+="235,209,";
         //更新计划表的流程相关字段值。
         workOrderManage.setOrderStatus(1);//已执行
         workOrderManage.setOrderTypeId(orderTypeId);//工单类型ID

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -205,7 +205,8 @@ public class PlanManageController {
         vars.put("assineeFormUserId",planManage.getUserId());
         //巡检发送系统消息所需参数
         vars.put("任务类型",taskType);
-        vars.put("任务编号",planManage.getId());
+        vars.put("任务编号",planManage.getPlanId());
+        vars.put("url",planManage.getId());
         vars.put("templateId",4);
         vars.put("msgType",4);
         String startProcess = workFlowService.startProcess(processDefinition,vars);
@@ -215,7 +216,6 @@ public class PlanManageController {
         for (String str : taskParticipator) {
             currentUsers += String.format("%s,",str);
         }
-        //currentUsers+="235,209,";
         //更新计划表的流程相关字段值。
         planManage.setPlanStatus(1);//已执行
         if(loginUser.getId() != null) {

operation_manager/src/main/resources/mapper/order/WorkOrderManageMapper.xml

@@ -604,12 +604,20 @@
       <if test="order.currentUsers != null">
         and FIND_IN_SET(#{order.currentUsers,jdbcType=VARCHAR},t1.current_users)
       </if>
+
       <if test="order.startDate != null and order.endDate != null">
-        and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
-        and t1.date_create &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+        <if test="order.orderStatus == 0">
+          and t1.date_create &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
+          and t1.date_create &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+          order by t1.date_create desc
+        </if>
+        <if test="order.orderStatus != 0">
+          and t1.send_time &gt;= date_format(#{order.startDate,jdbcType=VARCHAR},'%Y-%c-%d')
+          and t1.send_time &lt;= DATE_ADD(date_format(#{order.endDate,jdbcType=VARCHAR},'%Y-%c-%d'),INTERVAL 1 DAY)
+          order by t1.send_time desc
+        </if>
       </if>
     </where>
-    order by t1.date_create desc
   </select>
   <!--删除-->
   <delete id="batchDelete">