guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

导出台账

0927cmt
songwenxuan 2024-04-26 15:01:51 +08:00
parent 35271c8324
commit a0d2f68b9f
2 changed files with 24 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/com/zcloud/controller/hiddenApi/HiddenApiController.java
View File

@ -1028,7 +1028,6 @@ public class HiddenApiController extends BaseController {
ModelAndView mv = new ModelAndView(); ModelAndView mv = new ModelAndView();
PageData pd = new PageData(); PageData pd = new PageData();
pd = this.getPageData(); pd = this.getPageData();
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
Map<String,Object> dataMap = new HashMap<String,Object>(); Map<String,Object> dataMap = new HashMap<String,Object>();
List<String> titles = new ArrayList<String>(); List<String> titles = new ArrayList<String>();
titles.add("序号"); //1 titles.add("序号"); //1
@ -1043,28 +1042,29 @@ public class HiddenApiController extends BaseController {
titles.add("整改责任人"); //10 titles.add("整改责任人"); //10
titles.add("整改督办人"); //11 titles.add("整改督办人"); //11
titles.add("投入资金（元）"); //12 titles.add("投入资金（元）"); //12
titles.add("复查时间及结果"); //13 titles.add("复查时间"); //13
titles.add("复查人"); //14 titles.add("复查人"); //14
titles.add("检查人员"); //15 titles.add("检查人员"); //15
dataMap.put("titles", titles);
List<PageData> varOList = hiddenApiService.listForExcel(pd); List<PageData> varOList = hiddenApiService.listForExcel(pd);
List<PageData> varList = new ArrayList<PageData>(); List<PageData> varList = new ArrayList<PageData>();
for(int i=0;i<varOList.size();i++){ for(int i=0;i<varOList.size();i++){
PageData vpd = new PageData(); PageData vpd = new PageData();
vpd.put("var1", i + 1); //1 vpd.put("var1", i + 1); //1
vpd.put("var2", varOList.get(i).getString("HIDDENTYPE")); //2 vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("type1Name")) ? "" : varOList.get(i).getString("type1Name")); //2
vpd.put("var3", varOList.get(i).getString("LEVEL")); //3 vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("LEVEL")) ? "" : varOList.get(i).getString("LEVEL")); //3
vpd.put("var4", varOList.get(i).getString("POSITIONDESC")); //4 vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("POSITIONDESC")) ? "" : varOList.get(i).getString("POSITIONDESC")); //4
vpd.put("var5", varOList.get(i).getString("HIDDENDESCR")); //5 vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("HIDDENDESCR")) ? "" : varOList.get(i).getString("HIDDENDESCR")); //5
vpd.put("var6", varOList.get(i).getString("")); //6 vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("RECTIFYDESCR")) ? "" : varOList.get(i).getString("RECTIFYDESCR")); //6
vpd.put("var7", varOList.get(i).getString("")); //7 vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("DISCOVERYTIME")) ? "" : varOList.get(i).getString("DISCOVERYTIME")); //7
vpd.put("var8", varOList.get(i).getString("")); //8 vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("RECTIFICATIONDEADLINE")) ? "" : varOList.get(i).getString("RECTIFICATIONDEADLINE")); //8
vpd.put("var9", varOList.get(i).getString("")); //9 vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("zgUserDeptName")) ? "" : varOList.get(i).getString("zgUserDeptName")); //9
vpd.put("var10", varOList.get(i).getString("")); //10 vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("zgUserName")) ? "" : varOList.get(i).getString("zgUserName")); //10
vpd.put("var11", varOList.get(i).getString("")); //11 vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("conUsername")) ? "" : varOList.get(i).getString("conUsername")); //11
vpd.put("var12", varOList.get(i).getString("")); //12 vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("INVESTMENT_FUNDS")) ? "" : varOList.get(i).getString("INVESTMENT_FUNDS")); //12
vpd.put("var13", varOList.get(i).getString("")); //13 vpd.put("var13", Tools.isEmpty(varOList.get(i).getString("REVIEWTIME")) ? "" : varOList.get(i).getString("REVIEWTIME")); //13
vpd.put("var14", varOList.get(i).getString("")); //14 vpd.put("var14", Tools.isEmpty(varOList.get(i).getString("revieworName")) ? "" : varOList.get(i).getString("revieworName")); //14
vpd.put("var15", varOList.get(i).getString("")); //15 vpd.put("var15", Tools.isEmpty(varOList.get(i).getString("INSPECTION_USER")) ? varOList.get(i).getString("CREATER_NAME") : varOList.get(i).getString("INSPECTION_USER")); //15
varList.add(vpd); varList.add(vpd);
} }
dataMap.put("varList", varList); dataMap.put("varList", varList);

30
src/main/resources/mybatis/datasource/hiddenApi/HiddenApiMapper.xml
View File

@ -855,12 +855,14 @@
bhuUserDeptD.name as fxUserDeptDName, bhuUserDeptD.name as fxUserDeptDName,
type1.name as type1Name, type1.name as type1Name,
confirmUser.name as conUsername, confirmUser.name as conUsername,
zgUserDeptD.DEPARTMENT_ID as zgUserDeptId, zgUserDeptD.DEPARTMENT_ID as zgUserDeptId,
zgUserDept.name as zgUserDeptName, zgUserDept.name as zgUserDeptName,
zgUserDeptD.name as zgUserDeptDName, zgUserDeptD.name as zgUserDeptDName,
zgUser.name as zgUserName, zgUser.name as zgUserName,
hreg.HIDDENREGION as HIDDENPARTNAME, hreg.HIDDENREGION as HIDDENPARTNAME,
GROUP_CONCAT( su.NAME ) AS INSPECTION_USER,
c.NAME AS CREATER_NAME,
revieworUser.NAME AS revieworName,
f.* f.*
FROM FROM
bus_hidden f bus_hidden f
@ -868,23 +870,20 @@
left join vi_user_all bhuUser on bhuUser.user_id = bhu.user_id left join vi_user_all bhuUser on bhuUser.user_id = bhu.user_id
left join oa_department bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID left join oa_department bhuUserDept on bhuUser.DEPARTMENT_ID = bhuUserDept.DEPARTMENT_ID
left join oa_department bhuUserDeptD on bhuUserDeptD.DEPARTMENT_ID = bhuUserDept.PARENT_ID left join oa_department bhuUserDeptD on bhuUserDeptD.DEPARTMENT_ID = bhuUserDept.PARENT_ID
left join vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR left join vi_user_all zgUser on zgUser.user_id = f.RECTIFICATIONOR
LEFT JOIN vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 --> LEFT JOIN vi_user_all confirmUser on confirmUser.USER_ID = f.CONFIRM_USER <!-- 隐患确认人 -->
LEFT JOIN vi_user_all revieworUser on revieworUser.USER_ID = f.REVIEWOR <!-- 隐患确认人 -->
LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID LEFT JOIN bus_hiddencheck hch on hch.HIDDEN_ID = f.HIDDEN_ID
left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE left join sys_dictionaries type1 on type1.bianma = f.HIDDENTYPE
left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT left join oa_department zgUserDept on zgUserDept.DEPARTMENT_ID = f.RECTIFICATIONDEPT
left join oa_department zgUserDeptD on zgUserDeptD.DEPARTMENT_ID = zgUserDept.PARENT_ID left join oa_department zgUserDeptD on zgUserDeptD.DEPARTMENT_ID = zgUserDept.PARENT_ID
left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART left join bus_hiddenregion hreg on hreg.HIDDENREGION_ID = f.HIDDENPART
LEFT JOIN BUS_INSPECTION_SAFETYENVIRONMENTAL_ASSESS isa ON isa.HIDDEN_ID = f.HIDDEN_ID and isa.ISDELETE = '0'
left join bus_inspection_safetyenvironmental_inspector bi ON bi.INSPECTION_ID = isa.INSPECTION_ID
LEFT JOIN vi_user_all su on su.USER_ID = bi.INSPECTION_USER_ID
LEFT JOIN vi_user_all c ON c.USER_ID = f.CREATOR
WHERE f.ISDELETE = '0' WHERE f.ISDELETE = '0'
and f.STATE not in ('0','7','8','100','101','102') and f.STATE not in ('0','7','8','100','101','102')
AND f.HIDDENLEVEL != 'hiddenLevel2002'
AND f.HIDDENLEVEL != 'hiddenLevel1001'
AND f.HIDDENLEVEL != 'jdyh001'
<if test="roleLevel != null and roleLevel != ''"><!-- 权限显示 --> <if test="roleLevel != null and roleLevel != ''"><!-- 权限显示 -->
<choose> <choose>
<when test='roleLevel == "0"'> <when test='roleLevel == "0"'>
@ -924,10 +923,6 @@
<if test="creatorName != null and creatorName != ''"><!-- 隐患发现人 --> <if test="creatorName != null and creatorName != ''"><!-- 隐患发现人 -->
and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID and f.HIDDEN_ID in (select hfu.HIDDEN_ID from BUS_HIDDEN_USER hfu LEFT JOIN sys_user user on user.USER_ID = hfu.USER_ID
where where
<!-- user.USERNAME LIKE CONCAT(CONCAT('%', #{creatorName}),'%') or
user.NUMBER LIKE CONCAT(CONCAT('%', #{creatorName}),'%') or
user.PHONE LIKE CONCAT(CONCAT('%', #{creatorName}),'%')-->
user.NAME LIKE CONCAT(CONCAT('%', #{creatorName}),'%') user.NAME LIKE CONCAT(CONCAT('%', #{creatorName}),'%')
) )
</if> </if>
@ -948,19 +943,12 @@
</if> </if>
<if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 --> <if test="confirmUserName != null and confirmUserName != ''"><!-- 确认人 -->
and ( and (
<!-- confirmUser.USERNAME LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%') or}),'%') -->
<!-- confirmUser.NUMBER LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%') or}),'%') -->
confirmUser.NAME LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%') confirmUser.NAME LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%')
<!-- confirmUser.PHONE LIKE CONCAT(CONCAT('%', #{confirmUserName}),'%'因为搜索框搜1或者2也能出来数据，但是不应该有数据，暂时注释) -->
) )
</if> </if>
<if test="rectificationorName != null and rectificationorName != ''"><!-- 整改人 --> <if test="rectificationorName != null and rectificationorName != ''"><!-- 整改人 -->
and ( and (
rect.NAME LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%') rect.NAME LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%')
<!-- rect.PHONE LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%'
rect.USERNAME LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%') or
rect.NUMBER LIKE CONCAT(CONCAT('%', #{rectificationorName}),'%') or因为搜索框搜1或者2也能出来数据，但是不应该有数据，暂时注释) -->
) )
</if> </if>
<if test="checkrecordName != null and checkrecordName != ''"><!-- 验收人 --> <if test="checkrecordName != null and checkrecordName != ''"><!-- 验收人 -->
@ -971,8 +959,6 @@
bus_hiddencheck yhc bus_hiddencheck yhc
LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{CORPINFO_ID} LEFT JOIN sys_user yuser ON yuser.USER_ID = yhc.USER_ID AND yuser.CORPINFO_ID = #{CORPINFO_ID}
where ( where (
<!-- yuser.USERNAME LIKE CONCAT(CONCAT('%',#{checkrecordName}),'%')
or) or yuser.PHONE LIKE CONCAT(CONCAT('%', #{checkrecordName}),'%') 因为搜索框搜1或者2也能出来数据，但是不应该有数据，暂时注释-->
yuser.NAME LIKE CONCAT(CONCAT('%', #{checkrecordName}),'%') yuser.NAME LIKE CONCAT(CONCAT('%', #{checkrecordName}),'%')
) )
) )