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

提交代码

dev_xds
姜玉琦 2024-07-01 23:56:58 +08:00
parent f7fa9a0217
commit ef013a1538
10 changed files with 131 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue
View File

@ -225,6 +225,23 @@
<template slot-scope="scope">
<div>{{ scope.row.lordSent }}</div>
<div>{{ scope.row.lordSentUser }}</div>
<div>
<el-tag v-if="scope.row.zgDeptType == '1'" size="small">
集团公司
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '11'" size="small">
子公司
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '2'" size="small">
总包单位
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '3'" size="small">
分包单位
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '4'" size="small">
监理单位
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="checkState">
@ -239,6 +256,23 @@
<template slot-scope="scope">
<div>{{ scope.row.recheckSend }}</div>
<div>{{ scope.row.recheckSendUser }}</div>
<div>
<el-tag v-if="scope.row.fjDeptType == '1'" size="small" effect="plain">
集团公司
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '11'" size="small" effect="plain">
子公司
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '2'" size="small" effect="plain">
总包单位
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '3'" size="small" effect="plain">
分包单位
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '4'" size="small" effect="plain">
监理单位
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column

34
ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue
View File

@ -226,6 +226,23 @@
<template slot-scope="scope">
<div>{{ scope.row.lordSent }}</div>
<div>{{ scope.row.lordSentUser }}</div>
<div>
<el-tag v-if="scope.row.zgDeptType == '1'" size="small">
集团公司
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '11'" size="small">
子公司
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '2'" size="small">
总包单位
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '3'" size="small">
分包单位
</el-tag>
<el-tag v-if="scope.row.zgDeptType == '4'" size="small">
监理单位
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column label="流程状态" align="center" prop="checkState">
@ -240,6 +257,23 @@
<template slot-scope="scope">
<div>{{ scope.row.recheckSend }}</div>
<div>{{ scope.row.recheckSendUser }}</div>
<div>
<el-tag v-if="scope.row.fjDeptType == '1'" size="small" effect="plain">
集团公司
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '11'" size="small" effect="plain">
子公司
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '2'" size="small" effect="plain">
总包单位
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '3'" size="small" effect="plain">
分包单位
</el-tag>
<el-tag v-if="scope.row.fjDeptType == '4'" size="small" effect="plain">
监理单位
</el-tag>
</div>
</template>
</el-table-column>
<el-table-column

2
ruoyi-ui/src/views/video/videoList/index.vue
View File

@ -59,7 +59,7 @@ export default {
videoConfigList: [],
currentIndex: null,
request:
"https://szgc.jhncidg.com/video/live/cameraid/{{videoDvrNumber}}${{passage}}/substream/2.m3u8",
"http://111.21.209.230:7086/live/cameraid/1000064$0/substream/2.m3u8",
videoPassageList: [],
videoDvrNumber: null,
};

2
ruoyi-wechat/src/main/java/com/ruoyi/web/flowable/controller/WcFlowLabourController.java
View File

@ -41,7 +41,7 @@ public class WcFlowLabourController extends BaseController {
flowLabourInfo.setDeptId(null);
}
//启用分页
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoListV2(flowLabourInfo);
return getDataTable(list);
}

4
ruoyi-wechat/src/main/resources/application-druid.yml
View File

@ -51,9 +51,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
url: jdbc:mysql://62.234.3.186:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
username: root
password: Sxyanzhu@cf
password: Sxyanzhu@cf123
# 从库数据源
slave:
# 从数据源开关/默认关闭

2
ruoyi-wechat/src/main/resources/application.yml
View File

@ -20,7 +20,7 @@ spring:
# 国际化资源文件路径
basename: i18n/messages
profiles:
active: prod
active: druid
# 文件上传
servlet:
multipart:

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

