From 27421a34661fed2e141ab9aaa7447926aea46e36 Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 14:09:25 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 2
user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java | 13 +-
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 42 ++++++++
framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java | 25 +++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 15 +++
framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java | 10 ++
inspect-server/src/main/java/com/yuanchu/mom/controller/ReportController.java | 11 +-
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/vo/InsOrderPlanTaskSwitchVo.java | 36 +++++++
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 3
framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java | 4
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto2.java | 1
inspect-server/src/main/resources/static/report-template.docx | 0
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 18 ---
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 11 ++
user-server/src/main/java/com/yuanchu/mom/dto/Custom.java | 5 +
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 4
20 files changed, 199 insertions(+), 53 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/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
index 704967a..78158f3 100644
--- a/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
+++ b/framework/src/main/java/com/yuanchu/mom/controller/InformationNotificationController.java
@@ -10,6 +10,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.Map;
+
/**
* <p>
* 娑堟伅閫氱煡 鍓嶇鎺у埗鍣�
@@ -71,4 +73,12 @@
informationNotificationService.triggerModificationStatusToRead(id);
return Result.success();
}
+
+ @ApiOperation(value = "娑堟伅閫氱煡-鑾峰彇棣栭〉鍥涚娑堟伅鏁伴噺")
+ @GetMapping("getNumberFourTypesMessagesHomePage")
+ @ValueAuth
+ public Result<?> getNumberFourTypesMessagesHomePage() {
+ Map<String, Object> data = informationNotificationService.getNumberFourTypesMessagesHomePage();
+ return Result.success(data);
+ }
}
diff --git a/framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java b/framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java
index 1d13fe7..9614fb6 100644
--- a/framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java
+++ b/framework/src/main/java/com/yuanchu/mom/service/InformationNotificationService.java
@@ -6,6 +6,8 @@
import com.yuanchu.mom.pojo.InformationNotification;
import com.yuanchu.mom.pojo.InformationNotificationDto;
+import java.util.Map;
+
/**
* <p>
* 娑堟伅閫氱煡 鏈嶅姟绫�
@@ -25,4 +27,6 @@
void triggerModificationStatusToRead(Integer id);
int addInformationNotification(InformationNotification informationNotification);
+
+ Map<String, Object> getNumberFourTypesMessagesHomePage();
}
diff --git a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
index 68ba7ef..39c53a4 100644
--- a/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
+++ b/framework/src/main/java/com/yuanchu/mom/service/impl/InformationNotificationServiceImpl.java
@@ -12,6 +12,8 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -76,4 +78,27 @@
public int addInformationNotification(InformationNotification informationNotification) {
return baseMapper.insert(informationNotification);
}
+
+ @Override
+ public Map<String, Object> getNumberFourTypesMessagesHomePage() {
+ Map<String, Integer> map1 = null;
+ Map<String, Object> map = new HashMap<>();
+ map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
+ Long totalNumberOfMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
+ .eq(InformationNotification::getConsigneeId, map1.get("userId")));
+ Long totalNumberOfReadMessages = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
+ .eq(InformationNotification::getConsigneeId, map1.get("userId"))
+ .eq(InformationNotification::getViewStatus, true));
+ LocalDate today = LocalDate.now();
+ LocalDate sevenDaysAgo = today.minusDays(7);
+ Long totalNumberOfMessagesInThePastSevenDays = baseMapper.selectCount(Wrappers.<InformationNotification>lambdaQuery()
+ .eq(InformationNotification::getConsigneeId, map1.get("userId"))
+ .between(InformationNotification::getCreateTime, today, sevenDaysAgo));
+ long remainingToDo = totalNumberOfMessages - totalNumberOfReadMessages;
+ map.put("totalNumberOfMessages", totalNumberOfMessages);
+ map.put("remainingToDo", remainingToDo);
+ map.put("totalNumberOfReadMessages", totalNumberOfReadMessages);
+ map.put("totalNumberOfMessagesInThePastSevenDays", totalNumberOfMessagesInThePastSevenDays);
+ return map;
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 18c32af..56df2da 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -38,6 +38,17 @@
InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
return Result.success(insOrderPlanService.selectInsOrderPlanList(page, insOrderPlanDTO));
}
+
+ @ValueClassify("妫�楠屼换鍔�")
+ @ApiOperation(value = "妫�楠屽崟璇︽儏-浠诲姟鍒囨崲")
+ @PostMapping("/inspectionOrderDetailsTaskSwitching")
+ public Result inspectionOrderDetailsTaskSwitching(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ page.setOptimizeCountSql(false);
+ InsOrderPlanDTO insOrderPlanDTO = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrderPlanDTO.class);
+ return Result.success(insOrderPlanService.inspectionOrderDetailsTaskSwitching(page, insOrderPlanDTO));
+ }
+
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "璁ら浠诲姟璁″垝")
@PostMapping("/claimInsOrderPlan")
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/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
index 88d97ae..7bff8d3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java
@@ -7,6 +7,7 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import java.util.List;
@@ -21,6 +22,8 @@
IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
+ IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, QueryWrapper<InsOrderPlanDTO> ew, Integer userId);
+
List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
index 83282ad..bf1f1e5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java
@@ -2,8 +2,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.pojo.InsOrder;
-import com.yuanchu.mom.pojo.InsSample;
import java.util.Map;
@@ -13,6 +11,8 @@
public interface InsOrderPlanService {
Map<String,Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO);
+ Map<String,Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO);
+
boolean claimInsOrderPlan(InsOrderPlanDTO entity);
void saveInsContext(Map<String, Object> insContext);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 78ec60d..2952551 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -33,6 +33,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.MatrixToImageWriter;
import com.yuanchu.mom.utils.QueryWrappers;
+import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo;
import com.yuanchu.mom.vo.InsOrderPlanVO;
import org.apache.commons.io.IOUtils;
import org.apache.poi.xwpf.usermodel.*;
@@ -114,6 +115,20 @@
}
@Override
+ public Map<String, Object> inspectionOrderDetailsTaskSwitching(Page page, InsOrderPlanDTO insOrderPlanDTO) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(InsOrderPlanTaskSwitchVo.class));
+ Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
+ Integer userId = map1.get("userId");
+ if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
+ insOrderPlanDTO.setUserId(userId.longValue());
+ }
+ IPage<InsOrderPlanTaskSwitchVo> insOrderPage = insSampleMapper.inspectionOrderDetailsTaskSwitching(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId);
+ map.put("body", insOrderPage);
+ return map;
+ }
+
+ @Override
public boolean claimInsOrderPlan(InsOrderPlanDTO entity) {
if (Objects.isNull(entity)) {
return false;
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/java/com/yuanchu/mom/vo/InsOrderPlanTaskSwitchVo.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanTaskSwitchVo.java
new file mode 100644
index 0000000..d317a85
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanTaskSwitchVo.java
@@ -0,0 +1,36 @@
+package com.yuanchu.mom.vo;
+
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import lombok.Data;
+
+@Data
+public class InsOrderPlanTaskSwitchVo extends OrderBy {
+ private String id;
+
+ @ValueTableShow(value = 1,name = "濮旀墭缂栧彿")
+ private String entrustCode;
+
+ @ValueTableShow(value = 2,name = "妫�楠屽璞�")
+ private String sampleType;
+
+ @ValueTableShow(value = 4,name = "绱ф�ョ▼搴�")
+ private String type;
+
+ @ValueTableShow(value = 5,name = "鐘舵��")
+ private String insState;
+
+ @ValueTableShow(value = 6,name = "绾﹀畾鏃堕棿")
+ private String appointed;
+
+ @ValueTableShow(value = 7,name = "涓嬪彂鏃堕棿")
+ private String sendTime;
+
+ private Integer userId;
+
+ private String sonLaboratory;
+
+ private Integer orderUserId;
+
+ private Integer verifyUser;
+}
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 141741a..2596699 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -67,6 +67,48 @@
</if>
</select>
+ <select id="inspectionOrderDetailsTaskSwitching" resultType="com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo">
+ select * from(
+ SELECT
+ a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
+ FROM
+ (
+ SELECT
+ io.id,
+ io.entrust_code,
+ io.type,
+ io.appointed,
+ io.send_time,
+ io.sample_type,
+ isu.user_id,
+ ip.son_laboratory,
+ io.ins_time
+ FROM
+ ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+ LEFT JOIN ( SELECT * FROM ins_sample_user GROUP BY ins_sample_id, user_id ) isu ON isu.ins_sample_id = io.id
+ LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
+ WHERE
+ io.state = 1
+ # AND io.ins_state != 5
+ and send_time is not null
+ and (isu.user_id = #{userId} OR isu.user_id is NULL)
+ GROUP BY
+ ip.son_laboratory,
+ io.id
+ ) a
+ LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
+ left join (SELECT td.user_id order_user_id, td.ins_sample_id FROM ins_sample_user td,(SELECT max(id) id FROM ins_sample_user GROUP BY ins_sample_id) md where td.id = md.id and user_id = #{userId}) isu2 on isu2.ins_sample_id = a.id
+ ORDER BY
+ a.user_id DESC,
+ a.type DESC,
+ a.id
+ ) b
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
<select id="selectSampleProductListByOrderId" resultMap="sampleDto">
select isa.*,
ip.id ip_id,
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);
diff --git a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
index cfece7c..5a82e45 100644
--- a/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
+++ b/user-server/src/main/java/com/yuanchu/mom/dto/Custom.java
@@ -84,4 +84,9 @@
private Integer isCustom;
+ @ApiModelProperty(value = "鑻辨枃瀹㈡埛鍗曚綅")
+ private String companyEn;
+
+ @ApiModelProperty(value = "鑻辨枃鍗曚綅鍦板潃")
+ private String addressEn;
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
index d8cc65f..a39fae2 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java
@@ -126,7 +126,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public int addPersonUser(PersonDto personDto) {
- AtomicReference<String> departId = new AtomicReference<>("");
+ AtomicReference<String> departId = new AtomicReference<>("1,");
AtomicReference<String> companyName = new AtomicReference<>();
personDto.getCompany().forEach(company -> {
Departments department = departmentsMapper.selectOne(Wrappers.<Departments>lambdaQuery().eq(Departments::getCompanyId, company.getCompanyId()));
diff --git a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
index 3af736a..8f3b60a 100644
--- a/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
+++ b/user-server/src/main/java/com/yuanchu/mom/util/HeaderToken.java
@@ -18,7 +18,6 @@
import javax.annotation.Resource;
import java.util.List;
-import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -73,10 +72,11 @@
}catch (Exception e){
throw new ErrorException(e.getMessage());
}
- return companies.stream().filter(ob->{
+ /*return companies.stream().filter(ob->{
if(ob.getStatus().equals("enabled")) return true;
return false;
- }).collect(Collectors.toList());
+ }).collect(Collectors.toList());*/
+ return companies;
}
public List<Person> userUrl(String companyId) {
@@ -91,11 +91,8 @@
throw new ErrorException(e.getMessage());
}
return person.stream().filter(ob->{
- if(Objects.equals(ob.getStatus(), "enabled")) {
- ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
- return true;
- }
- return false;
+ ob.setIsLive(userMapper.selectCount(Wrappers.<User>lambdaQuery().eq(User::getAccount, ob.getEmployeeID())));
+ return true;
}).collect(Collectors.toList());
}
--
Gitblit v1.9.3