feat:合同工单可以导出并显示合同编号，锁设置超时时间

src/main/java/cn/ezhizao/project/business/upgrade/crmUpgradeController.java

@@ -27,6 +27,7 @@ import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @RestController
 @RequestMapping("/upgrade/crm")
@@ -48,7 +49,7 @@ public class crmUpgradeController extends BaseController {
         String join = LockKey.join(LockKey.REPOR_UPDATE,getTenantId());
         DistributionLock lock = new DistributionLock(join);
         try {
-            lock.lock();
+            lock.lock(8,8,TimeUnit.MINUTES);
             ExcelUtil<OrderExcelImportLoopModel> util = new ExcelUtil<>(OrderExcelImportLoopModel.class);
             List<OrderExcelImportLoopModel> orderList = util.importExcel(file.getInputStream());
 
@@ -79,7 +80,7 @@ public class crmUpgradeController extends BaseController {
         DistributionLock lock = new DistributionLock(join);
         String message = "升级成功，请关闭浏览器重新进入";
         try {
-            lock.lock();
+            lock.lock(8,8,TimeUnit.MINUTES);
             Long tenantId = 0L;
             tenantId = getTenantId();
             bizArchiveInputService.inputUpgrade(tenantId);

src/main/java/cn/ezhizao/project/business/upgrade/domain/BizWorkOrderUpdate.java

@@ -29,7 +29,9 @@ public class BizWorkOrderUpdate extends BaseEntity {
      */
     @ApiModelProperty(value = "${comment}")
     private Long contractId;
-
+    @Excel(name = "合同编号", width = 35, sort = 1)
+    @TableField(exist = false)
+    private String contractNo;
     /**
      * 客户外键
      */
@@ -37,7 +39,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
     private Long companyId;
 
     @ApiModelProperty("客户名称")
-    @Excel(name = "客户名称", width = 35, sort = 1)
+    @Excel(name = "客户名称", width = 35, sort = 2)
     @TableField(exist = false)
     private String companyName;
 
@@ -58,7 +60,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
     /**
      * 工单类型 1循环 2代办
      */
-    @Excel(name = "工单类型", readConverterExp = "1=循环工单,2=代办工单", sort = 2)
+    @Excel(name = "工单类型", readConverterExp = "1=循环工单,2=代办工单", sort = 3)
     @ApiModelProperty(value = "工单类型 1循环 2代办")
     private Integer type;
 
@@ -82,7 +84,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
     private Long taskTypeId;
 
     @TableField(exist = false)
-    @Excel(name = "任务类型", sort = 5)
+    @Excel(name = "任务类型", sort = 6)
     private String taskTypeName;
 
     /**
@@ -95,7 +97,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
 //    @Excel(name = "任务详情", sort = 6)
     private String taskTypeDetailName;
 
-    @Excel(name = "是否延续", sort = 6, readConverterExp = "0=否,1=是")
+    @Excel(name = "是否延续", sort = 7, readConverterExp = "0=否,1=是")
     @ApiModelProperty(value = "是否延续")
     private Integer isContinue;
 
@@ -115,7 +117,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
      * 开始月
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "开始月", width = 15, dateFormat = "yyyy年MM月", sort = 7)
+    @Excel(name = "开始月", width = 15, dateFormat = "yyyy年MM月", sort = 8)
     @ApiModelProperty(value = "开始月")
     private Date startMonth;
 
@@ -123,14 +125,14 @@ public class BizWorkOrderUpdate extends BaseEntity {
      * 结束月
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束月", width = 15, dateFormat = "yyyy年MM月", sort = 8)
+    @Excel(name = "结束月", width = 15, dateFormat = "yyyy年MM月", sort = 9)
     @ApiModelProperty(value = "结束月")
     private Date endMonth;
 
     /**
      * 月数
      */
-    @Excel(name = "月数", sort = 9)
+    @Excel(name = "月数", sort = 10)
     @ApiModelProperty(value = "月数")
     private Integer monthNum;
 
@@ -214,7 +216,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
     private Long serviceId;
 
     @TableField(exist = false)
-    @Excel(name = "执行人", sort = 14)
+    @Excel(name = "执行人", sort = 15)
     private String serviceName;
 
     @TableField(exist = false)

src/main/resources/mybatis/business/BizWorkOrderUpdateMapper.xml

@@ -41,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getList2" parameterType="BizWorkOrderUpdate" resultMap="BizWorkOrderResult">
         SELECT t1.*, t2.name as company_name, t2.social_credit_code, t3.name as task_type_name, t4.name as
-        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type FROM biz_work_order_update t1
+        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type,t6.contract_no FROM biz_work_order_update t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_task_type t3 on t3.id = t1.task_type_id
         left join biz_task_type_detail t4 on t4.id = t1.task_type_detail_id
         left join sys_user t5 on t5.user_id = t1.service_id
+        left join biz_archive_input_update t6 on t6.id = t1.contract_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null "> AND t1.id = #{id}</if>