Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoPageReqVO.java

@@ -25,7 +25,7 @@ public class IotProjectInfoPageReqVO extends PageParam {
     private String contractName;
 
     @Schema(description = "合同编号")
-    private Integer contractCode;
+    private String contractCode;
 
     @Schema(description = "工作量总数")
     private String workloadTotal;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoRespVO.java

@@ -30,7 +30,7 @@ public class IotProjectInfoRespVO {
 
     @Schema(description = "合同编号")
     @ExcelProperty("合同编号")
-    private Integer contractCode;
+    private String contractCode;
 
     @Schema(description = "工作量总数")
     @ExcelProperty("工作量总数")

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojectinfo/vo/IotProjectInfoSaveReqVO.java

@@ -24,7 +24,7 @@ public class IotProjectInfoSaveReqVO {
     private String contractName;
 
     @Schema(description = "合同编号")
-    private Integer contractCode;
+    private String contractCode;
 
     @Schema(description = "工作量总数")
     private String workloadTotal;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/iotprojectinfo/IotProjectInfoDO.java

@@ -44,7 +44,7 @@ public class IotProjectInfoDO extends BaseDO {
     /**
      * 合同编号
      */
-    private Integer contractCode;
+    private String contractCode;
     /**
      * 工作量总数
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/job/IotOperationFillJob.java

@@ -1,9 +1,11 @@
 package cn.iocoder.yudao.module.pms.job;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
 import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
+import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils;
 import cn.iocoder.yudao.module.pms.constant.PmsConstants;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.IotOpeationFillPageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
@@ -55,7 +57,6 @@ public class IotOperationFillJob implements JobHandler {
 
 
     @Override
-    @TenantIgnore
     public String execute(String param) throws Exception {
         TenantContextHolder.setIgnore(true);
         System.out.println("***********创建运行记录填报工单开始执行*********8");
@@ -122,7 +123,9 @@ public class IotOperationFillJob implements JobHandler {
                 .filter(obj -> idList.contains(obj.getUserId()))
                 .collect(Collectors.toList());
 
-        iotOpeationFillOrderMapper.insertBatch(orderList1);
+        if (CollUtil.isNotEmpty(orderList1)) {
+            TenantUtils.execute(1L, () -> iotOpeationFillOrderMapper.insertBatch(orderList1));
+        }
 
         pmsThreadPoolTaskExecutor.execute(()->{
             try{

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/message/PmsMessage.java

@@ -37,6 +37,9 @@ public class PmsMessage {
             if (PmsConstants.GENERATE_MAINTENANCE.equals(businessType)) {
                 msg = "您有新的保养工单 " + name + "，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
             }
+            if (PmsConstants.GENERATE_OPERATION.equals(businessType)) {
+                msg = "您有新的运行记录工单 " + name + "，请处理。"+"["+ DateUtil.format(new Date(),"yyyy-MM-dd hh:mm:ss")+"]";
+            }
             String url="https://iot.deepoil.cc/dingding?id="+businessId+"&type="+businessType+"&userId="+userId;
             dingtalkSendApi.send(mobile, msg,"link", url);
         }