zhangherong
6 天以前 457fa2cb4cc7c78f1caace6ef34207ff785144f9
art: 技术状态鉴定申请-工单生成
已修改4个文件
66 ■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java
@@ -66,6 +66,11 @@
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date applyDate;
    /**技术状态鉴定日期*/
    @ApiModelProperty(value = "技术状态鉴定日期")
    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private Date evaluationDate;
    /**申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成*/
    @ApiModelProperty(value = "申请单状态;待提交、待单位室级领导审核、生产设备管理主管审核、待保障部领导审核、已作废、已完成")
    private String applicationStatus;
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java
@@ -84,4 +84,11 @@
     * @return
     */
    List<EamTechnicalStatusEvaluationStandard> queryListByKeyword(String keyword, String equipmentId, Integer pageSize);
    /**
     * 查询设备技术鉴定标准
     * @param equipmentId
     * @return
     */
    EamTechnicalStatusEvaluationStandard queryEnableStandard(String equipmentId);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java
@@ -19,16 +19,12 @@
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.HfTemplateCategoryEnum;
import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationApplicationStatusEnum;
import org.jeecg.modules.eam.entity.EamBaseHFCode;
import org.jeecg.modules.eam.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication;
import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationQuery;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationApplicationRequest;
import org.jeecg.modules.eam.service.IEamBaseHFCodeService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService;
import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderRequest;
import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
@@ -77,6 +73,12 @@
    private IFlowTaskService flowTaskService;
    @Autowired
    private ISysUserService sysUserService;
    @Autowired
    private IEamTechnicalStatusEvaluationStandardService evaluationStandardService;
    @Autowired
    private IEamTechnicalStatusEvaluationStandardDetailService evaluationStandardDetailService;
    @Autowired
    private IEamTechnicalStatusEvaluationOrderService evaluationOrderService;
    @Override
    public IPage<EamTechnicalStatusEvaluationApplication> queryPageList(Page<EamTechnicalStatusEvaluationApplication> page, EamTechnicalStatusEvaluationApplicationQuery query) {
@@ -151,6 +153,14 @@
        if (equipment == null) {
            throw new JeecgBootException("设备信息不存在,操作失败!");
        }
        EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getEquipmentId());
        if(standard == null) {
            throw new JeecgBootException("设备未配置技术状态鉴定规范,操作失败!");
        }
        List<EamTechnicalStatusEvaluationStandardDetail> standardDetailList = evaluationStandardDetailService.queryList(standard.getId());
        if(CollectionUtil.isEmpty(standardDetailList)) {
            throw new JeecgBootException("设备未配置技术状态鉴定规范,操作失败!");
        }
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if (sysUser == null) {
@@ -185,6 +195,7 @@
            throw new JeecgBootException("只有待提交状态才可编辑!");
        }
        entity.setRemark(request.getRemark());
        entity.setEvaluationDate(request.getEvaluationDate());
        this.getBaseMapper().updateById(entity);
        return true;
    }
@@ -362,6 +373,20 @@
                if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
                    //通过
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.COMPLETED.name());
                    //生成工单
                    EamTechnicalStatusEvaluationStandard standard = evaluationStandardService.queryEnableStandard(request.getEquipmentId());
                    if(standard == null) {
                        throw new JeecgBootException("设备未配置技术状态鉴定规范,操作失败!");
                    }
                    EamTechnicalStatusEvaluationOrderRequest orderRequest = new EamTechnicalStatusEvaluationOrderRequest();
                    orderRequest.setEquipmentId(equipment.getId());
                    orderRequest.setEvaluationDate(entity.getEvaluationDate());
                    orderRequest.setStandardId(standard.getId());
                    orderRequest.setRemark(entity.getRemark());
                    boolean b = evaluationOrderService.addTechnicalStatusEvaluationOrder(orderRequest);
                    if(!b) {
                        throw new JeecgBootException("生成技术状态鉴定工单失败!");
                    }
                }else {
                    //驳回
                    entity.setApplicationStatus(TechnicalStatusEvaluationApplicationStatusEnum.REJECTED.name());
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -558,6 +558,21 @@
        return pageData.getRecords();
    }
    @Override
    public EamTechnicalStatusEvaluationStandard queryEnableStandard(String equipmentId) {
        LambdaQueryWrapper<EamTechnicalStatusEvaluationStandard> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getEquipmentId, equipmentId);
        queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getDelFlag, CommonConstant.DEL_FLAG_0);
        //启用状态
        queryWrapper.eq(EamTechnicalStatusEvaluationStandard::getStandardStatus, TechnicalStatusEvaluationStandardStatusEnum.ENABLE.name());
        queryWrapper.orderByDesc(EamTechnicalStatusEvaluationStandard::getStandardVersion);
        List<EamTechnicalStatusEvaluationStandard> list = this.getBaseMapper().selectList(queryWrapper);
        if (CollectionUtil.isEmpty(list)) {
            return null;
        }
        return list.get(0);
    }
    /**
     * 检查导入文件分类是否匹配
     * @param title 标题段落字符串