Skip to content

Q
qianhe-hyqd
Commit f69ef323 by jiang'yun
Options

首次提交

parent f1ed8dc2
Showing with 13 additions and 6 deletions
ruoyi-admin/src/main/java/com/ruoyi/system/controller/HyjlController.java
...@@ -134,6 +134,9 @@ public class HyjlController extends BaseController ...@@ -134,6 +134,9 @@ public class HyjlController extends BaseController
cell33.setCellStyle(cellStyle); cell33.setCellStyle(cellStyle);
cell33.setCellValue(item.getWlmqryxx()); cell33.setCellValue(item.getWlmqryxx());
Cell cell351 = rows.createCell(m++);
cell351.setCellStyle(cellStyle);
cell351.setCellValue(item.getKlmyryxx());
Cell cell35 = rows.createCell(m++); Cell cell35 = rows.createCell(m++);
cell35.setCellStyle(cellStyle); cell35.setCellStyle(cellStyle);
...@@ -143,8 +146,8 @@ public class HyjlController extends BaseController ...@@ -143,8 +146,8 @@ public class HyjlController extends BaseController
cell36.setCellStyle(cellStyle); cell36.setCellStyle(cellStyle);
cell36.setCellValue(item.getQjryxx()); cell36.setCellValue(item.getQjryxx());
Cell cell322 = rows.createCell(m++); // Cell cell322 = rows.createCell(m++);
cell322.setCellStyle(cellStyle); // cell322.setCellStyle(cellStyle);
lastRow++; lastRow++;
} }
hyjl.setDeptLx("外协单位"); hyjl.setDeptLx("外协单位");
...@@ -176,6 +179,10 @@ public class HyjlController extends BaseController ...@@ -176,6 +179,10 @@ public class HyjlController extends BaseController
cell33.setCellValue(item.getWlmqryxx()); cell33.setCellValue(item.getWlmqryxx());
Cell cell351 = rows.createCell(m++);
cell351.setCellStyle(cellStyle);
cell351.setCellValue(item.getKlmyryxx());
Cell cell35 = rows.createCell(m++); Cell cell35 = rows.createCell(m++);
cell35.setCellStyle(cellStyle); cell35.setCellStyle(cellStyle);
cell35.setCellValue(item.getGlqryxx()); cell35.setCellValue(item.getGlqryxx());
...@@ -183,9 +190,9 @@ public class HyjlController extends BaseController ...@@ -183,9 +190,9 @@ public class HyjlController extends BaseController
Cell cell36 = rows.createCell(m++); Cell cell36 = rows.createCell(m++);
cell36.setCellStyle(cellStyle); cell36.setCellStyle(cellStyle);
cell36.setCellValue(item.getQjryxx()); cell36.setCellValue(item.getQjryxx());
Cell cell322 = rows.createCell(m++); // Cell cell322 = rows.createCell(m++);
cell322.setCellStyle(cellStyle); // cell322.setCellStyle(cellStyle);
lastRow++; lastRowwx++;
} }
exl.write(out); exl.write(out);
......
ruoyi-admin/src/main/resources/mapper/system/HyjlMapper.xml
...@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) d on a.id=d.dwid ) d on a.id=d.dwid
left join ( left join (
select dwid,group_concat(ryxx) glqryxx,chdd 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="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> <if test="cjsj2 != null and cjsj2 != ''"> and date_format(cjsj,'%Y-%m-%d') = #{cjsj2}</if>
group by dwid group by dwid
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment