fuliqi
2025-01-08 224c12c7ae9a3b9d0380962ff92dac18812434a6
报备回显问题
4个文件已修改
8 ■■■■ 已修改文件
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CalculateReportDetailVO.java
@@ -24,6 +24,7 @@
    private Integer id;
    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date createTime;
@@ -33,6 +34,7 @@
    private Integer whichYear;
    /** 运维单位 */
    private String unitName;
    private Integer unitId;
    /** 合同名称 */
    private String contractName;
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -74,6 +74,8 @@
            throw new RuntimeException("非运维单位暂时无法报备");
        }
        form.setUnitId(unitId);
        Long userId = SecurityUtils.getLoginUser().getUserId();
        form.setPeopleId(Integer.parseInt(userId+""));
        if ("事前报备".equals(form.getReportType())) {
            // 如果是事前报备需要检验是否已经生成下发工单
            YwPointVO point = ywpointMapper.countNotFinishedWorkOrderByGb(form.getPointId());
ycl-server/src/main/resources/mapper/zgyw/CalculateReportMapper.xml
@@ -79,6 +79,7 @@
        <result column="id" property="id"/>
        <result column="create_time" property="createTime"/>
        <result column="unit_name" property="unitName"/>
        <result column="unit_id" property="unitId"/>
        <result column="name" property="contractName"/>
        <result column="contract_id" property="contractId"/>
        <result column="which_year" property="whichYear"/>
@@ -127,6 +128,7 @@
    <select id="getById" resultMap="DetailResultMap">
        SELECT tyu.unit_name,
        tyu.id as unit_id,
        tc.name,
        tcr.id,
        tcr.contract_id,
ycl-server/src/main/resources/mapper/zgyw/ReportMapper.xml
@@ -31,7 +31,7 @@
        FROM
        t_report r
        LEFT JOIN t_yw_unit u ON r.unit_id = u.id and u.deleted = 0
        LEFT JOIN t_yw_people p ON r.people_id = p.id and p.deleted = 0
        LEFT JOIN t_yw_people p ON r.people_id = p.user_id and p.deleted = 0
        LEFT JOIN t_yw_point pt ON r.serial_number = pt.serial_number and pt.deleted = 0
        INNER JOIN t_report_error_type ret ON ret.report_id = r.id and ret.deleted = 0 <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">
        AND ret.error_type in <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>