@ -136,6 +136,9 @@ public class SmzSspProblemmodify extends BaseEntity
private String dangerLabel;
private String chkLabel;
private String zgDeptType;
private String fjDeptType;
public String getDangerLabel() {
return dangerLabel;
}
@ -458,6 +461,22 @@ public class SmzSspProblemmodify extends BaseEntity
this.problemType = problemType;
}
public String getZgDeptType() {
return zgDeptType;
}
public void setZgDeptType(String zgDeptType) {
this.zgDeptType = zgDeptType;
}
public String getFjDeptType() {
return fjDeptType;
}
public void setFjDeptType(String fjDeptType) {
this.fjDeptType = fjDeptType;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

2
yanzhu-jh/src/main/resources/mapper/project/SurProjectInsuranceMapper.xml
View File

@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sur_project_unit_info spui on spui.projectId=sp.id and spui.unitType=2
left join sys_dept d on d.dept_id = spui.unitId
RIGHT JOIN sys_dict_data sdd ON sdd.dict_type = 'sur_project_insurance_type'
LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id
LEFT JOIN sur_project_insurance spi ON spi.project_id = sp.id and spi.dept_id=spui.unitId
AND spi.insurance_type = sdd.dict_value
AND spi.is_del = 0
<!--普通用户查询项目人员-->

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

@ -42,6 +42,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="deptName" column="deptName"/>
<result property="createUserName" column="createUserName"/>
<result property="flag" column="flag"/>
<result property="zgDeptType" column="zgDeptType"/>
<result property="fjDeptType" column="fjDeptType"/>
<result property="chkLabel" column="chkLabel"></result>
<result property="dangerLabel" column="dangerLabel"></result>
<collection property="unitInfos" ofType="SurProjectUnitInfo">
@ -55,14 +57,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectSmzSspProblemmodifyList" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as 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.problemType, su.nick_name as createBy
select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as 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.problemType, su.nick_name as createBy,
zgd.type_flag as zgDeptType,
fjd.type_flag as fjDeptType
from vw_smz_ssp_problemmodify_audit ssp
left join sur_project sp on ssp.projectId = sp.id
left join sys_user su ON su.phonenumber = ssp.createUser
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 = sp.id</if>
<where>
and ssp.isDel=0 and sp.progressVisible=0
and ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if>
<if test="infoType != null "> and ssp.infoType = #{infoType}</if>
<if test="roleType != null and roleType >0 "> and ssp.roleType = #{roleType}</if>
@ -119,12 +127,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sdd.dict_label as danger_type_name,
case when ssp.recheckSendUser = #{nowUser} and ssp.checkState=1 then 0
when ssp.lordSentUser = #{nowUser} then 1
else 2 end sort
else 2 end sort,
zgd.type_flag as zgDeptType,
fjd.type_flag as fjDeptType
from smz_ssp_problemmodify ssp
left join sur_project sp on ssp.projectId = sp.id
LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
left join sys_dept ud on ud.dept_id = su.dept_id
left join sys_dept sd on sd.dept_id = sp.deptId
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='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>
<!--监理单位/总包公司/分包单位-->
@ -211,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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>
WHERE ssp.isDel=0 and sp.progressVisible=0
WHERE ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if>
<if test="infoType !=null">and infoType=#{infoType}</if>
<if test="problemArea != null and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
@ -243,7 +257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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>
WHERE ssp.isDel=0 and sp.progressVisible=0
WHERE ssp.isDel=0
<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)))
<if test="infoType !=null">and infoType=#{infoType}</if>
@ -278,7 +292,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select ssp.id, ssp.projectId, ssp.infoType, sp.projectName as 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.problemType, su.nick_name as createBy,
case when ud.type_flag in (1,11) then concat(sd.dept_name,' ', '[责任主体]') else concat(ud.dept_name, ' ', '[', sdd3.dict_label ,']') end as deptName,
IFNULL(sdd1.dict_label,sdd2.dict_label) as danger_type_name,
su.nick_name as createUserName
su.nick_name as createUserName,
zgd.type_flag as zgDeptType,
fjd.type_flag as fjDeptType
from smz_ssp_problemmodify ssp
left join sur_project sp on ssp.projectId = sp.id
LEFT JOIN sys_user su ON ssp.createUser = su.phonenumber
@ -288,6 +304,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dict_data sdd2 on sdd2.dict_type = 'ssp_zlyhlx' and sdd2.dict_value = ssp.danger_type
left join sur_project_unit_info spui on spui.projectId = sp.id and spui.unitId = su.dept_id
left join sys_dict_data sdd3 on sdd3.dict_type = 'sys_dept_type' and sdd3.dict_value = spui.unitType
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
where ssp.id = #{id}
</select>
@ -434,7 +454,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dict_data sd on sd.dict_value=sp.danger_type
<if test="infoType==0">and sd.dict_type = 'ssp_aqyhlx'</if>
<if test="infoType==1">and sd.dict_type = 'ssp_zlyhlx'</if>
WHERE sp.isDel = 0 and p.progressVisible=0 and p.isDel=0
WHERE sp.isDel = 0 and p.isDel=0
AND sp.infotype = #{infoType}
<if test="roleType > 0">AND sp.roletype=#{roleType}</if>
<if test="startDate!=null">and DATE(sp.createtime) &gt;= DATE(#{startDate})</if>
@ -461,7 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from
(
select projectId,prjName,count(1) proble from vw_smz_ssp_problemmodify_audit
where infoType=#{infoType} AND isDel=0 AND progressVisible=0
where infoType=#{infoType} AND isDel=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test='proType != null and proType != "" and proType != "0"'> and proType = #{proType}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
@ -480,7 +500,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join(
select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where
((updateTime is null and date(nickedTime) &lt; date(now()) ) or date(updateTime )>date(nickedTime))
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
and infoType=#{infoType} AND isDel=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -498,7 +518,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join (
SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) &lt; date(now()) )
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
and infoType=#{infoType} AND isDel=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -517,7 +537,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join(
select projectid,count(1) comp from vw_smz_ssp_problemmodify_audit where
checkState=4
and infoType=#{infoType} AND isDel=0 AND progressVisible=0
and infoType=#{infoType} AND isDel=0
<if test="projectId>0">and projectId=#{projectId}</if>
<if test="deptId >0 ">AND deptid = #{deptId}</if>
<if test="prjIds !=null and prjIds.size()>0">
@ -604,8 +624,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="countByDateRange" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
SELECT ssp.infotype,COUNT(1) id FROM smz_ssp_problemmodify ssp
left join sur_project sp on sp.id=ssp.projectId
WHERE ssp.isDel=0 and ssp.infoType=#{infoType}
and sp.progressVisible=0 and sp.isDel=0
WHERE ssp.isDel=0 and ssp.infoType=#{infoType} and sp.isDel=0
<if test="projectId > 0"> and ssp.projectId=#{projectId}</if>
<if test="deptId > 0 ">AND sp.deptid = #{deptId}</if>
<if test='proType != null and proType != "" and proType != "0"'> and sp.projectType = #{proType}</if>
@ -674,7 +693,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
SELECT ssp.infotype,ssp.checkState,COUNT(1) id FROM smz_ssp_problemmodify ssp
left join sur_project sp on sp.id=ssp.projectId
WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0
WHERE ssp.isDel=0 and sp.isDel=0
<if test="infoType !=null">and ssp.infoType=#{infoType}</if>
<if test="roleType !=null and roleType>0">and ssp.roleType=#{roleType}</if>
<if test="startDate!=null">and DATE(ssp.createtime) &gt;= DATE(#{startDate})</if>
@ -749,7 +768,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) cnt
FROM smz_ssp_problemmodify ssp
left join sur_project sp on ssp.projectId=sp.id
WHERE ssp.isDel=0 and sp.progressVisible=0 and sp.isDel=0
WHERE ssp.isDel=0 and sp.isDel=0
<if test="infoType !=null">and ssp.infoType=#{infoType}</if>
<if test="roleType !=null and roleType>0">and ssp.roleType=#{roleType}</if>
<if test="startDate!=null">and DATE(ssp.createtime) &gt;= DATE(#{startDate})</if>

8
yanzhu-jh/src/main/resources/mapper/work/WorkTrainMapper.xml
View File

@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test='nowRole == "15" or nowRole == "16" or nowRole == "17" or nowRole == "99"'> and spu.user_id = #{nowUser} and spu.is_del=0</if>
</where>
group by wt.id
order by wt.create_time desc
order by wt.begin_date desc
</select>
<select id="selectBgscreenWorkTrainList" parameterType="WorkTrain" resultMap="WorkTrainResult">
@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
group by gr.train_nature) as group_train on group_train.maxid = wt.id
where wt.is_del=0
group by wt.id
order by wt.create_time desc
order by wt.begin_date desc
</select>
<select id="selectBgscreenWorkTrainListv2" parameterType="WorkTrain" resultMap="WorkTrainResult">
@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
group by wt.id
order by wt.create_time desc
order by wt.begin_date desc
limit 20
</select>
@ -306,6 +306,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</if>
group by wt.id
order by wt.create_time desc
order by wt.begin_date desc
</select>
</mapper>