提交代码

ruoyi-common/src/main/java/com/ruoyi/common/enums/DeptTypeEnum.java

@@ -10,9 +10,10 @@ public enum DeptTypeEnum {
 
     JTGSTYPE("3", "泾河产业发展集团"),
     ZGSTYPE("4", "发展集团子公司"),
-    JLDWTYPE("5", "监理单位"),
+    JFDBTYPE("5", "监理单位"),
-    ZBDWTYPE("6", "总包单位"),
+    JLDWTYPE("6", "监理单位"),
-    FBDWTYPE("7", "分包单位"),
+    ZBDWTYPE("7", "总包单位"),
+    FBDWTYPE("8", "分包单位"),
 
     COMFLAG("1","子公司标识");
 

ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue

@@ -181,7 +181,7 @@
           width="135"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d} {h}:{s}") }}</span>
+            <span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column

ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue

@@ -182,7 +182,7 @@
           width="135"
         >
           <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d} {h}:{s}") }}</span>
+            <span>{{ parseTime(scope.row.nickedTime, "{y}-{m}-{d}") }}</span>
           </template>
         </el-table-column>
         <el-table-column

ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/mapper/PshMapper.java

@@ -360,4 +360,11 @@ public interface PshMapper {
      * @return
      */
     List<Map<String, Object>> selectCodeFromSmark(String proId);
+
+    /**
+     * 查询项目用户信息
+     * @param map
+     * @return
+     */
+    List<Map<String,Object>> queryProjectUserinfo(Map<String,Object> map);
 }

ruoyi-wechat/src/main/java/com/ruoyi/web/pshManage/service/PshServiceImpl.java

