首次提交

ruoyi-admin/src/main/java/com/ruoyi/system/controller/HyjlController.java

@@ -134,6 +134,9 @@ public class HyjlController extends BaseController
                 cell33.setCellStyle(cellStyle);
                 cell33.setCellValue(item.getWlmqryxx());
 
+                Cell cell351 = rows.createCell(m++);
+                cell351.setCellStyle(cellStyle);
+                cell351.setCellValue(item.getKlmyryxx());
 
                 Cell cell35 = rows.createCell(m++);
                 cell35.setCellStyle(cellStyle);
@@ -143,8 +146,8 @@ public class HyjlController extends BaseController
                 cell36.setCellStyle(cellStyle);
                 cell36.setCellValue(item.getQjryxx());
 
-                Cell cell322 = rows.createCell(m++);
-                cell322.setCellStyle(cellStyle);
+//                Cell cell322 = rows.createCell(m++);
+//                cell322.setCellStyle(cellStyle);
                 lastRow++;
             }
             hyjl.setDeptLx("外协单位");
@@ -176,6 +179,10 @@ public class HyjlController extends BaseController
                 cell33.setCellValue(item.getWlmqryxx());
 
 
+                Cell cell351 = rows.createCell(m++);
+                cell351.setCellStyle(cellStyle);
+                cell351.setCellValue(item.getKlmyryxx());
+
                 Cell cell35 = rows.createCell(m++);
                 cell35.setCellStyle(cellStyle);
                 cell35.setCellValue(item.getGlqryxx());
@@ -183,9 +190,9 @@ public class HyjlController extends BaseController
                 Cell cell36 = rows.createCell(m++);
                 cell36.setCellStyle(cellStyle);
                 cell36.setCellValue(item.getQjryxx());
-                Cell cell322 = rows.createCell(m++);
-                cell322.setCellStyle(cellStyle);
-                lastRow++;
+//                Cell cell322 = rows.createCell(m++);
+//                cell322.setCellStyle(cellStyle);
+                lastRowwx++;
             }
 
             exl.write(out);

ruoyi-admin/src/main/resources/mapper/system/HyjlMapper.xml

@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) d on a.id=d.dwid
                                                                                                      left join (
             select dwid,group_concat(ryxx) glqryxx,chdd
-            from hyjl where sfqj='否' and  chdd='管理二区'
+            from hyjl where sfqj='否' and  chdd='管理区'
         <if test="ryxx != null  and ryxx != ''"> and ryxx like concat('%', #{ryxx}, '%')</if>
         <if test="cjsj2 != null  and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
             group by dwid