Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop

qushaowei

2023-12-29 52b2619447cf57c5e266cc1c73aeb8838446280d

Merge branch 'develop' of http://117.34.109.166:18448/r/mdc_430 into develop

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

@@ -894,6 +894,15 @@
         equipmentService.updateBatchById(equipmentList);
         return Result.OK("编辑成功");
     }

     @PostMapping("/updateKeyEquipment")
     public  Result<?>updateKeyEquipment(@RequestBody Equipment equipment){
          equipmentService.update(new UpdateWrapper<Equipment>().eq("specific_equipment","0").set("specific_equipment",null));
         List<Equipment> keyEquipmentUpdateList = equipment.getKeyEquipmentUpdateList();
         for(Equipment updateEquipment:keyEquipmentUpdateList){
              updateEquipment.setId(updateEquipment.getEquipmentId());
             equipmentService.updateById(updateEquipment);
         }
         return Result.OK("修改成功");
     }

}

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

@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
@@ -17,17 +18,25 @@
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.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -61,6 +70,8 @@
    private IdentityService sysIdentityService;
    @Autowired
    private IFaultInfoService faultInfoService;
    @Value("${jeecg.path.upload}")
    private String upLoadPath;


    /**
@@ -295,4 +306,31 @@
        }
        return Result.OK("验收成功");
    }
    /**
     * å¯¼å‡ºexcel
     *
     * @param request
     * @param equipmentReportRepair
     */
    @RequestMapping(value = "/exportXls")
    public ModelAndView exportXls(HttpServletRequest request, RepairReportExportVo equipmentReportRepair) {
        // Step.1 ç»„装查询条件
        String title = "故障报修导出";
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        // Step.2 èŽ·å–导出数据
        List<RepairReportExportVo> exportList = equipmentReportRepairService.exportList(equipmentReportRepair);

        // Step.3 AutoPoi å¯¼å‡ºExcel
        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
        //此处设置的filename无效 ,前端会重更新设置一下
        mv.addObject(NormalExcelConstants.FILE_NAME, title);
        mv.addObject(NormalExcelConstants.CLASS, RepairReportExportVo.class);
        //update-begin--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置--------------------
        ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title);
        exportParams.setImageBasePath(upLoadPath);
        //update-end--Author:liusq  Date:20210126 for：图片导出报错，ImageBasePath未设置----------------------
        mv.addObject(NormalExcelConstants.PARAMS,exportParams);
        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
        return mv;
    }
}

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

@@ -615,7 +615,7 @@
                List<EquipmentMaintenancePlanDetail> details = new ArrayList<>();
                 for(ABCAssessment abcAssessment:abcAssessments){
                    Equipment equipment = equipmentService.getById(abcAssessment.getEquipmentId());
                    String oldStandard = equipment.getEquipmentImportanceId();
                    String oldStandard = abcAssessment.getOldStandard();
                    String newStandard = abcAssessment.getFinalStandard();
                    LocalDate currentDate = LocalDate.now();


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

@@ -80,4 +80,6 @@
    @TableField(exist = false)
    @Dict(dicCode = "ABC-standard-result")
    private String equipmentImportanceId;
    @Dict(dicCode = "ABC-standard-result")
    private String oldStandard;
}

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

@@ -399,6 +399,10 @@
    @Dict(dicCode = "is_product")
    @TableField(exist = false)
    private String nums;
    @TableField(exist = false)
    private String equipmentId;
    @TableField(exist = false)
    private List<Equipment> keyEquipmentUpdateList;


}

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

@@ -5,7 +5,9 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.ChangeCause;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.vo.RepairReportExportVo;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -18,4 +20,21 @@
public interface EquipmentReportRepairMapper extends BaseMapper<EquipmentReportRepair> {

    IPage<Map<String, Object>> getReportRepairList(IPage<Map> pageData, @Param("params") Map<String,Object> params,@Param("equipNums") List<String> equipNums);

