保养、维修实际用料 bug修改，

qushaowei

2023-09-13 5445185e5e0dab34d626bed169b45d8e0d532696

保养、维修实际用料  bug修改，

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

@@ -9,6 +9,7 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -176,6 +177,7 @@
     * 2023-4-25 qsw
     */
    @GetMapping(value = "/getDailyMaintenanceOrderDetailList")
    @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()) {

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

@@ -133,18 +133,20 @@
                sparePartOutboundDetailService.updateById(sparePartOutboundDetail);
            }
        }

        return Result.OK("添加成功！");
    }
     @PostMapping(value = "/addInit")

     @PostMapping(value = "/addInit")
     public Result<String> addInit(@RequestBody List<MaintenanceOrderActualMaterial> initList){
        boolean b = maintenanceOrderActualMaterialService.saveOrUpdateBatch(initList);
        if(b){
            return Result.OK("保存成功");
        }
         return Result.error("保存失败");
         for (MaintenanceOrderActualMaterial maintenanceOrderActualMaterial : initList) {
             boolean b = maintenanceOrderActualMaterialService.save(maintenanceOrderActualMaterial);
             if(!b){
                 return Result.error("保存失败");
             }
         }
         return Result.OK("保存成功");
     }

     @PostMapping(value = "/lock")
     @Transactional(rollbackFor = { Exception.class })
     public Result<String> lock(@RequestBody  MaintenanceOrderActualMaterial maintenanceOrderActualMaterial){

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

@@ -81,27 +81,27 @@
    @GetMapping("getMaintenanceStandardList")
    public Result<?> getMaintenanceStandardList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
        IPage<Map<String, Object>> maintenanceStandardDetails = maintenanceStandardDetailService.getMaintenanceStandardDetailById(pageNo, pageSize, params);
        for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
            //获取是否有无异常照片数据
//            List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
            List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
            if (sysUploadRelas.size() > 0) {
                detail.put("isNoPhotoFlag", true);
                //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
                List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
                ;
                SysUpload upload = new SysUpload();
                if (CollectionUtils.isNotEmpty(uploadRelas)) {
                    //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
                    upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
                }
                detail.put("upload", upload);
            } else {
                detail.put("isNoPhotoFlag", false);
                SysUpload upload = new SysUpload();
                detail.put("upload", upload);
            }
        }
//        for (Map<String, Object> detail : maintenanceStandardDetails.getRecords()) {
//            //获取是否有无异常照片数据
////            List<SysUploadRela> sysUploadRelas = uploadRelaService.lambdaQuery().eq(SysUploadRela::getBusId, (String) detail.get("id")).eq(SysUploadRela::getDelFlag, 0).list();
//            List<SysUploadRela> sysUploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), null);
//            if (sysUploadRelas.size() > 0) {
//                detail.put("isNoPhotoFlag", true);
//                //List<SysUploadRela> uploadRelas = uploadRelaService.listByBusIdAndBusType((String)detail.get("id"), "daily_maintenance_standard_photo");
//                List<SysUploadRela> uploadRelas = sysBaseApi.listByBusIdAndBusType((String) detail.get("id"), "daily_maintenance_standard_photo");
//                ;
//                SysUpload upload = new SysUpload();
//                if (CollectionUtils.isNotEmpty(uploadRelas)) {
//                    //upload = uploadService.getById(uploadRelas.get(0).getUploadId());
//                    upload = sysBaseApi.getUploadById(uploadRelas.get(0).getUploadId());
//                }
//                detail.put("upload", upload);
//            } else {
//                detail.put("isNoPhotoFlag", false);
//                SysUpload upload = new SysUpload();
//                detail.put("upload", upload);
//            }
//        }
        return Result.ok(maintenanceStandardDetails);
    }


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

