操作证管理 明细更新

zenglf

2023-10-18 c2559ec44a1d51a30622125af2064f07c1d3d8b7

操作证管理 明细更新

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

@@ -289,5 +289,20 @@
      }
      return Result.OK("文件导入失败！");
    }

     /**
      * 通过主表ID查询
      * @return
      */
     //@AutoLog(value = "操作证管理明细-通过主表ID查询")
     @ApiOperation(value="操作证管理明细-通过主表ID查询", notes="操作证管理明细-通过主表ID查询")
     @GetMapping(value = "/listOperationCertificateDetailByMainId")
     public Result<IPage<OperationCertificateDetail>> listOperationCertificateDetailByMainId(OperationCertificateDetail operationCertificateDetail,
                                                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                                             HttpServletRequest req) {
         QueryWrapper<OperationCertificateDetail> queryWrapper = QueryGenerator.initQueryWrapper(operationCertificateDetail, req.getParameterMap());
         Page<OperationCertificateDetail> page = new Page<OperationCertificateDetail>(pageNo, pageSize);
         IPage<OperationCertificateDetail> pageList = operationCertificateDetailService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
}

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

@@ -44,6 +44,7 @@
    /**设备id*/
    @Excel(name = "设备id", width = 15)
    @ApiModelProperty(value = "设备id")
    @Dict(dictTable = "mom_eam_equipment", dicText = "num", dicCode = "id")
    private String equipmentId;
    /**扣分项*/
    @Excel(name = "扣分项", width = 15)

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

@@ -48,7 +48,7 @@
        String equipmentIds = operationCertificate.getEquipmentIds();
        Integer currentCycleScore = operationCertificate.getCurrentCycleScore();
        for (OperationCertificateDetail entity : operationCertificateDetailList) {
            if ("addEquipment".equals(entity.getType())) {
            if ("addEquipment".equals(entity.getType()) && !equipmentIds.contains(entity.getEquipmentId())) {
                equipmentIds = equipmentIds + "," + entity.getEquipmentId();
            } else if ("deduction".equals(entity.getType())) {
                String deductionItemId = entity.getDeductionItem();
@@ -61,8 +61,8 @@

        }
        operationCertificate.setEquipmentIds(equipmentIds);
        if(currentCycleScore<=0){
            currentCycleScore=0;
        if (currentCycleScore <= 0) {
            currentCycleScore = 0;
            // 当分数为0时,设置操作证的状态为禁用
            operationCertificate.setStatus(CommonConstant.STATUS_0);
        }
@@ -91,7 +91,7 @@
        String equipmentIds = operationCertificate.getEquipmentIds();
        Integer currentCycleScore = operationCertificate.getCurrentCycleScore();
        for (OperationCertificateDetail entity : operationCertificateDetailList) {
            if ("addEquipment".equals(entity.getType())) {
            if ("addEquipment".equals(entity.getType()) && !equipmentIds.contains(entity.getEquipmentId())) {
                equipmentIds = equipmentIds + "," + entity.getEquipmentId();
            } else if ("deduction".equals(entity.getType())) {
                String deductionItemId = entity.getDeductionItem();
@@ -104,8 +104,8 @@

        }
        operationCertificate.setEquipmentIds(equipmentIds);
        if(currentCycleScore<=0){
            currentCycleScore=0;
        if (currentCycleScore <= 0) {
            currentCycleScore = 0;
            // 当分数为0时,设置操作证的状态为禁用
            operationCertificate.setStatus(CommonConstant.STATUS_0);
        }