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

Merge remote-tracking branch 'pqs-process-boot-dev/master'

Browse Source
This commit is contained in:
huangzj
2023-01-09 09:09:15 +08:00
parent d778e16165 5f7fc00475
commit 44390529b4
8 changed files with 105 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,9 +33,9 @@ public interface RGeneralSurveyPlanDetailMapper extends MppBaseMapper<RGeneralSu
"WHERE\n" +
"\ta.org_no = #{questionQueryParm.orgNo} " +
"<when test='questionQueryParm.planName!=null and questionQueryParm.planName!=\"\"'>",
"and a.plan_name = #{questionQueryParm.planName}\n" +
"</when>",
"AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')",
"</script>"})
List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm);
}
"and a.plan_name = #{questionQueryParm.planName}\n" +
"</when>",
"AND DATE_FORMAT(a.upload_time, '%Y%m') = DATE_FORMAT(#{questionQueryParm.planStartTime}, '%Y%m')",
"</script>"})
List<RGeneralSurveyPlanDetailOnQuestionVO> querySurveyPlanOnQuestion(@Param("questionQueryParm") SurveyPlanQuestionQueryParm questionQueryParm);
}

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

@@ -1,8 +1,6 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.process.pojo.param.QueryIssuesParam;
import com.njcn.process.pojo.po.RStatElectricQualityProblemFlow;
import com.njcn.process.pojo.vo.IssuesVO;
@@ -20,5 +18,5 @@ import java.util.List;
*/
public interface RStatElectricQualityProblemFlowMapper extends BaseMapper<RStatElectricQualityProblemFlow> {
List<IssuesVO> getIssues(@Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd);
List<IssuesVO> getIssues(@Param("deptIds") List<String> deptIds, @Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd);
}

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

@@ -9,8 +9,12 @@
r_stat_electric_quality_problem_flow
WHERE
data_date between #{dateBegin} AND #{dateEnd}
<if test="param.orgNo !=null and param.orgNo !=''">
AND org_no = #{param.orgNo}
<if test="deptIds !=null and deptIds.size() >0">
AND org_no in
<foreach collection="deptIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
<if test="param.problemSources !=null and param.problemSources !=''">
AND problem_sources = #{param.problemSources}