@@ -61,6 +61,7 @@
    /**删除状态(0-正常,1-已删除)*/
    @Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
    @TableLogic
    private Integer delFlag = CommonConstant.DEL_FLAG_0;
    /**备注*/
    @Excel(name = "备注", width = 15)
@@ -97,6 +98,7 @@
    @Excel(name = "出库单明细id", width = 15)
    @ApiModelProperty(value = "出库单明细id")
    private String outboundOrderDetailId;

    private String isLock;

}

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

@@ -55,6 +55,9 @@
    @ApiModelProperty(value = "示意图")
    private String photo;

    @ApiModelProperty(value = "保养维修角色（maintenance维修人员，operator操作人员）")
    private String maintenanceRole;

    /**租户id*/
    @Excel(name = "租户id", width = 15)
    @ApiModelProperty(value = "租户id")

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

@@ -16,6 +16,6 @@
 */
public interface DailyMaintenanceOrderDetailMapper extends BaseMapper<DailyMaintenanceOrderDetail> {

    IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params);
    IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(IPage<Map> pageData, @Param("params") Map<String,Object> params,String sql);

}

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

@@ -27,6 +27,9 @@
        <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
            and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
        </if>
        <if test="sql != '' and sql != null">
            ${sql}
        </if>
        ORDER BY t1.create_time desc
    </select>
</mapper>

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

@@ -17,14 +17,15 @@
            t2.working_hour_quota AS workingHourQuota,
            t3.id as maintenanceCycleId,
            t3.NAME AS maintenanceCycleName,
            t5.NAME AS maintenanceSpecialtyName

            t5.NAME AS maintenanceSpecialtyName,
            t7.item_value as maintenanceRole
        FROM
            mom_eam_maintenance_standard_detail t1
        LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id
        LEFT JOIN mom_eam_maintenance_cycle t3 ON t1.maintenance_cycle_id = t3.id
        LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
        WHERE t1.del_flag = 0
        <if test="maintenanceStandardId != null and maintenanceStandardId != ''">
            and t1.maintenance_standard_id = #{maintenanceStandardId}
@@ -72,6 +73,7 @@
            t1.photo photo,
            t1.maintenance_require AS maintenanceRequire,
            t6.item_text AS maintenanceModeName,
            t7.item_text as maintenanceRoleName,
            t2.id AS maintenanceProjectId,
            t2.name,
            t2.standard,
@@ -87,6 +89,7 @@
        LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t6 ON t6.item_value = t1.maintenance_mode
        LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
        WHERE t1.del_flag = 0
        <if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
            and t1.maintenance_standard_id = #{params.maintenanceStandardId}

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

@@ -104,7 +104,7 @@
        LEFT JOIN  mom_eam_spare_part   t3  on  t3.id =t1.spare_part_id
        LEFT JOIN  mom_base_constructor   t4  on  t4.id =t3.constructor_id
        LEFT JOIN  mom_base_unit   t5  on  t5.id =t1.main_unit_id
        where t1.del_flag = 0 and t1.outbound_main_quantity != 0 and  (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
        where t1.del_flag = 0 and t3.del_flag = 0 and t1.outbound_main_quantity != 0 and  (ISNULL(t1.outbound_main_quantity,0)-ISNULL(t1.use_quantity,0)) != 0
        <if test="status != null and status != ''">
            and t1.status = #{status}
        </if>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/DailyMaintenanceOrderDetailServiceImpl.java

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrderDetail;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.DailyMaintenanceOrderDetailMapper;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderDetailService;
import org.springframework.stereotype.Service;
@@ -23,6 +25,7 @@
    @Override
    public IPage<Map<String, Object>> getDailyMaintenanceOrderDetailList(Integer pageNo, Integer pageSize, Map<String, Object> params) {
        IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
        return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params);
        String sql = QueryGenerator.installAuthJdbc(MaintenanceStandardDetail.class);
        return super.getBaseMapper().getDailyMaintenanceOrderDetailList(pageData,params,sql);
    }
}