Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.过程监督-谐波普测管理代码调整

Browse Source 
2.过程监督-干扰用户管理代码调整
3.过程监督-电能质量问题管理代码调整
4.过程监督-终端监测管理代码调整
This commit is contained in:
wr
2024-02-05 14:08:06 +08:00
parent 68b7425a4e
commit 3148a84444
15 changed files with 620 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/LoadTypeUserManageMapper.java
View File

@@ -9,6 +9,8 @@ import com.njcn.process.pojo.po.RLoadTypeUserManage;
import com.njcn.process.pojo.vo.RLoadTypeUserManageVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 干扰源用户管理Mapper
*
@@ -24,7 +26,10 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
* @param loadTypeUserSearchParam 入参
* @return 结果
*/
Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
Page<RLoadTypeUserManageVO> getLoadTypeUserPage(IPage<RLoadTypeUserManageVO> page,
@Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam,
@Param("ids") List<String> ids
);
/**
* 干扰源用户分页查询
@@ -32,5 +37,7 @@ public interface LoadTypeUserManageMapper extends BaseMapper<RLoadTypeUserManage
* @param loadTypeUserSearchParam 入参
* @return 结果
*/
Page<RLoadTypeUserManageVO> getLoadTypeRelationPage(IPage<RLoadTypeUserManageVO> page, @Param("loadTypeUserSearchParam") LoadTypeUserSearchParam loadTypeUserSearchParam);
Page<RLoadTypeUserManageVO> getLoadTypeRelationPage(IPage<RLoadTypeUserManageVO> page,
@Param("param") LoadTypeUserSearchParam loadTypeUserSearchParam
);
}

4
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RGeneralSurveyPlanDetailMapper.java
View File

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
*
*
* Description:
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
* Date: 2022/11/11 11:28【需求编号】
@@ -38,4 +38,4 @@ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper<RGeneralSu
"AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')",
"</script>"})
List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm);
}
}

59
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/LoadTypeUserManageMapper.xml
View File

@@ -2,27 +2,35 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.njcn.process.mapper.LoadTypeUserManageMapper">
<select id="getLoadTypeUserPage" resultType="RLoadTypeUserManageVO">
<select id="getLoadTypeUserPage" resultType="com.njcn.process.pojo.vo.RLoadTypeUserManageVO">
SELECT
*
FROM
r_load_type_user_manage r
where 1=1
<if test="loadTypeUserSearchParam.orgNo != null and loadTypeUserSearchParam.orgNo != ''">
and r.org_no = #{loadTypeUserSearchParam.orgNo}
</if>
<if test="loadTypeUserSearchParam.loadType != null and loadTypeUserSearchParam.loadType != ''">
and r.load_type = #{loadTypeUserSearchParam.loadType}
</if>
<if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%')
</if>
<if test="loadTypeUserSearchParam.fileUploadflag != null and loadTypeUserSearchParam.fileUploadflag != ''">
and r.i_is_file_upload = #{loadTypeUserSearchParam.fileUploadflag}
</if>
<where>
<if test="ids != null and ids.size > 0">
AND r.org_no IN
<foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param.checkType != null and param.checkType == 1">
and r.i_check_person is null and r.i_check_person !=""
</if>
<if test="param.loadType != null and param.loadType != ''">
and r.load_type = #{param.loadType}
</if>
<if test="param.userName != null and param.userName != ''">
and r.user_name like CONCAT('%', #{param.userName}, '%')
</if>
<if test="param.fileUploadflag != null and param.fileUploadflag != ''">
and r.i_is_file_upload = #{param.fileUploadflag}
</if>
</where>
order by record_time desc
</select>
<select id="getLoadTypeRelationPage" resultType="RLoadTypeUserManageVO">
<select id="getLoadTypeRelationPage" resultType="com.njcn.process.pojo.vo.RLoadTypeUserManageVO">
SELECT
*
FROM
@@ -31,21 +39,22 @@
AND ISNULL( relation_user_id )= 0
AND LENGTH(
trim( relation_user_id ))> 0
<if test="loadTypeUserSearchParam.orgNo != null and loadTypeUserSearchParam.orgNo != ''">
and r.org_no = #{loadTypeUserSearchParam.orgNo}
<if test="param.orgNo != null and param.orgNo != ''">
and r.org_no = #{param.orgNo}
</if>
<if test="loadTypeUserSearchParam.loadType != null and loadTypeUserSearchParam.loadType != ''">
and r.load_type = #{loadTypeUserSearchParam.loadType}
<if test="param.loadType != null and param.loadType != ''">
and r.load_type = #{param.loadType}
</if>
<if test="loadTypeUserSearchParam.userName != null and loadTypeUserSearchParam.userName != ''">
and r.user_name like CONCAT('%', #{loadTypeUserSearchParam.userName}, '%')
<if test="param.userName != null and param.userName != ''">
and r.user_name like CONCAT('%', #{param.userName}, '%')
</if>
<if test="loadTypeUserSearchParam.relationUserName != null and loadTypeUserSearchParam.relationUserName != ''">
and r.relation_user_name like CONCAT('%', #{loadTypeUserSearchParam.relationUserName}, '%')
<if test="param.relationUserName != null and param.relationUserName != ''">
and r.relation_user_name like CONCAT('%', #{param.relationUserName}, '%')
</if>
<if test="loadTypeUserSearchParam.aIsFileUpload != null and loadTypeUserSearchParam.aIsFileUpload != ''">
and r.a_is_file_upload = #{loadTypeUserSearchParam.aIsFileUpload}
<if test="param.aIsFileUpload != null and param.aIsFileUpload != ''">
and r.a_is_file_upload = #{param.aIsFileUpload}
</if>
order by record_time desc
</select>
</mapper>