ABC标识中心数据筛查

“linengliang”

2023-11-29 9dfba88030f4f1a8e620e03e0d432439aaf0a99b

ABC标识中心数据筛查

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/StreamController.java

@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.jeecg.dingtalk.api.user.vo.User;
import com.jeecg.dingtalk.api.user.vo.UserRole;
import org.jeecg.common.api.dto.message.MessageDTO;
@@ -112,9 +113,14 @@
                                   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                   HttpServletRequest req) {
        LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
        SysUser sysUser = userService.getById(user.getId());
        if(StringUtils.isNotBlank(sysUser.getAreaId())){
            stream.setAreaId(sysUser.getAreaId());
        }
        QueryWrapper<Stream> queryWrapper = QueryGenerator.initQueryWrapper(stream, req.getParameterMap());
        Page<Stream> page = new Page<Stream>(pageNo, pageSize);
        IPage<Stream> pageList = streamService.page(page, queryWrapper);
        IPage<Stream> pageList = streamService.myPage(page, stream);
        return Result.OK(pageList);
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Stream.java

@@ -63,4 +63,6 @@
    private java.lang.String type;
    @TableField(exist = false)
    private List<ABCAssessment> assessmentList;
    @TableField(exist = false)
    private String areaId;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/StreamMapper.java

@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.Stream;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

/**
 * @Description: 设备ABC评价
@@ -10,5 +14,6 @@
 * @Version: V1.0
 */
public interface StreamMapper extends BaseMapper<Stream> {
     List<Stream> myPage(Page<Stream> page,@Param("areaId") String areaId);

}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/StreamMapper.xml

@@ -1,5 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.StreamMapper">
    <select id="myPage" resultType="org.jeecg.modules.eam.entity.Stream">
        select t1.*
        from mom_eam_stream t1
        left join sys_user t2 on t2.id = t1.create_by
        where 1=1
        <choose>
            <when test="areaId != null and areaId != ''">
                and t2.area_id = #{areaId}
            </when>
            <otherwise>
                and t2.area_id = '-1'
            </otherwise>
        </choose>

    </select>

</mapper>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IStreamService.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.Stream;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -27,6 +28,7 @@
     * @param idList
     */
    public void delBatchMain (Collection<? extends Serializable> idList);
    public Page<Stream> myPage(Page<Stream> page,Stream stream);


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/StreamServiceImpl.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.eam.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.eam.entity.Stream;
import org.jeecg.modules.eam.mapper.StreamOperationMapper;
import org.jeecg.modules.eam.mapper.ABCAssessmentMapper;
@@ -46,4 +47,10 @@
        }
    }

    @Override
    public Page<Stream> myPage(Page<Stream> page, Stream stream) {
        return page.setRecords(baseMapper.myPage(page,stream.getAreaId()));
    }


}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -197,6 +197,8 @@
    private String homePath;
    @Dict(dicCode = "id",dictTable = "mom_base_team",dicText = "name")
    private String teamId;
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    private String areaId;


}

 lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_11_16(lnl)/2023_11_24.sql

@@ -19,3 +19,11 @@
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment_report_repair',
    'COLUMN', N'err_uda5'
ALTER TABLE [dbo].[sys_user] ADD [area_id] nvarchar(32) NULL
    GO

    EXEC sp_addextendedproperty
    'MS_Description', N'中心ID',
    'SCHEMA', N'dbo',
    'TABLE', N'sys_user',
    'COLUMN', N'area_id'