工作票导出功能，修改

pom.xml

@@ -18,6 +18,7 @@
         <java.version>1.8</java.version>
         <tomcat.version>9.0.35</tomcat.version>
         <skipTests>ture</skipTests>
+        <log4j.version>2.15.0</log4j.version>
     </properties>
     <profiles>
 
@@ -51,6 +52,12 @@
             <version>1.18.12</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+
 
 
 

src/main/resources/mapper/ticket/WorkticketMapper.xml

@@ -275,12 +275,21 @@
         w.ticketnum,
         w.principal,
         w.deptgroup1,
-        w.startdate,
-        w.enddate,
+        t.description2,
+        t.address,
+        w.wspeed,
+        CASE WHEN w.startdate IS NULL THEN w.applyfirestarttime ELSE w.startdate END AS startdate,
+        CASE WHEN w.enddate IS NULL THEN w.applyfireendtime ELSE w.enddate END AS enddate,
+        w.signatory,
+        w.inceptdate,
+        CASE WHEN w.fiatuser1 IS NULL THEN w.fiatuser ELSE w.fiatuser1 END AS fiatuser1,
+        w.fiatdate,
+        w.startworktime,
         w.newdate,
         w.finaltime,
         w.status,
         w.workdept,
+        w.remark3 persons,
         e.description,
         w.wtickettype,
         CASE WHEN w.finaltime IS NULL THEN '1' ELSE '0' END AS tag,
@@ -289,6 +298,7 @@
         workticket w
         LEFT JOIN LOCATIONS e ON w.wtnum = e.LOCATION
         LEFT JOIN WINDFARM f ON  w.WORKDEPT = f.WFNAME
+        LEFT JOIN WOWORKTASK t ON  t.WONUM = w.wonum
         <where>
         <if test="st !=null and et !=null">
 
@@ -317,7 +327,7 @@
         </where>
 
         )
-        select  *  from cte1 order by ticketnum,startdate
+        select  *  from cte1 order by ticketnum desc
 
     </select>