cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -1,16 +1,9 @@ package com.yuanchu.mom.controller; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Console; import cn.hutool.core.util.ObjectUtil; import cn.hutool.json.JSONUtil; import cn.hutool.poi.excel.ExcelReader; import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.sax.handler.RowHandler; import com.alibaba.excel.util.StringUtils; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yuanchu.mom.annotation.ValueAuth; @@ -29,15 +22,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.*; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.Arrays; import java.util.Map; /** * 检验项目参数(StructureItemParameter)表控制层 @@ -174,7 +162,7 @@ private EnumService enumService; @ValueClassify(value = "能力范围") @ApiOperation(value = "导入") @ApiOperation(value = "导入检验项目") @PostMapping("/importData") @Transactional public Result importData(@RequestParam("file") MultipartFile file) throws Exception { inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
@@ -22,31 +22,32 @@ private ReportService reportService; @ValueClassify("统计图表") @ApiOperation(value = "每日业务统计") @ApiOperation(value = "查询每日业务统计") @GetMapping("/businessStatisticsByDay") public Result businessStatisticsByDay(){ return Result.success(reportService.businessStatisticsByDay()); } @ValueClassify("统计图表") @ApiOperation(value = "检测项目统计") @ApiOperation(value = "查询检测项目统计") @GetMapping("/testProductByDay") public Result testProductByDay(){ return Result.success(reportService.testProductByDay()); } @ValueAuth @ApiOperation(value = "日历任务图") @ApiOperation(value = "查询日历任务图") @GetMapping("/calendarWorkByWeek") public Result calendarWorkByWeek(){ return Result.success(reportService.calendarWorkByWeek()); } @ValueClassify("个人首页") @ValueAuth @ApiOperation(value = "添加日程") @PostMapping("/addSchedule") public Result addSchedule(String time, String text){ return Result.success(reportService.addSchedule(time,text)); } @ValueAuth @ApiOperation(value = "我的日程") @ApiOperation(value = "查询我的日程") @PostMapping("/ScheduleByMe") public Result ScheduleByMe(String date){ return Result.success(reportService.ScheduleByMe(date)); inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
@@ -62,9 +62,9 @@ return Result.success(standardTemplateService.getStandTempThingById(id)); } @ValueAuth @ApiOperation(value = "编辑模板编制") @GetMapping("/getEditTemplatePreparation") @ValueClassify("标准库") public Result<?> getEditTemplatePreparation(@RequestParam("id") Integer id) { StandardTemplate byId = standardTemplateService.getById(id); return Result.success("OK", byId.getThing()); inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
@@ -49,7 +49,6 @@ @ValueTableShow(value = 14, name = "是否合格") private Integer insResult; @ValueTableShow(value = 16, name = "设备") private String equipValue; } inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -56,7 +56,10 @@ String[] models = insSample.getModel().split("-(?=[^-]*$)");//拆分最后一个【-】 List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0])); if (list.size() == 0) { list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1)); list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery() .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()) .eq(StandardProductList::getState, 1) .like(StandardProductList::getTree, insSample.getFactory().split("-(?=[^-]*$)")[0])); } list = list.stream().filter(a -> { try { @@ -66,26 +69,13 @@ List<String> tells = JSON.parseArray(a.getTell(), String.class); List<String> manHours = JSON.parseArray(a.getManHour(), String.class); List<String> prices = JSON.parseArray(a.getPrice(), String.class); boolean isIf = false; boolean isIf; for (int i = 0; i < sections.size(); i++) { if (sections.get(i).contains("&")) { String[] split = sections.get(i).split("&"); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(models[1]).compareTo(new BigDecimal(split[1])) < 1; } else if (sections.get(i).contains("≥") || sections.get(i).contains(">=")) { String param = sections.get(i).replace("≥", "").replace(">=", ""); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > -1; } else if (sections.get(i).contains("≤") || sections.get(i).contains("<=")) { String param = sections.get(i).replace("≤", "").replace("<=", ""); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 1; } else if (sections.get(i).contains(">")) { String param = sections.get(i).replace(">", ""); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) > 0; } else if (sections.get(i).contains("<")) { String param = sections.get(i).replace("<", ""); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) < 0; } else if (sections.get(i).contains("=")) { String param = sections.get(i).replace("=", ""); isIf = new BigDecimal(models[1]).compareTo(new BigDecimal(param)) == 0; isIf = getIsIf(split[0], models[1]) && getIsIf(split[1], models[1]); } else { isIf = getIsIf(sections.get(i), models[1]); } if (isIf) { a.setSection(sections.get(i)); @@ -106,6 +96,26 @@ return list; } private boolean getIsIf(String str, String model){ if (str.contains("≥") || str.contains(">=")) { String param = str.replace("≥", "").replace(">=", ""); return new BigDecimal(model).compareTo(new BigDecimal(param)) > -1; } else if (str.contains("≤") || str.contains("<=")) { String param = str.replace("≤", "").replace("<=", ""); return new BigDecimal(model).compareTo(new BigDecimal(param)) < 1; } else if (str.contains(">")||str.contains("＞")) { String param = str.replace(">", "").replace("＞", ""); return new BigDecimal(model).compareTo(new BigDecimal(param)) > 0; } else if (str.contains("<")||str.contains("＜")) { String param = str.replace("<", "").replace("＜", ""); return new BigDecimal(model).compareTo(new BigDecimal(param)) < 0; } else if (str.contains("=")) { String param = str.replace("=", ""); return new BigDecimal(model).compareTo(new BigDecimal(param)) == 0; } return false; } @Override public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) { String[] trees = tree.split(" - "); inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
@@ -113,7 +113,7 @@ @Override @Transactional(rollbackFor = Exception.class) public int upStandardProducts(Map<String, Object> product) { List<Integer> ids = JSON.parseArray(JSON.toJSONString(product.get("ids"))); List<Integer> ids = JSON.parseArray(product.get("ids")+""); StandardProductList productList = JSON.parseObject(JSON.toJSONString(product.get("standardProductList")), StandardProductList.class); standardProductListMapper.update(productList, Wrappers.<StandardProductList>lambdaUpdate().in(StandardProductList::getId, ids)); return 1; inspect-server/src/main/resources/static/report-template.docxBinary files differ
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -100,7 +100,7 @@ } @ValueClassify("人员总览") @ApiOperation(value = "人员总览") @ApiOperation(value = "查询人员总览") @PostMapping("/selectPersonnelOverview") public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception { Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
