Merge remote-tracking branch 'origin/master'

Lius

2023-10-30 ff9dc3f8220dfeb9acddd2f86c28718001e70314

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

@@ -12,6 +12,7 @@

import org.jeecg.common.util.DateUtils;
import org.jeecg.modules.eam.entity.OperationCertificateApplyDetail;
import org.jeecg.modules.eam.service.IdentityService;
import org.jeecg.modules.system.service.SysIdentityService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -60,7 +61,7 @@
   private IOperationCertificateDetailService operationCertificateDetailService;

    @Autowired
    private SysIdentityService sysIdentityService;
    private IdentityService identityService;
   
   /**
    * 分页列表查询
@@ -104,14 +105,14 @@
    @PostMapping(value = "/addOperationCertificate")
    public Result<String> addOperationCertificate(@RequestBody List<OperationCertificateApplyDetail> operationCertificateList) {
      for(OperationCertificateApplyDetail operationCertificateApplyDetail : operationCertificateList){
         if("Y".equals(operationCertificateApplyDetail.getExaminationConclusion())){
         if("pass".equals(operationCertificateApplyDetail.getExaminationConclusion())){
            Date currentDate = new Date();
            Calendar c = Calendar.getInstance();
            c.setTime(currentDate);
            c.add(Calendar.YEAR, 1);
            currentDate = c.getTime();
            OperationCertificate operationCertificate = new OperationCertificate();
            operationCertificate.setNum(sysIdentityService.getNumByTypeAndLength("OperationCertificate", 4));
            operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate", 4));
            operationCertificate.setUserId(operationCertificateApplyDetail.getUserId());
            operationCertificate.setEquipmentIds(operationCertificateApplyDetail.getEquipmentIds());
            operationCertificate.setCurrentCycleScore(12);
@@ -289,5 +290,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);
    }
}