From 87d82df87ff8846898a88ff9bfcb2cd595bab78b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 24 五月 2024 14:46:04 +0800
Subject: [PATCH] 功能调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 2
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 46 ++++++++++++++---------
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 1
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 11 +++--
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 18 +-------
8 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index bb3b20a..2b08ce6 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/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 {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
index b3936d4..eeb5f00 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java
+++ b/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));
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
index e75d445..7181575 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTemplateController.java
+++ b/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());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
index 615c1a5..c7cf7fb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java
+++ b/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;
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index 416e151..8a7d0da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/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(" - ");
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
index 1fe8cf3..0c66337 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java
+++ b/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;
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index 7c4b147..307ed5d 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 9561e48..862d38e 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/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);
--
Gitblit v1.9.3