From 8ebf5bc4bf1cc2b70b6aa9dc295eaa9d86c95245 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 02 七月 2024 13:17:26 +0800
Subject: [PATCH] 委托编号生成规则修改+用户默认密码更改+温度循环项目新增逻辑+检验任务模版切换
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java | 13 +++
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 10 +
inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java | 4 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 16 ++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 99 ++++++++++++++++++------
cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java | 2
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 26 ++++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 7 -
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/dto/InsProductDto.java | 17 ++++
framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 16 +++
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 11 ++
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 4
16 files changed, 173 insertions(+), 61 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
index c916831..16ac213 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/StructureItemParameter.java
@@ -77,7 +77,7 @@
private Double manHour;
@ValueTableShow(7)
- @ApiModelProperty(value = "棰勮鏃堕棿(澶�)")
+ @ApiModelProperty(value = "棰勮鏃堕棿(H)")
private Integer manDay;
@ValueTableShow(8)
diff --git a/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java b/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
index fb75b18..fc5f555 100644
--- a/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
+++ b/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
@@ -25,5 +25,8 @@
@Select("select coalesce(count(id), 0) from ${tableName} where examine_time like concat('%', #{date}, '%')")
int countRowsByNow2(String tableName, String date);
+
+ @Select("select coalesce(count(id), 0) from ${tableName} where examine_time like concat('%', #{date}, '%') and laboratory=#{laboratory} and company_id=#{companyId}")
+ int countRowsByNow3(String tableName, Long companyId, String laboratory, String date);
}
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
index 0b4faff..d78b34b 100644
--- a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -13,19 +13,31 @@
@Resource
private SystemLogMapper systemLogMapper;
- public String giveCode(String code, String tableName, String symbol, String patten){
+ public String giveCode(String code, String tableName, String symbol, String patten) {
String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
int num;
- if (tableName.equals("ins_order")){
+ if (tableName.equals("ins_order")) {
num = systemLogMapper.countRowsByNow2(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
- }else {
- num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ } else {
+ num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
}
String nums = num + "";
- if(nums.length() == 1) nums = "00" + num;
- else if(nums.length() == 2) nums = "0" + num;
- return code + (date2==null?date:date2) + symbol + nums;
+ if (nums.length() == 1) nums = "00" + num;
+ else if (nums.length() == 2) nums = "0" + num;
+ return code + (date2 == null ? date : date2) + symbol + nums;
+ }
+
+ //妫�楠屽崟濮旀墭鍗曞彿鐨勭敓鎴愯鍒�
+ public String giveCode2(String code, Long companyId, String laboratory, String tableName, String symbol, String patten) {
+ String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ String date2 = LocalDate.now().format(DateTimeFormatter.ofPattern(patten));
+ int num;
+ num = systemLogMapper.countRowsByNow3(tableName, companyId, laboratory, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ String nums = num + "";
+ if (nums.length() == 1) nums = "00" + num;
+ else if (nums.length() == 2) nums = "0" + num;
+ return code + (date2 == null ? date : date2) + symbol + nums;
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 361b748..a321c6e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -80,7 +80,7 @@
@ValueAuth
public Result<?> selectOrderManDay(Integer id) {
int day = insProductService.selectOrderManDay(id);
- return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+ return Result.success("鎴愬姛", LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曞唴瀹硅鎯�")
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 b8b56b1..f357a50 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
@@ -5,9 +5,11 @@
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.service.InsOrderFileService;
import com.yuanchu.mom.service.InsOrderPlanService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -34,6 +36,8 @@
private InsOrderPlanService insOrderPlanService;
private InsOrderFileService insOrderFileService;
+
+ private InsProductService insProductService;
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鑾峰彇妫�楠屼换鍔″垪琛�")
@@ -71,8 +75,9 @@
@ApiOperation(value = "鍒囨崲鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
@PostMapping("/getReportModel")
- public Result<?> getReportModel(Integer orderId) {
- return Result.success(insOrderPlanService.getReportModel(orderId));
+ @ValueAuth
+ public Result<?> getReportModel(Integer sampleId) {
+ return Result.success(insOrderPlanService.getReportModel(sampleId));
}
@ValueAuth
@@ -155,4 +160,11 @@
map.put("fileUrl", insOrderFile.getFileUrl());
return Result.success(map);
}
+
+ @ApiOperation(value = "濉啓娓╁害涓庢箍搴�")
+ @PostMapping("/write")
+ @ValueAuth
+ public Result<?> write(@RequestBody InsProductDto insProductDto) {
+ return Result.success(insProductService.write(insProductDto));
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsProductDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsProductDto.java
new file mode 100644
index 0000000..bbef927
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsProductDto.java
@@ -0,0 +1,17 @@
+package com.yuanchu.mom.dto;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InsProductDto {
+
+ private List<Integer> ids;
+
+ private String temperature;
+
+ private String humidity;
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
index 12d10fe..14dd76e 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java
@@ -14,9 +14,10 @@
/**
* 妫�楠岄」鐩�
+ *
* @TableName ins_product
*/
-@TableName(value ="ins_product")
+@TableName(value = "ins_product")
@Data
public class InsProduct implements Serializable {
/**
@@ -150,7 +151,9 @@
*/
private String ask;
- /**瑕佹眰鎻忚堪*/
+ /**
+ * 瑕佹眰鎻忚堪
+ */
private String tell;
/**
@@ -208,6 +211,10 @@
private String templateName;
private String dic;
+ //娓╁害
+ private String temperature;
+ //婀垮害
+ private String humidity;
private Integer insFiberId;
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 2681d7a..8d2d2ef 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,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.dto.InsOrderPlanDTO;
+import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.pojo.InsOrderFile;
import com.yuanchu.mom.pojo.InsProduct;
import org.springframework.web.multipart.MultipartFile;
@@ -37,5 +38,6 @@
int uploadFile(Integer orderId, MultipartFile file);
- Map<String,Object> getReportModel(Integer orderId);
+ Map<String,Object> getReportModel(Integer sampleId);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
index cdc5e91..4f04b2a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsProductService.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.service;
+import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.pojo.InsProduct;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -13,4 +14,7 @@
int selectOrderManDay(Integer orderId);
int updateInspected(Integer id);
+
+ boolean write(InsProductDto insProductDto);
+
}
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 8db8b06..1944a41 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
@@ -25,10 +25,7 @@
import com.deepoove.poi.xwpf.WidthScalePattern;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
-import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.dto.ExcelDto;
-import com.yuanchu.mom.dto.InsOrderPlanDTO;
-import com.yuanchu.mom.dto.SampleProductDto;
+import com.yuanchu.mom.dto.*;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
@@ -271,11 +268,11 @@
//鍒囨崲璁板綍妯＄増鏌ヨ妫�楠屽唴瀹�
@Override
- public Map<String, Object> getReportModel(Integer orderId) {
+ public Map<String, Object> getReportModel(Integer sampleId) {
Map<String, Object> map = new HashMap<>();
- List<Integer> insSampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
+ //List<Integer> insSampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
//鍏堟煡鍑哄绠�
- List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().in(InsBushing::getInsSampleId, insSampleIds));
+ List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
List<InsFibers> fibers = new ArrayList<>();
List<InsFiber> fiber = new ArrayList<>();
for (InsBushing insBushing : insBushings) {
@@ -296,6 +293,9 @@
map.put("鍏夌氦",fiber);
return map;
}
+
+
+
@Override
public void saveInsContext(Map<String, Object> insContext) {
@@ -897,7 +897,7 @@
//绗竴琛�
if (j == 0) {
//绗竴鍒�
- textRenderData.setText("绠¤壊鏍嘝ipe鈭�100");
+ textRenderData.setText("绠¤壊鏍嘰r\nPipe鈭�100");
renderData.add(textRenderData);
paragraphRenderData.setContents(renderData);
paragraphRenderDataList.add(paragraphRenderData);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index 253a563..7ad21ac 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -15,6 +15,7 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
@@ -47,6 +48,7 @@
private InsSampleMapper insSampleMapper;
private InsProductMapper insProductMapper;
+ private InsProductService insProductService;
private GiveCode giveCode;
@@ -145,6 +147,7 @@
}
insSampleMapper.insert(a);
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
+ //鏅�氭楠岄」鐩�(闄や簡鍏夌氦鎺ュご鎹熻��)鐨勬坊鍔�
addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
}
if (ObjectUtil.isNotEmpty(a.getInsulating())) {
@@ -211,10 +214,12 @@
sample.setId(null);
insSampleMapper.insert(sample);
try {
- InsProduct insProduct = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鐔旀帴鎹熻��")).findFirst().get();
- insProduct.setId(null);
- insProduct.setInsSampleId(sample.getId());
- insProductMapper.insert(insProduct);
+ List<InsProduct> insProducts = sample.getInsProduct().stream().filter(a -> Objects.equals(a.getInspectionItem(), "鍏夌氦鎺ュご鎹熻��")).collect(Collectors.toList());
+ for (InsProduct insProduct : insProducts) {
+ insProduct.setId(null);
+ insProduct.setInsSampleId(sample.getId());
+ insProductMapper.insert(insProduct);
+ }
} catch (Exception e) {
}
}
@@ -222,30 +227,70 @@
}
private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(sampleId).getInsOrderId());
for (InsProduct product : productList) {
- /*if(product.getState()==1 && (product.getAsk().indexOf("D")>-1||product.getAsk().indexOf("W")>-1||product.getAsk().indexOf("X")>-1
- ||product.getAsk().indexOf("RTS")>-1||product.getAsk().indexOf("H")>-1||product.getAsk().indexOf("L")>-1)){
- throw new ErrorException("鎻愪氦澶辫触锛屽瓨鍦ㄦ湭濉啓鐨勫彉閲忥細"+product.getInspectionItem()+" "+product.getInspectionItemSubclass());
- }*/
- if (product.getState() == 1 && !product.getInspectionItem().equals("鐔旀帴鎹熻��")) {
- switch (type) {
- case 1:
- product.setInsFibersId(id);
- break;
- case 2:
- product.setInsFiberId(id);
- break;
+ if (product.getState() == 1 && !product.getInspectionItem().equals("鍏夌氦鎺ュご鎹熻��")) {
+ //鍒ゆ柇鍏夌紗鐨勬俯搴﹀惊鐜」鐩坊鍔�
+ if (insOrder.getSampleType().equals("鍏夌紗") && product.getInspectionItem().equals("娓╁害寰幆") && type != 0) {
+ List<InsProduct> insProductes = new ArrayList<>();
+ List<InsProduct> insProducts = new ArrayList<>();
+ String[] strings = product.getAsk().split(";");
+ for (int i = 0; i < strings.length; i++) {
+ if (i != strings.length - 1) {
+ InsProduct insProduct = new InsProduct();
+ switch (type) {
+ case 1:
+ insProduct.setInsFibersId(id);
+ break;
+ case 2:
+ insProduct.setInsFiberId(id);
+ break;
+ }
+ String[] split = strings[i].split(",");
+ insProduct.setInspectionItem("1娆�");//妫�楠岄」--寰幆娆℃暟
+ insProduct.setInspectionItemSubclass(split[0]);//妫�楠岄」--娓╁害
+ insProduct.setInspectionItemClass(split[1]);//妫�楠岄」--鍏夌氦椤圭洰
+ insProduct.setAsk(split[2]);//妫�楠岃姹�
+ insProduct.setTell(strings[i]);//妫�楠屾弿杩�
+ insProducts.add(insProduct);
+ insProductes.add(insProduct);
+ } else {
+ //鏈�鍚庝竴涓暟鎹槸璇存槑浼氬惊鐜灏戞
+ int count = Integer.parseInt(strings[i]);
+ if (count > 1) {
+ //寰幆瓒呰繃1娆�
+ for (int j = 2; j <= count; j++) {
+ for (InsProduct insProduct : insProducts) {
+ if (!insProduct.getInspectionItemSubclass().equals("20鈩�")) {
+ insProduct.setInspectionItem(j + "娆�");
+ insProductes.add(insProduct);
+ }
+ }
+ }
+ }
+ }
+ }
+ insProductService.saveBatch(insProductes);
+ } else {
+ switch (type) {
+ case 1:
+ product.setInsFibersId(id);
+ break;
+ case 2:
+ product.setInsFiberId(id);
+ break;
+ }
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(sampleId);
+ if (product.getInspectionItemSubclass() == null) {
+ product.setInspectionItemSubclass("");
+ }
+ insProductMapper.insert(product);
}
- product.setId(null);
- product.setCreateTime(null);
- product.setUpdateTime(null);
- product.setUpdateTime(null);
- product.setUpdateUser(null);
- product.setInsSampleId(sampleId);
- if (product.getInspectionItemSubclass() == null) {
- product.setInspectionItemSubclass("");
- }
- insProductMapper.insert(product);
}
}
}
@@ -270,7 +315,7 @@
code = "";
}
String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2();
- insOrder.setEntrustCode(giveCode.giveCode("JC/ZX" + code + "-" + code2 + "-", "ins_order", "", "yyMM"));
+ insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM"));
}
return insOrderMapper.updateById(insOrder);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
index 6b88b75..bf78942 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsProductServiceImpl.java
@@ -1,11 +1,14 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.dto.InsProductDto;
import com.yuanchu.mom.mapper.InsProductMapper;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.service.InsProductService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+
+import java.util.List;
@Service
@AllArgsConstructor
@@ -24,6 +27,16 @@
insProductMapper.updateInspected(id);
return 0;
}
+
+ @Override
+ public boolean write(InsProductDto insProductDto) {
+ List<InsProduct> insProducts = baseMapper.selectBatchIds(insProductDto.getIds());
+ for (InsProduct insProduct : insProducts) {
+ insProduct.setTemperature(insProductDto.getTemperature());
+ insProduct.setHumidity(insProductDto.getHumidity());
+ }
+ return updateBatchById(insProducts);
+ }
}
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 9656584..c5e49a3 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
@@ -59,8 +59,6 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
-// String[] factorys = insSample.getFactory().split(" - ");
- //List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId()).eq(StandardProductList::getState, 1).eq(StandardProductList::getModel, models[0]).eq(StandardProductList::getSampleType, factorys[2]));
List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
@@ -69,11 +67,6 @@
String[] split = insSample.getFactory().split(" - ");
String tree = split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3] + " - null";
list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree);
- /* list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery()
- .eq(StandardProductList::getStandardMethodListId, insSample.getStandardMethodListId())
- .eq(StandardProductList::getState, 1)
- .like(StandardProductList::getTree, split[0] + " - " + split[1] + " - " + split[2] + " - " + split[3]));*/
-
}
list = list.stream().filter(a -> {
try {
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 8d270b4..e391586 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -96,7 +96,7 @@
ir.url,
ir.url_s,
(select count(*) from ins_sample isa2
- where isa2.ins_order_id = io.id and isa2.sample_code NOT REGEXP '/' ) sample_num,
+ where isa2.ins_order_id = io.id) sample_num,
concat(ROUND((select count(*) from ins_product ip
where state = 1 and ins_result is not null and ip.ins_sample_id in (select id from ins_sample where
ins_sample.ins_order_id= io.id )) / (select count(*) from ins_product ip2
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index af4aea4..c5e2571 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,7 +25,7 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(
+ select * from(select * from(
SELECT
a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
FROM
@@ -63,6 +63,7 @@
a.type DESC,
a.id
) b
+ where ins_state is not null)A
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
@@ -207,7 +208,9 @@
ipr.equip_name,
ip.method_s,
ip.tell,
- ip.dic
+ ip.dic,
+ ip.temperature,
+ ip.humidity
from ins_sample isa
left join ins_product ip on isa.id = ip.ins_sample_id
left join ins_product_result ipr on ip.id = ipr.ins_product_id
@@ -448,7 +451,6 @@
and ins_fibers_id is null
</select>
<select id="getReportModel" resultType="java.util.Map">
-
</select>
<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
@@ -516,6 +518,8 @@
<result property="methodS" column="method_s"/>
<result property="tell" column="tell"/>
<result property="dic" column="dic"/>
+ <result property="temperature" column="temperature"/>
+ <result property="humidity" column="humidity"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
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 55d622a..6dcc77e 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
@@ -163,7 +163,7 @@
user.setEmail(person.getCompanyEmail());
user.setIsCustom(person.getCompanyId().equals("SC2463") ? 0 : 1);
// user.setPassword(DigestUtils.md5DigestAsHex(headerToken.getPassword(person.getEmployeeID()).getBytes()));
- user.setPassword(DigestUtils.md5DigestAsHex("123456".getBytes()));
+ user.setPassword(DigestUtils.md5DigestAsHex("zttZTT123!".getBytes()));
user.setCompany(BeanUtil.isNotEmpty(custom) ? (custom.getId() + "") : companyName);
user.setAddress("鏈～鍐�");
user.setRoleId(personDto.getRoleId() > 10000 ? 0 : personDto.getRoleId());
--
Gitblit v1.9.3