qushaowei
2023-10-24 84020add189b73e798113c4d3feaa978c75c71d7
验收单修改
已修改3个文件
28 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java
@@ -97,7 +97,7 @@
        String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId();
        List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances();
        for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) {
            threeAcceptance.setMaintenanceOrderId(maintenanceOrderId);
            threeAcceptance.setId("");
            maintenanceThreeAcceptanceService.saveOrUpdate(threeAcceptance);
        }
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(maintenanceOrderId);
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java
@@ -36,7 +36,7 @@
    /**3保工单id*/
    @Excel(name = "3保工单id", width = 15)
    @ApiModelProperty(value = "3保工单id")
    private java.lang.String maintenanceOrderId;
    private java.lang.String maintenanceOrderDetailId;
    /**保养部位*/
    @Excel(name = "保养部位", width = 15)
    @ApiModelProperty(value = "保养部位")
@@ -65,4 +65,7 @@
    @TableField(exist = false)
    private List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances;
    @TableField(exist = false)
    private String maintenanceOrderId;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
@@ -4,14 +4,19 @@
    <select id="getMaintenanceThreeAcceptanceList"  parameterType="Map" resultType="Map">
        SELECT
            t1.id AS id,
            t1.position,
            t1.content,
            t1.standard,
            t1.first_inspect as firstInspect,
            t1.second_inspect as secondInspect
            t1.id,
            t1.id as maintenanceOrderDetailId,
            t1.daily_maintenance_order_id AS maintenanceOrderId,
            t2.location AS position,
            t3.name AS content,
            t3.standard,
            t4.first_inspect AS firstInspect,
            t4.second_inspect AS secondInspect
        FROM
            mom_eam_maintenance_three_acceptance t1
        WHERE t1.del_flag = '0' AND t1.maintenance_order_id = #{maintenanceOrderId}
            mom_eam_daily_maintenance_order_detail t1
            LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
            LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id
            LEFT JOIN mom_eam_maintenance_three_acceptance t4 ON t1.id = t4.maintenance_order_detail_id
        WHERE t1.del_flag = '0' AND t1.daily_maintenance_order_id = #{maintenanceOrderId}
    </select>
</mapper>