Просмотр исходного кода

fix:非匹配工单导出时添加字段

ly 11 месяцев назад
Родитель
Сommit
19b79ad42c

+ 5 - 3
src/main/java/cn/ezhizao/project/business/upgrade/domain/BizWorkOrderUpdate.java

@@ -117,7 +117,7 @@ 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 startMonth;
 
@@ -125,7 +125,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
      * 结束月
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "结束月", width = 15, dateFormat = "yyyy年MM月", sort = 9)
+    @Excel(name = "结束月", width = 15, dateFormat = "yyyy年MM月", sort = 10)
     @ApiModelProperty(value = "结束月")
     private Date endMonth;
 
@@ -145,12 +145,14 @@ public class BizWorkOrderUpdate extends BaseEntity {
     /**
      * 主程序账套外键
      */
+
     @ApiModelProperty(value = "账套外键")
     private Long tenantId;
 
     /**
      * 停止任务
      */
+    @Excel(name = "停止状态", readConverterExp = "1=是,0=否", sort = 8)
     @ApiModelProperty(value = "停止任务")
     private Integer isStop;
 
@@ -216,7 +218,7 @@ public class BizWorkOrderUpdate extends BaseEntity {
     private Long serviceId;
 
     @TableField(exist = false)
-    @Excel(name = "执行人", sort = 15)
+    @Excel(name = "执行人", sort = 11)
     private String serviceName;
 
     @TableField(exist = false)

+ 2 - 1
src/main/resources/mybatis/business/BizWorkOrderUpdateMapper.xml

@@ -82,12 +82,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="gettoUpLoadList" 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 t1
+        task_type_detail_name, t5.nick_name as service_name, t2.is_zero,t2.tax_type,t6.contract_no FROM biz_work_order t1
         left join biz_company t2 on t2.id = t1.company_id
         left join biz_work_order_update orderupdate on orderupdate.id = t1.id and orderupdate.deleted = 0
         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">
             orderupdate.id is null and t1.type = 1 and t1.deleted = 0
             <if test="tenantId != null "> AND t1.tenant_id = #{tenantId}</if>