施工项目：审批详情修改

shenyijian

2024-11-15 77cb4e905cd83a057ffbad30776c4a0a9b873c52

施工项目：审批详情修改

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.java

@@ -46,4 +46,6 @@
    List<Map<String, Object>> getRoleByIds(@Param("ids")List<Long> rids);

    List<Long> getSgEngineerRole();

    List<Map<String, Object>> getUserByIdsCounty(@Param("ids") List<Long> ids);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml

@@ -246,6 +246,16 @@
        </if>

    </select>
    <select id="getUserByIdsCounty" resultType="java.util.Map">
        select u.id ,u.real_name ,d.full_name as deptName from ywxt.blade_user u inner join ywxt.blade_dept d  on FIND_IN_SET(u.dept_id, d.id) > 0 where 1 = 1
        <if test="ids != null and ids.size>0">
            AND u.id in
            <foreach collection="ids" item="item" index="index" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>

    </select>
    <select id="selectProframId" resultType="java.lang.Long">
        select program_id from ywxt.sg_device where id = #{deviceId}
    </select>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -318,8 +318,11 @@
        sgProgressReportVO.setDeviceName("");}
        List<SgReportUserDO> list =  new LambdaQueryChainWrapper<>(sgReportUserMapper).eq(SgReportUserDO::getReportId,id).orderByAsc(SgReportUserDO::getApprovalOrder).list();
        List<Long> ids = list.stream().map(SgReportUserDO::getUserId).collect(Collectors.toList());
        List<Long> idsCounty = list.stream().filter(s->s.getRoleId().equals(1811657352658042882L)).map(SgReportUserDO::getUserId).collect(Collectors.toList());
        List<Long> rids = list.stream().map(SgReportUserDO::getRoleId).collect(Collectors.toList());
        List<Map<String,Object>> users = sgProgressReportMapper.getUserByIds(ids);
        List<Map<String,Object>> usersCounty = sgProgressReportMapper.getUserByIdsCounty(idsCounty);
        users.addAll(usersCounty);
        List<Map<String,Object>> roles = sgProgressReportMapper.getRoleByIds(rids);

        for (Map<String, Object> user : users) {