添加除湿机温度设备类型

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/WarehouseDevInfoDto.java

@@ -67,4 +67,7 @@ public class WarehouseDevInfoDto {
      *
      */
     private Date updateTime;
+
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/WarehouseDevDto.java

@@ -70,4 +70,7 @@ public class WarehouseDevDto {
     private String orgName;
     private String warehouseName;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryWarehouseDevReq.java

@@ -67,4 +67,7 @@ public class QueryWarehouseDevReq {
 
     private Date updateTime;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseDevReq.java

@@ -79,4 +79,7 @@ public class UpdateWarehouseDevReq {
     //是否暂存（true表示暂存不会下发到本地主机，如果为空或者是为false则表示直接下发通知到本地主机）
     private Boolean flag;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseDev.java

@@ -98,6 +98,10 @@ public class WarehouseDev implements Serializable {
     @TableField(value = "update_time")
     private Date updateTime;
 
+    //设备类型（0，除湿机，1温度计）
+    @TableField(value = "dev_type")
+    private Integer devType;
+
     @TableField(exist = false)
     private String orgName;
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -590,9 +590,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     }
 
     private BusForm setState1(String orderType,Long orgId,String bussinessCode){
-        BusForm busform = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
+        BusForm busform = busFormService.list(new LambdaQueryWrapper<BusForm>()
                 .eq(BusForm::getOrgId, orgId)
-                .in(BusForm::getBussinessCode, bussinessCode));
+                .in(BusForm::getBussinessCode, bussinessCode)).get(0);
         busform.setOrderCurrentState(busform.getOrderLastState());
         if (orderType.equals("in")){
             switch (busform.getOrderCurrentState()){
@@ -1171,6 +1171,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                             LogDetailReq logDetailReq = new LogDetailReq();
                             BeanPlusUtil.copyProperties(inv,logDetailReq);
                             logDetailReq.setOutInState(req.getOrderType());
+                            logDetailReq.setCreateTime(DateTimeUtil.getCurrentDateTime());
                             if (CollectionUtil.isEmpty(logDetailList)) {
                                 lsReq.setLogList(new ArrayList<>());
                                 logDetailList = lsReq.getLogList();
@@ -1365,7 +1366,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 for (OrderLogReq ol: ls.getOrderLogList()) {
                     OrderLog orderLog = new OrderLog();
                     BeanPlusUtil.copyProperties(ol,orderLog);
-
+                    orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
                     orderLogList.add(orderLog);
                 }
             }
@@ -1375,6 +1376,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     LogDetail logDetail = new LogDetail();
                     BeanPlusUtil.copyProperties(ld,logDetail);
                     logDetail.setSummaryId(logSummary.getId());
+                    logDetail.setCreateTime(DateTimeUtil.getCurrentDateTime());
                     logDetailList.add(logDetail);
                 }
             }

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -259,12 +259,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             map.put(PROCESS_STATUS, BUSINESS_STATUS_3);
             taskService.setVariableLocal(taskId,"taskStatusWrapper", TASK_STATUS_2);//设置节点中的当前操作
             runtimeService.setVariables(task.getProcessInstanceId(), map);
-            if (StringUtils.isNotBlank(comments)) {
-                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
-            }else {
+            if (StringUtils.isBlank(comments)) {
                 //默认拒绝
-                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", "拒绝");
+                comments="拒绝";
             }
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
             if (attachments != null && attachments.size() > 0) {
                 for (AttachmentDTO attachment : attachments) {
                     taskService.createAttachment("option", taskId, task.getProcessInstanceId(), attachment.getName(), attachment.getName(), attachment.getUrl());
@@ -304,7 +303,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             sendReq.setMsgTitle("您的审批被驳回");
             sendReq.setBizType("refuse/"+Types);
             sendReq.setBizId(Long.valueOf(task.getProcessInstanceId()));
-            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+handleDataDTO.getComments());
+            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+comments);
             sendReq.setPriority("0");
             sendReq.setSendTime(DateTime.now());
             messageApi.sendMessage(sendReq);