xiangpei
2024-09-17 d2cc01f393336a31ce382488cc1fd2b1d7d9be50
工单详情页优化
3个文件已修改
15 ■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderYwConditionRecordVO.java
@@ -25,8 +25,8 @@
    private Integer workOrderId;
    /** 提交人 */
    private Integer commitUser;
    private String commitUserName;
    private Integer unitId;
    private String unitName;
    /** 运维情况 */
    private String ywCondition;
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -400,7 +400,7 @@
        List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
        ywConditionList.stream().forEach(item -> {
            if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
                item.setCommitUserName("系统消息");
                item.setUnitName("系统消息");
            }
        });
        return ywConditionList;
ycl-server/src/main/resources/mapper/zgyw/WorkOrderYwConditionRecordMapper.xml
@@ -7,16 +7,17 @@
        <result column="id" property="id"/>
        <result column="create_time" property="createTime"/>
        <result column="yw_condition" property="ywCondition"/>
        <result column="commit_user" property="commitUser"/>
        <result column="nick_name" property="commitUserName"/>
        <result column="unitId" property="unitId"/>
        <result column="unit_name" property="unitName"/>
        <result column="sys_msg" property="sysMsg"/>
        <result column="yw_proofMaterials" property="ywProofMaterials"/>
    </resultMap>
    <select id="selectYwConditionByYwId" resultMap="BaseResultMap">
        SELECT yw.id, yw.commit_user, yw.yw_condition, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
        SELECT yw.id, yu.id as unit_id, yu.unit_name, yw.yw_proofMaterials, yw.create_time, yw.sys_msg, su.nick_name
        FROM t_work_order_yw_condition_record yw
                 INNER JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
                 LEFT JOIN sys_user su ON yw.commit_user = su.user_id AND yw.deleted = 0 AND yw.work_order_no = #{workOrderNo}
                 LEFT JOIN t_yw_unit yu ON su.unit_id = yu.id
        ORDER BY yw.create_time DESC
    </select>