    List<RepairReportExportVo> exportList(
            @Param("num")String num,
            @Param("faultStartTime")Date faultStartTime,
            @Param("faultEndTime")Date faultEndTime,
            @Param("isStop")String isStop,
            @Param("status")String status,
            @Param("errUda2")String errUda2,
            @Param("errUda1")String errUda1,
            @Param("createBy")String createBy,
            @Param("equipmentNum")String equipmentNum,
            @Param("equipmentName")String equipmentName,
            @Param("equipmentModel")String equipmentModel,
            @Param("specification")String specification,
            @Param("useId")String useId,
            @Param("equipNums")List<String> equipNums
    );
}

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

@@ -26,6 +26,8 @@
            t1.create_time createTime,
            t1.update_by updateBy,
            t1.update_time updateTime,
            t1.accept_time acceptTime,
            t1.fault_hour faultHour,
            t2.num equipmentNum,
            t2.name equipmentName,
            t2.model equipmentModel,
@@ -104,4 +106,88 @@
        </if>
        ORDER BY t1.create_time desc
    </select>
    <select id="exportList" resultType="org.jeecg.modules.eam.vo.RepairReportExportVo">
        SELECT
        t1.id,
        t1.err_uda1 errUda1,
        t1.err_uda2 errUda2,
        t1.num num,
        t1.equipment_id equipmentId,
        t1.fault_reason faultReason,
        t1.fault_description faultDescription,
        t1.photo photo,
        t1.is_stop isStop,
        t1.approval approval,
        t1.fault_time faultTime,
        t1.source source,
        t1.source_id sourceId,
        t1.urgency urgency,
        t1.is_create_order isCreateOrder,
        t1.use_depart_id useDepartId,
        t1.remark remark,
        t1.status status,
        t1.create_by createBy,
        t1.create_time createTime,
        t1.update_by updateBy,
        t1.update_time updateTime,
        t1.accept_time acceptTime,
        t1.fault_hour faultHour,
        t2.num equipmentNum,
        t2.name equipmentName,
        t2.model equipmentModel,
        t2.team_id teamId,
        t2.specification specification,
        t2.use_id useId,
        t2.specific_equipment specificEquipment
        FROM
        mom_eam_equipment_report_repair t1
        left join mom_eam_equipment t2 on t1.equipment_id = t2.id
        WHERE t1.del_flag = 0
        <if test="num != null and num != ''">
            and t1.num like concat('%',#{num},'%')
        </if>
        <if test="faultStartTime != null and faultStartTime != ''">
            and t1.fault_time &gt;= #{faultStartTime}
        </if>
        <if test="faultEndTime != null and faultEndTime != ''">
            and t1.fault_time &lt;= #{faultEndTime}
        </if>
        <if test="isStop != null and isStop != ''">
            and t1.is_stop = #{isStop}
        </if>
        <if test="status != null and status != ''">
            and t1.status = #{status}
        </if>
        <if test="errUda2 != null and errUda2 != ''">
            and t1.err_uda2 like concat('%',#{errUda2},'%')
        </if>
        <if test="errUda1 != null and errUda1 != ''">
            and t1.err_uda1 = #{errUda1}
        </if>
        <if test="createBy!= null and createBy != ''">
            and t1.create_by like concat('%',#{createBy},'%')
        </if>
        <if test="equipmentNum != null and equipmentNum != ''">
            and t2.num like concat('%',#{equipmentNum},'%')
        </if>
        <if test="equipmentName != null and equipmentName != ''">
            and t2.name like concat('%',#{equipmentName},'%')
        </if>
        <if test="equipmentModel != null and equipmentModel != ''">
            and t2.model like concat('%',#{model},'%')
        </if>
        <if test="specification != null and specification != ''">
            and t2.specification like concat('%',#{specification},'%')
        </if>
        <if test="useId != null and useId != ''">
            and t2.use_id  = #{useId}
        </if>
        <if test="equipNums.size!=0">
            and t2.num in
            <foreach collection="equipNums" open="(" separator="," close=")" item="num">
                #{num}
            </foreach>
        </if>
        ORDER BY t1.create_time desc
    </select>
</mapper>

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

@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.ChangeCause;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.vo.RepairReportExportVo;

import java.util.List;
import java.util.Map;

/**
@@ -31,4 +33,6 @@
    void updateEquipmentReportRepairById(EquipmentReportRepair equipmentReportRepair);

    IPage<Map<String, Object>> getReportRepairList(Integer pageNo, Integer pageSize, Map<String, Object> params);

    List<RepairReportExportVo> exportList(RepairReportExportVo repairReportExportVo);
}

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

@@ -14,6 +14,7 @@
//import org.jeecg.modules.system.entity.SysUpload;
//import org.jeecg.modules.system.entity.SysUploadRela;
//import org.jeecg.modules.system.service.IUploadRelaService;
import org.jeecg.modules.eam.vo.RepairReportExportVo;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
@@ -109,4 +110,29 @@
        }
        return super.getBaseMapper().getReportRepairList(pageData, params,equipNums) ;
    }

    @Override
    public List<RepairReportExportVo> exportList(RepairReportExportVo repairReportExportVo) {
        List<String> equipNums = new ArrayList<>();
        if(StringUtils.isNotBlank(repairReportExportVo.getNums())){
            equipNums = Arrays.asList(repairReportExportVo.getNums().trim().split("\n"));
        }
        return baseMapper.exportList(
                repairReportExportVo.getNum(),
                repairReportExportVo.getFaultStartTime(),
                repairReportExportVo.getFaultEndTime(),
                repairReportExportVo.getIsStop(),
                repairReportExportVo.getStatus(),
                repairReportExportVo.getErrUda2(),
                repairReportExportVo.getErrUda1(),
                repairReportExportVo.getCreateBy(),
                repairReportExportVo.getEquipmentNum(),
                repairReportExportVo.getEquipmentName(),
                repairReportExportVo.getModel(),
                repairReportExportVo.getSpecification(),
                repairReportExportVo.getUseId(),
                equipNums
        );

    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package org.jeecg.modules.eam.vo;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;

/**
 * @author h1829
 */
@Data
public class RepairReportExportVo implements Serializable {
    @Excel(name = "关键设备标识", width = 15,orderNum = "0",dicCode = "specific_equipment")
    private String specificEquipment;
    @Excel(name = "状态", width = 15,orderNum = "1",dicCode = "equipment_report_repair_status")
    private String status;
    @Excel(name = "单据号", width = 15,orderNum = "2")
    private String num;
    /**设备编码*/
    @Excel(name = "统一编码", width = 15,orderNum = "3")
    private String equipmentNum;
    /**设备名称*/
    @Excel(name = "设备名称", width = 15,orderNum = "4")
    private String equipmentName;
    /**设备型号*/
    @Excel(name = "设备型号", width = 15,orderNum = "5")
    private String model;
    @Excel(name = "使用部门", width = 15,orderNum = "6",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
    private String useId;
    @Excel(name = "报修人", width = 15,orderNum = "7")
    private String errUda2;
    @Excel(name = "故障时间", width = 15,orderNum = "8",databaseFormat = "yyyy-MM-dd HH:mm:ss",exportFormat = "yyyy-MM-dd HH:mm:ss")
    private Date faultTime;
    @Excel(name = "故障描述", width = 15,orderNum = "9")
    private String faultDescription;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "验收时间", width = 15,orderNum = "11",databaseFormat = "yyyy-MM-dd HH:mm:ss",exportFormat = "yyyy-MM-dd HH:mm:ss" )
    private Date acceptTime;
    @Excel(name = "停机时长", width = 15,orderNum = "12")
    private String faultHour;
    @Excel(name = "是否停机维修", width = 15,orderNum = "13",dicCode = "is_stop")
    private String isStop;
    @Excel(name = "是否在加工零件", width = 15,orderNum = "14",dicCode = "is_product")
    private String errUda1;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date faultStartTime;
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date faultEndTime;
    private String specification;
    @Excel(name = "制单人", width = 15,orderNum = "15")
    private String createBy;
    private String nums;
}

 lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11(lnl)/lnl_12_25.sql

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
ALTER TABLE [dbo].[mom_eam_ABC_assessment] ADD [old_standard] nvarchar(16) NULL
    GO

    EXEC sp_addextendedproperty
    'MS_Description', N'老结果',
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_ABC_assessment',
    'COLUMN', N'old_standard'