diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java index f2ad2b701..d531304de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/controller/ExamQuestionBankController.java @@ -312,25 +312,12 @@ public class ExamQuestionBankController { /** * 导出excel * - * @param request - * @param response */ @ApiOperation(value = "导出excel题目管理信息", notes = "导出excel题目管理信息", httpMethod = "POST") @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { + public ModelAndView exportXls(@RequestBody Map map) { // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - ExamQuestionBank examQuestionBank = JSON.parseObject(deString, ExamQuestionBank.class); - queryWrapper = QueryGenerator.initQueryWrapper(examQuestionBank, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } -// UserInfo user = SecurityUtils.getUser(); + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(ExamQuestionBank.class, map); //Step.2 AutoPoi 导出Excel ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List pageList = examQuestionBankService.list(queryWrapper); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 0090d83ca..3eb4ee8d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -641,12 +641,17 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl 0) { + return new BigDecimal(20); + } return subtract1.multiply(new BigDecimal(20)).setScale(2, RoundingMode.HALF_UP); } return new BigDecimal(20); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java index f61612b60..0d097e9e3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.Date; import java.util.HashMap; @@ -118,7 +119,14 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl workerContracts = JSONArray.parseArray(workerInfoAuditRecord.getContractInfo(), WorkerContract.class); for (WorkerContract workerContract : workerContracts) { diff --git a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java index 52fbfc9bd..86819d07d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java @@ -727,7 +727,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv int num1 = list.stream().filter(l -> l.getStatus() != 2 && l.getStatus() != 6).collect(Collectors.toList()).size(); BigDecimal bigDecimal = new BigDecimal(num1); BigDecimal bigDecimal1 = new BigDecimal(list.size()); - BigDecimal result1 = bigDecimal.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP); + BigDecimal result1 = bigDecimal.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.4)).setScale(2, RoundingMode.HALF_UP); int num2 = list.stream().filter(l -> StringUtils.isNotBlank(l.getCompleteTime()) && StringUtils.isNotBlank(l.getChangeLimitTime()) && (l.getStatus() != 2 || l.getStatus() != 6) && DateUtil.compare(DateUtil.parseDateTime(l.getChangeLimitTime()), DateUtil.parseDateTime(l.getCompleteTime())) > 0).collect(Collectors.toList()).size(); @@ -738,7 +738,7 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv } int num3 = list.stream().filter(l -> (l.getStatus() == 5)).collect(Collectors.toList()).size(); BigDecimal bigDecima4 = new BigDecimal(num3); - BigDecimal result3 = bigDecima4.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP); + BigDecimal result3 = bigDecima4.divide(bigDecimal1, 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(0.3)).setScale(2, RoundingMode.HALF_UP); List ids = xzSecurityInspectTaskRecordService.list(Wrappers.lambdaQuery() .eq(XzSecurityInspectTaskRecord::getSn, projectSn) @@ -756,10 +756,10 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv } result4 = result4.multiply(new BigDecimal(0.2)).setScale(2, RoundingMode.HALF_UP); - BigDecimal total = result1.add(result2).add(result3).add(result4); - return total.multiply(new BigDecimal(25)).setScale(2, RoundingMode.HALF_UP); + BigDecimal total = result1.add(result2).add(result3)/*.add(result4)*/; + return total.multiply(new BigDecimal(35)).setScale(2, RoundingMode.HALF_UP); } - return new BigDecimal(25); + return new BigDecimal(35); } @Override @@ -786,9 +786,9 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv result2 = new BigDecimal(0.01); } BigDecimal total = result1.add(result2); - return total.multiply(new BigDecimal(15)).setScale(2, RoundingMode.HALF_UP); + return total.multiply(new BigDecimal(0)).setScale(2, RoundingMode.HALF_UP); } - return new BigDecimal(15); + return new BigDecimal(0); } @Override diff --git a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar index 4418a6caf..8a4cf5236 100644 Binary files a/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar and b/src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar differ