问题项修改

qushaowei

2023-11-18 9d3675b12829de9ec46c210c5c8c460705206dbc

问题项修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyInspectionStandardController.java

@@ -127,6 +127,8 @@
    @PostMapping(value = "/add")
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> add(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandardService.save(dailyInspectionStandard);
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
        DailyInspectionStandardDetail isd = null;
@@ -153,6 +155,7 @@
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> edit(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        dailyInspectionStandard.setApprovalStatus("1");
        dailyInspectionStandardService.updateById(dailyInspectionStandard);
        //1.删除原点检项目
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetails = dailyInspectionStandardDetailService.lambdaQuery()
@@ -448,8 +451,17 @@
    @PostMapping(value = "/revise")
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> revise(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setWritePerson(sysUser.getRealname());
        dailyInspectionStandard.setId("");
        dailyInspectionStandard.setApprovalStatus("1");
        dailyInspectionStandard.setCreateTime(new Date());
        dailyInspectionStandard.setTakeEffectTime(null);
        dailyInspectionStandard.setLoseEfficacyTime(null);
        dailyInspectionStandard.setApprovalFeedback(null);
        dailyInspectionStandard.setAuditFeedback(null);
        dailyInspectionStandard.setAuditPerson(null);
        dailyInspectionStandard.setApprovalPerson(null);
        dailyInspectionStandardService.save(dailyInspectionStandard);
        List<DailyInspectionStandardDetail> dailyInspectionStandardDetaillist = dailyInspectionStandard.getDailyInspectionStandardDetaillist();
        DailyInspectionStandardDetail isd = null;
@@ -492,15 +504,18 @@
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> versionTakeEffect(@RequestBody DailyInspectionStandard dailyInspectionStandard) {

        List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
                .eq(DailyInspectionStandard::getVersionStatus, "2").list();
        for (DailyInspectionStandard standard : dailyInspectionStandards) {
            standard.setVersionStatus("3");
            standard.setLoseEfficacyTime(new Date());
            dailyInspectionStandardService.updateById(standard);
        }
        dailyInspectionStandard.setTakeEffectTime(new Date());
//        List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
//                .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
//                .eq(DailyInspectionStandard::getVersionStatus, "2").list();
//        for (DailyInspectionStandard standard : dailyInspectionStandards) {
//            standard.setVersionStatus("3");
//            standard.setLoseEfficacyTime(new Date());
//            dailyInspectionStandardService.updateById(standard);
//        }
//        dailyInspectionStandard.setTakeEffectTime(new Date());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        dailyInspectionStandard.setLoseEfficacyPerson(sysUser.getRealname());
        dailyInspectionStandard.setLoseEfficacyTime(new Date());
        boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
        if (b){
            return Result.OK("编辑成功!");
@@ -509,5 +524,36 @@
        }
    }


    /**
     * 签审流程
     * qsw 2023-11-16
     */
    @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> auditApproval(@RequestBody DailyInspectionStandard dailyInspectionStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String approvalStatus = dailyInspectionStandard.getApprovalStatus();
        if("5".equals(approvalStatus)){//审核通过后，版本生效
            List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                    .eq(DailyInspectionStandard::getNum, dailyInspectionStandard.getNum())
                    .eq(DailyInspectionStandard::getVersionStatus, "2").list();
            for (DailyInspectionStandard standard : dailyInspectionStandards) {
                standard.setVersionStatus("3");
                standard.setLoseEfficacyTime(new Date());
                standard.setLoseEfficacyPerson(sysUser.getRealname());
                dailyInspectionStandardService.updateById(standard);
            }
            dailyInspectionStandard.setApprovalPerson(sysUser.getRealname());
            dailyInspectionStandard.setVersionStatus("2");
            dailyInspectionStandard.setTakeEffectTime(new Date());
        }else if("3".equals(approvalStatus)){
            dailyInspectionStandard.setAuditPerson(sysUser.getRealname());
        }
        boolean b = dailyInspectionStandardService.updateById(dailyInspectionStandard);
        if (b){
            return Result.OK("审核成功!");
        }else{
            return Result.error("审核失败!");
        }
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderDetailController.java

@@ -15,8 +15,11 @@
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.base.entity.SysUploadRela;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.InspectionOrder;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -41,6 +44,8 @@
    @Autowired
    private IDailyMaintenanceOrderDetailService dailyMaintenanceOrderDetailService;

    @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

    @Autowired
    private ISysBaseAPI sysBaseApi;
@@ -183,7 +188,14 @@
    @PermissionData
    public Result<?> getDailyMaintenanceOrderDetailList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> dailyMaintenanceOrderDetailList = dailyMaintenanceOrderDetailService.getDailyMaintenanceOrderDetailList(pageNo, pageSize, params);
//        for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
        for (Map<String, Object> record : dailyMaintenanceOrderDetailList.getRecords()) {
            String dailyMaintenanceOrderId = (String)record.get("dailyMaintenanceOrderId");
            DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(dailyMaintenanceOrderId);
            if("4".equals(dailyMaintenanceOrder.getStatus())){
                record.put("disabled",false);
            }else{
                record.put("disabled",true);
            }
//            //获取是否有示例图片
////            List<SysUploadRela> sketchUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) record.get("maintenanceStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list();
//            List<SysUploadRela> sketchUploadRelas = sysBaseApi.listByBusIdAndBusType((String) record.get("maintenanceStandardDetailId"), null);
@@ -200,7 +212,7 @@
//                SysUpload upload = new SysUpload();
//                record.put("sketchPhoto", upload);
//            }
//        }
        }
        return Result.ok(dailyMaintenanceOrderDetailList);
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/InspectionOrderController.java

@@ -40,6 +40,7 @@
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.unit.DataUnit;
import org.springframework.web.bind.annotation.*;
@@ -76,6 +77,10 @@

     @Autowired
     private IEquipmentReportRepairService equipmentReportRepairService;

     @Autowired
     @Lazy
     private IdentityService sysIdentityService;

//     @Autowired
//     private IUploadRelaService uploadRelaService;
@@ -125,24 +130,6 @@
             record.put("inspectionCycles",inspectionCycles);

             List<Map<String, Object>> inspectionOrderDetails = inspectionOrderService.getInspectionOrderDetailByOrderId(id);
//             for (Map<String, Object> inspectionOrderDetail : inspectionOrderDetails) {
//                 //获取订单明细示意图
////                 List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String)inspectionOrderDetail.get("inspectionStandardDetailId")).eq(SysUploadRela::getDelFlag, 0).list();
//                 List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType ((String)inspectionOrderDetail.get("inspectionStandardDetailId"),null);
//                 if(sysUploadRelas.size()>0){
////                     List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)inspectionOrderDetail.get("inspectionStandardDetailId"), "daily_inspection_standard_photo");
//                     List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType ((String)inspectionOrderDetail.get("inspectionStandardDetailId"),"daily_inspection_standard_photo");
//                     SysUpload upload = new SysUpload();
//                     if (CollectionUtils.isNotEmpty(uploadRelas)) {
////                         upload = uploadService.getById(uploadRelas.get(0).getUploadId());
//                         upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
//                     }
//                     inspectionOrderDetail.put("upload",upload);
//                 }else{
//                     SysUpload upload = new SysUpload();
//                     inspectionOrderDetail.put("upload",upload);
//                 }
//             }
             record.put("inspectionOrderDetails",inspectionOrderDetails);


@@ -157,7 +144,7 @@
                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
             record.put("result","正常:"+passCount.size()+"，"+"异常:"+failCount.size());

             if("5".equals(status)){
             if("5".equals(status) ){
                 record.put("distable",true);
             }else{
                 record.put("distable",false);
@@ -390,6 +377,12 @@

     @RequestMapping(value = "/editStatus", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> editStatus(@RequestBody InspectionOrder inspectionOrder) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String status = inspectionOrder.getStatus();
         if("6".equals(status)){
             inspectionOrder.setInspectionOrderUda1(sysUser.getRealname());
             inspectionOrder.setRepairConfirmDate(new Date());
         }
         boolean b = inspectionOrderService.updateById(inspectionOrder);
         if (b) {
             return Result.OK("下发成功!");
@@ -430,16 +423,16 @@
         String status = order.getStatus();
         if ("5".equals(status)) {

             List<InspectionOrderDetail> inspectionOrderDetails = inspectionOrderDetailService.lambdaQuery()
                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
                     .eq(InspectionOrderDetail::getDelFlag, 0).list();

             ArrayList<String> strings = new ArrayList<>();
             for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetails) {
                 strings.add(inspectionOrderDetail.getId());
             }
//             List<InspectionOrderDetail> inspectionOrderDetails = inspectionOrderDetailService.lambdaQuery()
//                     .eq(InspectionOrderDetail::getInspectionOrderId, id)
//                     .eq(InspectionOrderDetail::getDelFlag, 0).list();
//
//             ArrayList<String> strings = new ArrayList<>();
//             for (InspectionOrderDetail inspectionOrderDetail : inspectionOrderDetails) {
//                 strings.add(inspectionOrderDetail.getId());
//             }
             List<EquipmentReportRepair> equipmentReportRepairs = equipmentReportRepairService.lambdaQuery()
                     .in(EquipmentReportRepair::getSourceId, strings)
                     .eq(EquipmentReportRepair::getSourceId, id)
                     .eq(EquipmentReportRepair::getDelFlag, 0).list();

             if(equipmentReportRepairs.size()>0){
@@ -466,25 +459,35 @@

     @RequestMapping(value = "/report", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> report(@RequestBody InspectionOrder inspectionOrder) {
//         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
//         String userId = sysUser.getId();
//         inspectionOrder.setInspectionUserId(userId);
         List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
         boolean flag = false;
         String num = "";
         for (InspectionOrderDetail orderDetail : inspectionOrderDetailList) {
             inspectionOrderDetailService.updateById(orderDetail);

             String treatmentMeasure = orderDetail.getTreatmentMeasure();//1：自行处置   2: 故障报修
             if ("2".equals(treatmentMeasure)) {
                 if(flag == true){
                     continue;
                 }
                 EquipmentReportRepair equipmentReportRepair = new EquipmentReportRepair();
                 equipmentReportRepair.setNum("RCNum001");
                 num = sysIdentityService.getNumByTypeAndLength("EquipmentReportRepair", 4);
                 equipmentReportRepair.setNum(num);
                 equipmentReportRepair.setStatus("1");
                 equipmentReportRepair.setSource("2");
                 equipmentReportRepair.setIsCreateOrder(0);
                 equipmentReportRepair.setEquipmentId(inspectionOrder.getEquipmentId());
                 equipmentReportRepair.setFaultDescription(orderDetail.getAbnormalDesc());
                 equipmentReportRepair.setFaultTime(new Date(System.currentTimeMillis()));
                 equipmentReportRepair.setIsStop("1");
                 equipmentReportRepair.setStatus("1");
                 equipmentReportRepair.setSource("2");
                 equipmentReportRepair.setSourceId(orderDetail.getId());
                 equipmentReportRepair.setSourceId(inspectionOrder.getId());
                 equipmentReportRepair.setErrUda1("no");
                 equipmentReportRepair.setErrUda2(sysUser.getRealname());
                 equipmentReportRepairService.save(equipmentReportRepair);
                 flag = true;
             }
         }
         inspectionOrder.setActualEndTime(new Date());
@@ -492,6 +495,26 @@
         if (!b) {
             return Result.error("报工失败!");
         } else {
             if(flag){
                 return Result.ok("点检结果异常，已自动生成故障报修单，单号为"+num+"!");
             }else{
                 return Result.ok("报工成功!");
             }
         }
     }

     @RequestMapping(value = "/normalReport", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> normalReport(@RequestBody InspectionOrder inspectionOrder) {
         List<InspectionOrderDetail> inspectionOrderDetailList = inspectionOrder.getInspectionOrderDetailList();
         for (InspectionOrderDetail orderDetail : inspectionOrderDetailList) {
             orderDetail.setInspectionProjectResult("1");
             inspectionOrderDetailService.updateById(orderDetail);
         }
         inspectionOrder.setActualEndTime(new Date());
         boolean b = inspectionOrderService.updateById(inspectionOrder);
         if (!b) {
             return Result.error("报工失败!");
         } else {
             return Result.ok("报工成功!");
         }
     }

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceStandardController.java

@@ -9,12 +9,14 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -135,6 +137,8 @@
    @Transactional(rollbackFor = {Exception.class})
    public Result<String> add(@RequestBody MaintenanceStandard maintenanceStandard) {
//        maintenanceStandard.setType("daily");
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        maintenanceStandard.setWritePerson(sysUser.getRealname());
        maintenanceStandardService.save(maintenanceStandard);
        List<MaintenanceStandardDetail> maintenanceStandardDetaillist = maintenanceStandard.getMaintenanceStandardDetaillist();
        for (MaintenanceStandardDetail maintenanceStandardDetail : maintenanceStandardDetaillist) {
@@ -156,6 +160,7 @@
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @Transactional(rollbackFor = {Exception.class})
    public Result<String> edit(@RequestBody MaintenanceStandard maintenanceStandard) {
        maintenanceStandard.setApprovalStatus("1");
        maintenanceStandardService.updateById(maintenanceStandard);
        //1.删除原保养项目
        List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandardDetailService.lambdaQuery().eq(MaintenanceStandardDetail::getMaintenanceStandardId, maintenanceStandard.getId()).eq(MaintenanceStandardDetail::getDelFlag, 0).eq(MaintenanceStandardDetail::getStatus, "1").list();
@@ -266,8 +271,18 @@
        //作业指导书
        List<MaintenanceStandardWorkInstruction> maintenanceStandardWorkInstructionList = maintenanceStandardWorkInstructionService.lambdaQuery().eq(MaintenanceStandardWorkInstruction::getMaintenanceStandardId,maintenanceStandard.getId())
                .eq(MaintenanceStandardWorkInstruction::getDelFlag, CommonConstant.DEL_FLAG_0).list();

        maintenanceStandard.setId("");
        maintenanceStandard.setCreateTime(new Date());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        maintenanceStandard.setWritePerson(sysUser.getRealname());
        maintenanceStandard.setApprovalStatus("1");
        maintenanceStandard.setTakeEffectTime(null);
        maintenanceStandard.setLoseEfficacyTime(null);
        maintenanceStandard.setApprovalFeedback(null);
        maintenanceStandard.setAuditFeedback(null);
        maintenanceStandard.setAuditPerson(null);
        maintenanceStandard.setApprovalPerson(null);
        maintenanceStandardService.save(maintenanceStandard);
        //明细信息
        List<MaintenanceStandardDetail> maintenanceStandardDetailList = maintenanceStandard.getMaintenanceStandardDetaillist();
@@ -339,20 +354,56 @@
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> versionTakeEffect(@RequestBody MaintenanceStandard maintenanceStandard) {

        List<MaintenanceStandard> maintenanceStandardList = maintenanceStandardService.lambdaQuery()
                .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
                .eq(MaintenanceStandard::getVersionStatus, "2").list();
        for (MaintenanceStandard standard : maintenanceStandardList) {
            standard.setVersionStatus("3");
            standard.setLoseEfficacyTime(new Date());
            maintenanceStandardService.updateById(standard);
        }
        maintenanceStandard.setTakeEffectTime(new Date());
//        List<MaintenanceStandard> maintenanceStandardList = maintenanceStandardService.lambdaQuery()
//                .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
//                .eq(MaintenanceStandard::getVersionStatus, "2").list();
//        for (MaintenanceStandard standard : maintenanceStandardList) {
//            standard.setVersionStatus("3");
//            standard.setLoseEfficacyTime(new Date());
//            maintenanceStandardService.updateById(standard);
//        }
//        maintenanceStandard.setTakeEffectTime(new Date());
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        maintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
        maintenanceStandard.setLoseEfficacyTime(new Date());
        boolean b = maintenanceStandardService.updateById(maintenanceStandard);
        if (b){
            return Result.OK("生效成功!");
            return Result.OK("失效成功!");
        }else{
            return Result.error("生效失败!");
            return Result.error("失效失败!");
        }
    }

    /**
     * 签审流程
     * qsw 2023-11-16
     */
    @RequestMapping(value = "/auditApproval", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> auditApproval(@RequestBody MaintenanceStandard maintenanceStandard) {
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String approvalStatus = maintenanceStandard.getApprovalStatus();
        if("5".equals(approvalStatus)){//审核通过后，版本生效
            List<MaintenanceStandard> dailyMaintenanceStandards = maintenanceStandardService.lambdaQuery()
                    .eq(MaintenanceStandard::getNum, maintenanceStandard.getNum())
                    .eq(MaintenanceStandard::getVersionStatus, "2").list();
            for (MaintenanceStandard dailyMaintenanceStandard : dailyMaintenanceStandards) {
                dailyMaintenanceStandard.setVersionStatus("3");
                dailyMaintenanceStandard.setLoseEfficacyTime(new Date());
                dailyMaintenanceStandard.setLoseEfficacyPerson(sysUser.getRealname());
                maintenanceStandardService.updateById(dailyMaintenanceStandard);
            }
            maintenanceStandard.setApprovalPerson(sysUser.getRealname());
            maintenanceStandard.setVersionStatus("2");
            maintenanceStandard.setTakeEffectTime(new Date());
        }else if("3".equals(approvalStatus)){
            maintenanceStandard.setAuditPerson(sysUser.getRealname());
        }
        boolean b = maintenanceStandardService.updateById(maintenanceStandard);
        if (b){
            return Result.OK("审核成功!");
        }else{
            return Result.error("审核失败!");
        }
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandard.java

@@ -87,6 +87,27 @@
    @ApiModelProperty(value = "状态 0 禁用 1 启用")
    private String status = CommonConstant.STATUS_1;

    @ApiModelProperty(value = "签审状态（1已编制，2驳回编制，3已审核，4驳回审核，5通过）")
    private String approvalStatus;

    @ApiModelProperty(value = "审核/驳回意见")
    private String auditFeedback;

    @ApiModelProperty(value = "审批/驳回意见")
    private String approvalFeedback;

    @ApiModelProperty(value = "编制人")
    private String writePerson;

    @ApiModelProperty(value = "审核人")
    private String auditPerson;

    @ApiModelProperty(value = "审批人")
    private String approvalPerson;

    @ApiModelProperty(value = "审批失效人")
    private String loseEfficacyPerson;

    /**
     * 生效时间
     */

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrder.java

@@ -169,6 +169,13 @@
    @ApiModelProperty(value = "备用字段6")
    private String inspectionOrderUda6;

    /**维修人确认时间*/
    @Excel(name = "维修人确认时间", width = 15, format = "yyyy-MM-dd")
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    @ApiModelProperty(value = "维修人确认时间")
    private Date repairConfirmDate;

    @TableField(exist = false)
    private List<InspectionOrderDetail> inspectionOrderDetailList;


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceStandard.java

@@ -101,6 +101,27 @@
    @ApiModelProperty(value = "标准分类（daily日常点检标准，specialty专业点检标准）")
    private String type;

    @ApiModelProperty(value = "签审状态（1已编制，2驳回编制，3已审核，4驳回审核，5通过）")
    private String approvalStatus;

    @ApiModelProperty(value = "审核/驳回意见")
    private String auditFeedback;

    @ApiModelProperty(value = "审批/驳回意见")
    private String approvalFeedback;

    @ApiModelProperty(value = "编制人")
    private String writePerson;

    @ApiModelProperty(value = "审核人")
    private String auditPerson;

    @ApiModelProperty(value = "审批人")
    private String approvalPerson;

    @ApiModelProperty(value = "审批失效人")
    private String loseEfficacyPerson;

    /**
     * 生效时间
     */

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/DailyInspectionStandardDetailMapper.java

@@ -23,6 +23,6 @@
    IPage<Map<String, Object>> getInspectionStandardDetailById(IPage<Map> pageData, @Param("params") Map<String,Object> params);

//    @Select("select t1.id as value,concat(t1.code, '/', t1.cycle,t1.cycle_unit) as text,concat(t1.code, '/', t1.cycle,t1.cycle_unit) as title from mom_eam_inspection_cycle t1 left join mom_sys_data_version t2 on t1.id = t2.business_id where t1.del_flag = '0' and t2.version_status = '2'")
    @Select("select t1.id as value,concat(t1.code, '/', t1.name) as text,concat(t1.code, '/', t1.name) as title from mom_eam_inspection_cycle t1 where t1.del_flag = '0' and version_status = '2'")
    @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_inspection_cycle t1 where t1.del_flag = '0' and version_status = '2'")
    List<InspectionCycleVo> getInspectionCycle();
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/MaintenanceStandardDetailMapper.java

@@ -31,7 +31,7 @@
    @Select("select t1.id as value,concat(t1.code, '/', t1.name) as text,concat(t1.code, '/', t1.name) as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2'")
    List<MaintenanceCycleVo> getMaintenanceCycle();

    @Select("select t1.id as value,concat(t1.code, '/', t1.name) as text,concat(t1.code, '/', t1.name) as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.equipment_importance_id like concat('%',#{importanceFlag},'%')")
    @Select("select t1.id as value,t1.name as text,t1.name as title from mom_eam_maintenance_cycle t1 where t1.del_flag = '0' and t1.version_status = '2' and t1.equipment_importance_id like concat('%',#{importanceFlag},'%')")
    List<MaintenanceCycleVo> getPeriodicMaintenanceCycle(String importanceFlag);

    @Select(" SELECT item_value as value, item_text as text,item_text as title FROM v_sys_dict WHERE dict_code = 'maintenance_method'")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardDetailMapper.xml

@@ -42,7 +42,7 @@
            t4.item_text as inspectionMethodName,
            t2.inspection_tool AS inspectionTool,
            t3.id AS inspectionCycleId,
            concat(t3.code, '/', t3.name) as inspectionCycleName
            t3.name as inspectionCycleName
        FROM
            mom_eam_daily_inspection_standard_detail t1
        LEFT JOIN mom_eam_inspection_project t2 ON t1.inspection_project_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyInspectionStandardMapper.xml

@@ -24,7 +24,15 @@
            t4.id as teamId,
            t4.name as teamName,
            t1.take_effect_time as takeEffectTime,
            t1.lose_efficacy_time as loseEfficacyTime
            t1.lose_efficacy_time as loseEfficacyTime,
            t1.approval_status as approvalStatus,
            t7.item_text as approvalStatusName,
            t1.audit_feedback as auditFeedback,
            t1.approval_feedback as approvalFeedback,
            t1.write_person as writePerson,
            t1.audit_person as auditPerson,
            t1.approval_person as approvalPerson,
            t1.lose_efficacy_person as loseEfficacyPerson
        FROM
            mom_eam_daily_inspection_standard t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
@@ -32,6 +40,7 @@
        left join mom_base_team t4 on t2.team_id = t4.id
        left join (select * from v_sys_dict where dict_code = 'version_status') t5 on t1.version_status = t5.item_value
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        left join (select * from v_sys_dict where dict_code = 'approval_status') t7 on t1.approval_status = t7.item_value
        where t1.del_flag = 0
        <if test="num != 'null' and num != ''">
            and t1.num like concat('%',#{num},'%')

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml

@@ -14,8 +14,9 @@
            t4.item_text as maintenanceMethodName,
            t3.maintenance_tool as maintenanceTool,
            t3.maintenance_require as maintenanceRequire,
            concat(t6.code, '/', t6.name) as maintenanceCycleName,
            t6.name as maintenanceCycleName,
            t5.name as maintenanceSpecialtyName,
            t1.daily_maintenance_order_id as dailyMaintenanceOrderId,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml

@@ -50,7 +50,7 @@
            t4.maintenance_type as maintenanceType,
            t10.item_text as maintenanceTypeName,
            t4.cycle as maintenanceCycle,
            concat(t4.code, '/', t4.name) as maintenanceCycleName,
            t4.name as maintenanceCycleName,
            t3.id as equipmentId,
            t3.num as equipmentNum,
            t3.name as equipmentName,
@@ -116,7 +116,7 @@
        t4.maintenance_type as maintenanceType,
        t10.item_text as maintenanceTypeName,
        t4.cycle as maintenanceCycle,
        concat(t4.code, '/', t4.name) as maintenanceCycleName,
        t4.name as maintenanceCycleName,
        t3.id as equipmentId,
        t3.num as equipmentNum,
        t3.name as equipmentName,

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -20,7 +20,7 @@
            t2.team_id as teamId,
            t2.use_id as useId,
            t3.id as inspectionCycleId,
            concat(t3.code, '/', t3.name) as inspectionCycleName,
            t3.name as inspectionCycleName,
            t3.effective_time as effectiveTime,
            t3.unit as unit,
            t4.id as inspectionStandardId,
@@ -34,7 +34,9 @@
            t1.inspection_user_id as inspectionUserId,
            t9.realname as inspectionUserName,
            t1.actual_end_time as actualEndTime,
            t1.actual_start_time as actualStartTime
            t1.actual_start_time as actualStartTime,
            t1.inspection_order_uda1 AS repairConfirmPerson,
            t1.repair_confirm_date as repairConfirmDate
        FROM
            mom_eam_inspection_order t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml

@@ -80,7 +80,7 @@
            t4.item_text AS maintenanceMethodName,
            t2.maintenance_tool AS maintenanceTool,
            t2.working_hour_quota AS workingHourQuota,
            concat(t3.code, '/', t3.name) as maintenanceCycleName,
            t3.name as maintenanceCycleName,
            t5.NAME AS maintenanceSpecialtyName
        FROM
            mom_eam_maintenance_standard_detail t1

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardMapper.xml

@@ -70,7 +70,15 @@
            t7.depart_name as useDepartName,
            t1.remark,
            t1.take_effect_time as takeEffectTime,
            t1.lose_efficacy_time as loseEfficacyTime
            t1.lose_efficacy_time as loseEfficacyTime,
            t1.approval_status as approvalStatus,
            t8.item_text as approvalStatusName,
            t1.audit_feedback as auditFeedback,
            t1.approval_feedback as approvalFeedback,
            t1.write_person as writePerson,
            t1.audit_person as auditPerson,
            t1.approval_person as approvalPerson,
            t1.lose_efficacy_person as loseEfficacyPerson
        FROM
            mom_eam_maintenance_standard t1
        LEFT JOIN mom_eam_equipment t2 ON t1.equipment_id = t2.id
@@ -79,6 +87,7 @@
        left join (select * from v_sys_dict where dict_code = 'version_status') t5 on t1.version_status = t5.item_value
        left join (select * from v_sys_dict where dict_code = 'assign_mode') t6 on t1.assign_mode = t6.item_value
        left join sys_depart t7 on t2.use_id = t7.id
        left join (select * from v_sys_dict where dict_code = 'approval_status') t8 on t1.approval_status = t8.item_value
        where t1.del_flag = 0 and t1.type = #{params.type}
        <if test="params.num != null and params.num != ''">
            and t1.num like concat('%',#{params.num},'%')