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

交

dev_xds
姜玉琦 2024-07-23 00:19:26 +08:00
parent 264b81b661
commit 355db93705
5 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -299,11 +299,11 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="scope.row.measureFiles != null" v-if="scope.row.measureFiles"
size="mini" size="mini"
type="text" type="text"
icon="el-icon-paperclip" icon="el-icon-paperclip"
@click="handledownload(scope.row)" @click="handleDownload(scope.row)"
v-hasPermi="['project:projectMeasure:list']" v-hasPermi="['project:projectMeasure:list']"
>下载附件</el-button >下载附件</el-button
> >

4
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -102,8 +102,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150"> <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.measureFiles != null" size="mini" type="text" icon="el-icon-paperclip" <el-button v-if="scope.row.measureFiles" size="mini" type="text" icon="el-icon-paperclip"
@click="handledownload(scope.row)" v-hasPermi="['project:projectMeasure:list']">下载附件</el-button> @click="handleDownload(scope.row)" v-hasPermi="['project:projectMeasure:list']">下载附件</el-button>
<el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets" <el-button v-if="scope.row.approveStatus != null" size="mini" type="text" icon="el-icon-tickets"
@click="handleAuditinfo(scope.row)">审批日志</el-button> @click="handleAuditinfo(scope.row)">审批日志</el-button>
<el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-edit" <el-button v-if="scope.row.approveStatus != '4'" size="mini" type="text" icon="el-icon-edit"

7
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java
View File

@ -50,12 +50,13 @@ public class SmzSspProblemmodifyDraftController extends BaseController
public TableDataInfo list(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft) public TableDataInfo list(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
{ {
startPage(); startPage();
smzSspProblemmodifyDraft.setNowRole(Convert.toStr(getUserFirstRole())); /*Long fileRole = getUserFirstRole();
smzSspProblemmodifyDraft.setNowRole(Convert.toStr(fileRole));
if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodifyDraft.getNowRole())){ if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodifyDraft.getNowRole())){
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{ }else if(fileRole>4L){
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(getDeptId())); smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(getDeptId()));
} }*/
smzSspProblemmodifyDraft.setNowUserName(getLoginUser().getUsername()); smzSspProblemmodifyDraft.setNowUserName(getLoginUser().getUsername());
List<SmzSspProblemmodifyDraft> list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); List<SmzSspProblemmodifyDraft> list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft);
return getDataTable(list); return getDataTable(list);

4
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java
View File

@ -66,8 +66,8 @@ public class SmzSspProblemmodify extends BaseEntity
private String nickedArea; private String nickedArea;
/** 留痕时间 */ /** 留痕时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "整改时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date nickedTime; private Date nickedTime;
/** 工程类型 */ /** 工程类型 */

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

@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user fju on fju.phonenumber = ssp.recheckSendUser left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
left join sys_dept fjd on fjd.dept_id = fju.dept_id 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 = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
<where> <where>
and ssp.isDel=0 and ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if> <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
@ -142,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='infoType == "0" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_aqyhlx' and sdd.dict_value = ssp.danger_type</if> <if test='infoType == "0" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_aqyhlx' and sdd.dict_value = ssp.danger_type</if>
<if test='infoType == "1" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_zlyhlx' and sdd.dict_value = ssp.danger_type</if> <if test='infoType == "1" '> left join sys_dict_data sdd on sdd.dict_type = 'ssp_zlyhlx' and sdd.dict_value = ssp.danger_type</if>
<!--监理单位/总包公司/分包单位--> <!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
<where> <where>
and ssp.isDel=0 and ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if> <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
@ -224,7 +224,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project sp on ssp.projectId = sp.id left join sur_project sp on ssp.projectId = sp.id
LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
<!--监理单位/总包公司/分包单位--> <!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
WHERE ssp.isDel=0 WHERE ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if> <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
<if test="infoType !=null">and infoType=#{infoType}</if> <if test="infoType !=null">and infoType=#{infoType}</if>
@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project sp on ssp.projectId = sp.id left join sur_project sp on ssp.projectId = sp.id
LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
<!--监理单位/总包公司/分包单位--> <!--监理单位/总包公司/分包单位-->
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id</if> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = sp.id and spui.del_flag=0</if>
WHERE ssp.isDel=0 WHERE ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if> <if test="projectId != null "> and ssp.projectId = #{projectId}</if>
and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime))) and (date(NOW())<![CDATA[ > ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) <![CDATA[ > ]]> date(ssp.nickedTime)))
@ -808,7 +808,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user fju on fju.phonenumber = ssp.recheckSendUser left join sys_user fju on fju.phonenumber = ssp.recheckSendUser
left join sys_dept fjd on fjd.dept_id = fju.dept_id 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> <if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = ssp.projectId and spui.del_flag=0</if>
<where> <where>
and ssp.isDel=0 and ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if> <if test="projectId != null "> and ssp.projectId = #{projectId}</if>