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

1.模板字段*添加红色标识

Browse Source 
2.预警单,反馈单导出接口增加
3.修改技术监督月报统计逻辑
This commit is contained in:
wr
2023-09-11 15:48:56 +08:00
parent 979f1daa06
commit fb6a469e68
17 changed files with 270 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvAlarmBackMapper.java
View File

@@ -21,4 +21,5 @@ public interface SupvAlarmBackMapper extends BaseMapper<SupvAlarmBack> {
Page<SupvAlarmBack> pageAlarmBack(Page objectPage,@Param("ids") List<String> ids,@Param("param") SupvAlarmBackParam param);
List<SupvAlarmBack> selectAlarmBack();
}

7
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvReportMMapper.java
View File

@@ -21,12 +21,15 @@ import java.util.List;
*/
public interface SupvReportMMapper extends MppBaseMapper<SupvReportM> {
//月报计划统计(按照实施结束时间统计)
List<ProcessPublicDTO> statisticPlanReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
//本年计划统计(按照计划时间统计)
List<ProcessPublicDTO> statisticPlanReportYear(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("objType")String objType,@Param("effectStatus")List<String> effectStatus);
//问题数据
//问题数据(问题发现时间统计)
List<ProcessPublicDTO> statisticQueReport(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);
//问题整改数量
//问题整改数量(问题整改时间统计)
List<ProcessPublicDTO> statisticQueReportRectify(@Param("startTime")LocalDateTime startTime, @Param("endTime")LocalDateTime endTime, @Param("statisticType")String statisticType,@Param("rectificationStatus")String rectificationStatus,@Param("objType")String objType);

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

@@ -19,4 +19,14 @@
</if>
</where>
</select>
<select id="selectAlarmBack" resultType="com.njcn.process.pojo.po.SupvAlarmBack">
select
sab.*,
sab.complete_Time as time,
sa.bill_No,
sa.bill_Name
from
supv_alarm sa
INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
</select>
</mapper>

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

@@ -10,7 +10,7 @@
where
supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and plan_Supv_Date between #{startTime} and #{endTime}
and effect_End_Time between #{startTime} and #{endTime}
</if>
<if test="objType !=null and objType!=''">
and obj_type = #{objType}
@@ -57,4 +57,22 @@
</if>
group by a.duty_Org_Id
</select>
<select id="statisticPlanReportYear" resultType="com.njcn.process.pojo.dto.ProcessPublicDTO">
select count(1) value,supv_Org_Id id from supv_plan
where
supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and plan_Supv_Date between #{startTime} and #{endTime}
</if>
<if test="objType !=null and objType!=''">
and obj_type = #{objType}
</if>
<if test="effectStatus !=null">
and effect_Status in
<foreach collection="effectStatus" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by supv_Org_Id
</select>
</mapper>