xiangpei
2024-08-09 ca356d5f7fc46cf1eaf72895481a973769a79c4e
sql字段调整
3个文件已修改
19 ■■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -42,7 +42,11 @@
     */
    private String serialNumber;
    private String pointTag;
    private Boolean provinceTag;
    private Boolean importantTag;
    private Boolean importantCommandImageTag;
    /**
     * 是否重点点位
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -343,11 +343,6 @@
    public Result distributePage(DistributeWorkOrderQuery query) {
        IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
        baseMapper.distributePage(page, query);
        page.getRecords().stream().forEach(workOrder -> {
            if (StringUtils.hasText(workOrder.getPointTag()) && workOrder.getPointTag().contains(IMPORTANT)) {
                workOrder.setImportant(Boolean.TRUE);
            }
        });
        return Result.ok().data(page).total(page.getTotal());
    }
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -47,7 +47,9 @@
            wo.*,
            u.unit_name,
            p.yw_person_name,
            yp.point_tag,
            yp.province_tag,
            yp.important_tag,
            yp.important_command_image_tag,
            odr.create_time as distributeTime,
            su.nick_name as realName
        FROM
@@ -72,7 +74,9 @@
        SELECT
             wo.id,
             wod.create_time,
             yp.point_tag
             yp.province_tag,
             yp.important_tag,
             yp.important_command_image_tag
        FROM
             t_work_order wo
                INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0