sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-07-02 00:16:32 +08:00
parent 31ce33abc5
commit 9dd0fa9b07
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/vo/SmzSspProblemmodifyExport.java
View File

@ -31,19 +31,19 @@ public class SmzSspProblemmodifyExport {
@Excel(name = "整改截至时间", width = 20, dateFormat = "yyyy-MM-dd HH:ss")
private Date nickedTime;
@Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =30)
@Excel(name = "隐患整改人",align= HorizontalAlignment.LEFT,width =20)
private String lordSent;
@Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =30)
@Excel(name = "整改人单位类型",align= HorizontalAlignment.LEFT,width =20)
private String lordSentDeptType;
@Excel(name = "流程状态")
private String checkState;
@Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =30)
@Excel(name = "复检人",align= HorizontalAlignment.LEFT,width =20)
private String recheckSend;
@Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =30)
@Excel(name = "复检人单位类型",align= HorizontalAlignment.LEFT,width =20)
private String recheckSendDeptType;
@Excel(name = "抄送人",align= HorizontalAlignment.LEFT,width =30)

8
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -788,7 +788,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSmzSspProblemmodifyListAndUnitName" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type,
ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy, ssp.problemType,
sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel
sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel,
zgd.type_flag as zgDeptType,
fjd.type_flag as fjDeptType
from (
SELECT c.*,a.dict_label dangerLabel,b.dict_label chkLabel FROM
vw_smz_ssp_problemmodify_audit c,sys_dict_data a,sys_dict_data b WHERE c.danger_Type=a.dict_value
@ -801,6 +803,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT p.dept_Name,p.dept_id,u.phonenumber
FROM sys_user u,sur_project_userinfo p WHERE p.is_del=0 and u.user_id=p.user_id AND p.dept_type=2
) sp on ssp.lordSentUser = sp.phonenumber
left join sys_user zgu on zgu.phonenumber = ssp.lordSentUser
left join sys_dept zgd on zgd.dept_id = zgu.dept_id
left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
left join sys_dept fjd on fjd.dept_id = fju.dept_id
<!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId</if>
<where>