@@ -146,9 +146,21 @@ public class PshServiceImpl implements IPshService {
             //当前角色时管理员时，修改角色为集团公司
             String roleType = "";
             if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){
-                roleType = DeptTypeEnum.JTGSTYPE.getCode();
+                List<Map<String,Object>> datalist = pshMapper.queryProjectUserinfo(map);
+                if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && "21".equals(datalist.get(0).get("job_type"))){
+                    //说明是甲方经理
+                    roleType = DeptTypeEnum.JFDBTYPE.getCode();
+                }else{
+                    roleType = DeptTypeEnum.JTGSTYPE.getCode();
+                }
             }else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){
-                roleType = DeptTypeEnum.ZGSTYPE.getCode();
+                List<Map<String,Object>> datalist = pshMapper.queryProjectUserinfo(map);
+                if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && "21".equals(datalist.get(0).get("job_type"))){
+                    //说明是甲方经理
+                    roleType = DeptTypeEnum.JFDBTYPE.getCode();
+                }else{
+                    roleType = DeptTypeEnum.ZGSTYPE.getCode();
+                }
             }else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){
                 roleType = DeptTypeEnum.JLDWTYPE.getCode();
             }else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){

ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/mapper/SspMapper.java

@@ -304,6 +304,13 @@ public interface SspMapper {
      */
     List<Map<String,Object>> querySspQualityMarkMyList(Map<String,Object> map);
 
+    /**
+     * 查询项目用户信息
+     * @param map
+     * @return
+     */
+    List<Map<String,Object>> queryProjectUserinfo(Map<String,Object> map);
+
     /**
      * 获取质量留痕记录详情
      * @param map

ruoyi-wechat/src/main/java/com/ruoyi/web/sspManage/service/SspServiceImpl.java

@@ -148,9 +148,21 @@ public class SspServiceImpl implements ISspService {
             //当前角色时管理员时，修改角色为集团公司
             String roleType = "";
             if(DeptTypeEnum.JTGS.getCode().equals(deptMap.get("type_flag"))){
-                roleType = DeptTypeEnum.JTGSTYPE.getCode();
+                List<Map<String,Object>> datalist = sspMapper.queryProjectUserinfo(map);
+                if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && "21".equals(datalist.get(0).get("job_type"))){
+                    //说明是甲方经理
+                    roleType = DeptTypeEnum.JFDBTYPE.getCode();
+                }else{
+                    roleType = DeptTypeEnum.JTGSTYPE.getCode();
+                }
             }else if(DeptTypeEnum.ZGS.getCode().equals(deptMap.get("type_flag"))){
-                roleType = DeptTypeEnum.ZGSTYPE.getCode();
+                List<Map<String,Object>> datalist = sspMapper.queryProjectUserinfo(map);
+                if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && "21".equals(datalist.get(0).get("job_type"))){
+                    //说明是甲方经理
+                    roleType = DeptTypeEnum.JFDBTYPE.getCode();
+                }else{
+                    roleType = DeptTypeEnum.ZGSTYPE.getCode();
+                }
             }else if(DeptTypeEnum.JLDW.getCode().equals(deptMap.get("type_flag"))){
                 roleType = DeptTypeEnum.JLDWTYPE.getCode();
             }else if(DeptTypeEnum.ZBDW.getCode().equals(deptMap.get("type_flag"))){

ruoyi-wechat/src/main/resources/mapper/PshMapper.xml

@@ -100,6 +100,7 @@
             ssp.*,
             case when ud.type_flag in (1,11) then CONCAT(sd.dept_name,' ', '[责任主体]') else concat(ud.dept_name, ' ', '[', sdd.dict_label ,']') end as projectUnit,
             su.`nick_name` `name`,
+            sd2.dict_label as danger_typeName,
             ssa.id checkId
         FROM
             smz_ssp_problemmodify ssp
@@ -110,6 +111,7 @@
             left join sys_dept sd on sd.dept_id = spi.deptId
             left join sur_project_unit_info spui on spui.projectId = spi.id and spui.unitId = su.dept_id
             left join sys_dict_data sdd on sdd.dict_type = 'sys_dept_type' and sdd.dict_value = spui.unitType
+            left join sys_dict_data sd2 on sd2.dict_type = 'ssp_aqyhlx' and sd2.dict_value = ssp.danger_type
         WHERE
             ssp.id = #{id}
             GROUP BY ssp.id
@@ -624,4 +626,12 @@
     <select id="selectCodeFromSmark" parameterType="String" resultType="map">
         select code,name from smz_work_area where 1=1 and projectId = #{proId}
     </select>
+
+    <!-- 查询项目用户信息 -->
+    <select id="queryProjectUserinfo" parameterType="map" resultType="map">
+        select spu.id,spu.project_id,spu.dept_id,spu.dept_name,spu.dept_type,spu.job_type,spu.user_id,spu.is_del from sur_project_userinfo spu
+        left join sys_user su on su.user_id=spu.user_id
+        where su.del_flag=0 and spu.is_del=0 and spu.dept_type=11 and spu.project_id=#{projectId} and su.phonenumber=#{createUser}
+    </select>
+
 </mapper>

ruoyi-wechat/src/main/resources/mapper/SspMapper.xml

@@ -100,6 +100,7 @@
             ssp.*,
             case when ud.type_flag in (1,11) then CONCAT(sd.dept_name,' ', '[责任主体]') else concat(ud.dept_name, ' ', '[', sdd.dict_label ,']') end as projectUnit,
             su.`nick_name` `name`,
+            sd2.dict_label as danger_typeName,
             ssa.id checkId
         FROM
             smz_ssp_problemmodify ssp
@@ -110,6 +111,7 @@
             left join sys_dept sd on sd.dept_id = spi.deptId
             left join sur_project_unit_info spui on spui.projectId = spi.id and spui.unitId = su.dept_id
             left join sys_dict_data sdd on sdd.dict_type = 'sys_dept_type' and sdd.dict_value = spui.unitType
+            left join sys_dict_data sd2 on sd2.dict_type = 'ssp_zlyhlx' and sd2.dict_value = ssp.danger_type
         WHERE
             ssp.id = #{id}
             GROUP BY ssp.id
@@ -318,6 +320,13 @@
         UPDATE ${tableName} SET ${fieldName} = #{checkState},updateTime = NOW() WHERE ${keySet} = #{id}
     </update>
 
+    <!-- 查询项目用户信息 -->
+    <select id="queryProjectUserinfo" parameterType="map" resultType="map">
+        select spu.id,spu.project_id,spu.dept_id,spu.dept_name,spu.dept_type,spu.job_type,spu.user_id,spu.is_del from sur_project_userinfo spu
+        left join sys_user su on su.user_id=spu.user_id
+        where su.del_flag=0 and spu.is_del=0 and spu.dept_type=11 and spu.project_id=#{projectId} and su.phonenumber=#{createUser}
+    </select>
+
     <!-- 查询已整改的基本信息 -->
     <select id="queryOpinion" parameterType="map" resultType="map">
         SELECT

ruoyi-wechat/src/main/resources/templates/pshManage/myChanges.html

@@ -61,7 +61,14 @@
                 </div>
             </div>
         </div>
+        <div class="ssp-block">
+            <div class="spp-block-title">
+                隐患类型
+            </div>
+            <div class="ssp-block-word" th:text="${queryChangeNicked.danger_typeName}">
 
+            </div>
+        </div>
         <div class="ssp-block">
             <div class="spp-block-title">
                 隐患描述

ruoyi-wechat/src/main/resources/templates/pshManage/sspChange.html

@@ -127,7 +127,7 @@
                     整改截至时间
                 </div>
                 <div class="ssp-block-input">
-                    <input type="text" id="dateTime" data-options="{'type':'YYYY-MM-DD hh:mm','beginYear':2023,'endYear':2033,'limitTime':'tomorrow'}" readonly placeholder="请选择整改截至时间"  th:value="${nickedTime}" />
+                    <input type="text" id="dateTime" data-options="{'type':'YYYY-MM-DD','beginYear':2023,'endYear':2033,'limitTime':'tomorrow'}" readonly placeholder="请选择整改截至时间"  th:value="${nickedTime}" />
                 </div>
             </div>
             <div class="ssp-block">

ruoyi-wechat/src/main/resources/templates/pshManage/sspStayCheck.html

@@ -71,7 +71,14 @@
                 </div>
             </div>
         </div>
+        <div class="ssp-block">
+            <div class="spp-block-title">
+                隐患类型
+            </div>
+            <div class="ssp-block-word" th:text="${queryChangeNicked.danger_typeName}">
 
+            </div>
+        </div>
         <div class="ssp-block">
             <div class="spp-block-title">
                 隐患描述

ruoyi-wechat/src/main/resources/templates/sspManage/myChanges.html

@@ -61,7 +61,14 @@
                 </div>
             </div>
         </div>
+        <div class="ssp-block">
+            <div class="spp-block-title">
+                隐患类型
+            </div>
+            <div class="ssp-block-word" th:text="${queryChangeNicked.danger_typeName}">
 
+            </div>
+        </div>
         <div class="ssp-block">
             <div class="spp-block-title">
                 隐患描述

ruoyi-wechat/src/main/resources/templates/sspManage/sspChange.html

@@ -127,7 +127,7 @@
                     整改截至时间
                 </div>
                 <div class="ssp-block-input">
-                    <input type="text" id="dateTime" data-options="{'type':'YYYY-MM-DD hh:mm','beginYear':2023,'endYear':2033,'limitTime':'tomorrow'}" placeholder="请选择整改截至时间" th:value="${nickedTime}" readonly />
+                    <input type="text" id="dateTime" data-options="{'type':'YYYY-MM-DD','beginYear':2023,'endYear':2033,'limitTime':'tomorrow'}" placeholder="请选择整改截至时间" th:value="${nickedTime}" readonly />
                 </div>
             </div>
             <div class="ssp-block">

ruoyi-wechat/src/main/resources/templates/sspManage/sspStayCheck.html

@@ -69,7 +69,14 @@
                 </div>
             </div>
         </div>
+        <div class="ssp-block">
+            <div class="spp-block-title">
+                隐患类型
+            </div>
+            <div class="ssp-block-word" th:text="${queryChangeNicked.danger_typeName}">
 
+            </div>
+        </div>
         <div class="ssp-block">
             <div class="spp-block-title">
                 隐患描述