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

1.技术监督历史计划

Browse Source 
2.技术监督预告警单和反馈数据
3.技术监督国网上送，计划历史记录、告警单和反馈数据
4.技术监督bug修改
This commit is contained in:
wr
2023-09-06 11:06:43 +08:00
parent 0a60de9677
commit 650de7c883
45 changed files with 3440 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvAlarmBackMapper.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.process.pojo.param.SupvAlarmBackParam;
import com.njcn.process.pojo.po.SupvAlarmBack;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 技术监督预告警单反馈数据表 Mapper 接口
* </p>
*
* @author wr
* @since 2023-09-01
*/
public interface SupvAlarmBackMapper extends BaseMapper<SupvAlarmBack> {
Page<SupvAlarmBack> pageAlarmBack(Page objectPage,@Param("ids") List<String> ids,@Param("param") SupvAlarmBackParam param);
}

16
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvAlarmMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.SupvAlarm;
/**
* <p>
* Mapper 接口
* </p>
*
* @author wr
* @since 2023-09-01
*/
public interface SupvAlarmMapper extends BaseMapper<SupvAlarm> {
}

16
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvPlanHisMapper.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.po.SupvPlanHis;
/**
* <p>
* 监督工作计划变更历史数据表 Mapper 接口
* </p>
*
* @author wr
* @since 2023-09-01
*/
public interface SupvPlanHisMapper extends BaseMapper<SupvPlanHis> {
}

6
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvProblemMapper.java
View File

@@ -2,9 +2,13 @@ package com.njcn.process.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.njcn.process.pojo.param.SupvProblemParam;
import com.njcn.process.pojo.po.SupvProblem;
import com.njcn.process.pojo.vo.SupvProblemVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* Mapper 接口
@@ -17,4 +21,6 @@ public interface SupvProblemMapper extends BaseMapper<SupvProblem> {
Boolean updateId(@Param("isUploadHead")Integer isUploadHead,
@Param("id") String id);
List<SupvProblemVO> listDerive(@Param("param") SupvProblemParam supvProblemParam);
}

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

@@ -23,8 +23,14 @@ 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> 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);
Boolean updateId(@Param("isUploadHead")Integer isUploadHead,
@Param("id") String id);
}

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

@@ -0,0 +1,22 @@
<?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="com.njcn.process.mapper.SupvAlarmBackMapper">
<select id="pageAlarmBack" resultType="com.njcn.process.pojo.po.SupvAlarmBack">
select
sab.*,
sa.bill_No,
sa.bill_Name
from
supv_alarm sa
INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
<where>
<if test="param.searchBeginTime != null and param.searchBeginTime != ''">
AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
</if>
<if test="param.searchEndTime != null and param.searchEndTime != ''">
AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{param.searchEndTime}, '%Y-%m-%d')
</if>
</where>
</select>
</mapper>

5
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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="com.njcn.process.mapper.SupvAlarmMapper">
</mapper>

5
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvPlanHisMapper.xml Normal file
View File

@@ -0,0 +1,5 @@
<?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="com.njcn.process.mapper.SupvPlanHisMapper">
</mapper>

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

@@ -5,4 +5,13 @@
<update id="updateId">
update supv_problem set is_upload_head= #{isUploadHead} where problem_Id=#{id}
</update>
<select id="listDerive" resultType="com.njcn.process.pojo.vo.SupvProblemVO">
select
work_plan_name,
sp.*
from
supv_problem spm
INNER JOIN supv_plan sp on sp.plan_Id=spm.plan_id
</select>
</mapper>

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

@@ -40,4 +40,21 @@
</if>
group by a.duty_Org_Id
</select>
<select id="statisticQueReportRectify" resultType="com.njcn.process.pojo.dto.ProcessPublicDTO">
select count(1) value,a.duty_Org_Id id from supv_problem a
inner join supv_plan b on a.plan_Id = b.plan_id
where
b.supv_Type = #{statisticType}
<if test="startTime!=null and endTime!=null">
and a.rectification_Time between #{startTime} and #{endTime}
</if>
<if test="rectificationStatus !=null and rectificationStatus!=''">
and a.rectification_Status = #{rectificationStatus}
</if>
<if test="objType !=null and objType!=''">
and b.obj_type = #{objType}
</if>
group by a.duty_Org_Id
</select>
</mapper>