From 4f986140a10e71c07c7001ccbcda6e93e17736b1 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 四月 2024 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardTreeServiceImpl.java | 1
cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java | 2
cnas-server/src/main/resources/mapper/DeviceMapper.xml | 1
cnas-server/src/main/resources/mapper/SealMapper.xml | 17 ++
cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java | 59 +++++++++
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 7
cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 61 ++++------
cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java | 3
system-run/src/main/resources/application-prod.yml | 1
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 2
cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java | 1
cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java | 26 ++++
system-run/src/main/resources/application-dev.yml | 2
cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java | 52 ++++++++
cnas-server/src/main/resources/mapper/LaboratoryMapper.xml | 1
cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java | 45 +++++++
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 5
cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java | 19 +++
cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 2
cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java | 17 ++
22 files changed, 281 insertions(+), 46 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
index e508f55..fbcae21 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/LaboratoryController.java
@@ -1,29 +1,34 @@
package com.yuanchu.mom.controller;
+import cn.hutool.core.lang.UUID;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.Laboratory;
import com.yuanchu.mom.service.LaboratoryService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import javax.annotation.Resources;
import java.util.Map;
/**
* 瀹為獙瀹ょ鐞�(LaboratoryController)琛ㄦ帶鍒跺眰
*/
@Api(tags = "鍦烘墍鎴栬鏂�")
-@AllArgsConstructor
+
@RestController
@RequestMapping("/laboratoryScope")
public class LaboratoryController {
+ @Value("${file.path}")
+ private String filePath;
+ @Resource
private LaboratoryService laboratoryService;
@ApiOperation(value = "鏌ヨ瀹為獙瀹ょ鐞嗗垪琛�")
@@ -60,3 +65,9 @@
}
}
+
+
+
+
+
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
new file mode 100644
index 0000000..3fccae6
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/SealController.java
@@ -0,0 +1,59 @@
+package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+import com.yuanchu.mom.service.SealService;
+import com.yuanchu.mom.utils.JackSonUtil;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鍗扮珷绠＄悊(SealController)琛ㄦ帶鍒跺眰
+ */
+@Api(tags = "鍗扮珷绠＄悊")
+
+@RestController
+@RequestMapping("/sealScope")
+public class SealController {
+
+ @Resource
+ private SealService sealService;
+
+ @ApiOperation(value = "鍒犻櫎鍗扮珷")
+ @PostMapping("/deleteSeal")
+ public Result deleteSeal(@RequestBody Integer id) {
+ return Result.success(sealService.delSeal(id));
+ }
+ @ApiOperation(value = "娣诲姞鍗扮珷鍙傛暟")
+ @PostMapping("/addSeal")
+ public Result addSeal(@RequestBody Seal seal) {
+ int i = sealService.addSeal(seal);
+ if(i>0){
+ Integer labId = seal.getLabId();
+ List<Laboratory> laboratory = sealService.Laboratory(labId);
+ return Result.success(laboratory);
+ }else{
+ return Result.fail();
+ }
+
+ }
+ @ApiOperation(value = "淇敼鍗扮珷鍙傛暟")
+ @PostMapping("/upSeal")
+ public Result upSeal(@RequestBody Seal seal){
+ return Result.success(sealService.upSeal(seal));
+ }
+ @ApiOperation(value="鏌ヨ鍗扮珷鍒楄〃")
+ @PostMapping("/selectSeal")
+ public Result selectSeal(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ Seal seal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Seal.class);
+ return Result.success(sealService.selectSeal(page,seal));
+ }
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
index 833fb7f..f998d90 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DepartmentMapper.java
@@ -29,6 +29,7 @@
//鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�
IPage<UserDto> showUserById(@Param("page") IPage<UserDto> page, @Param("ids") List<String> ids, @Param("ew") QueryWrapper<UserDto> ew);
+
//鏍规嵁閮ㄩ棬id,鏌ヨ浠栫殑鎵�鏈夊瓙绫籭d
List<Integer> selectSonById(Integer id);
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
index 3e5eb66..823569b 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/LaboratoryMapper.java
@@ -6,6 +6,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.Laboratory;
+import java.util.Map;
+
/**
* 瀹為獙瀹ょ鐞�(Laboratory)琛ㄦ暟鎹簱璁块棶灞�
*/
@@ -14,5 +16,6 @@
IPage<Laboratory> selectItemParameter(Page page, QueryWrapper<Laboratory> ew);
Object obtainItemParameterList(Page page, QueryWrapper<Laboratory> queryWrappers);
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
new file mode 100644
index 0000000..7577a20
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/mapper/SealMapper.java
@@ -0,0 +1,19 @@
+package com.yuanchu.mom.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.pojo.Certification;
+
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SealMapper extends BaseMapper<Seal> {
+ IPage<Seal>selectSeal(Page page, QueryWrapper<Seal> ew);
+ List<Laboratory> selectLaboratory (Integer labId);
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
index 17e8058..ec07416 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Laboratory.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -15,6 +16,7 @@
*/
@TableName(value = "laboratory")
@Data
+@NoArgsConstructor
public class Laboratory extends OrderBy implements Serializable {
@ApiModelProperty(value = "涓婚敭")
@TableId(type = IdType.AUTO)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
new file mode 100644
index 0000000..07e7d1a
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Seal.java
@@ -0,0 +1,45 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 鍗扮珷绠＄悊(Laboratory)琛ㄥ璞�
+ */
+
+@TableName(value = "seal")
+@Data
+public class Seal extends OrderBy implements Serializable {
+ @ApiModelProperty(value = "涓婚敭")
+ @TableId(type = IdType.AUTO)
+ private Integer id;
+ @ValueTableShow(1)
+ @ApiModelProperty(value = "瀹為獙瀹d")
+ private Integer labId;
+ @ValueTableShow(2)
+ @ApiModelProperty(value = "鍗扮珷鍥剧墖")
+ private String address;
+
+ @ValueTableShow(3)
+ @ApiModelProperty(value = "鍗扮珷绫诲瀷")
+ private String type;
+ @ApiModelProperty(value = "鍒涘缓浜篿d")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @ValueTableShow(5)
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+
+}
+
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
index 2dcf3ed..7ec3f82 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/LaboratoryService.java
@@ -22,5 +22,6 @@
List<Laboratory> obtainItemParameterList();
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
new file mode 100644
index 0000000..df66ac6
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/SealService.java
@@ -0,0 +1,26 @@
+package com.yuanchu.mom.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SealService extends IService<Seal> {
+
+ //鏂板
+ int addSeal(Seal seal);
+ //鍒犻櫎
+ int delSeal(int id);
+ //鏇存柊
+ int upSeal(Seal seal);
+ //鏌ヨ
+ Map<String, Object> selectSeal(Page page, Seal seal);
+
+ List<Laboratory> Laboratory(Integer id);
+
+
+}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
index d1c00d8..621fe7c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/LaboratoryServiceImpl.java
@@ -56,5 +56,7 @@
public List<Laboratory> obtainItemParameterList() {
return laboratoryMapper.selectList(Wrappers.<Laboratory>lambdaQuery().select(Laboratory::getLaboratoryName));
}
+
+
}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
new file mode 100644
index 0000000..390fbf7
--- /dev/null
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/SealServiceImpl.java
@@ -0,0 +1,52 @@
+package com.yuanchu.mom.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.common.GetLook;
+import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.mapper.LaboratoryMapper;
+import com.yuanchu.mom.mapper.SealMapper;
+import com.yuanchu.mom.pojo.Certification;
+import com.yuanchu.mom.pojo.Laboratory;
+import com.yuanchu.mom.pojo.Seal;
+import com.yuanchu.mom.service.SealService;
+import com.yuanchu.mom.utils.QueryWrappers;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@AllArgsConstructor
+public class SealServiceImpl extends ServiceImpl<SealMapper, Seal> implements SealService {
+ private SealMapper sealMapper;
+
+
+ @Override
+ public int addSeal(Seal seal) {
+ return sealMapper.insert(seal);
+ }
+
+ @Override
+ public int delSeal(int id) {
+ return sealMapper.deleteById(id);
+ }
+
+ @Override
+ public int upSeal(Seal seal) {
+ return sealMapper.updateById(seal);
+ }
+
+ @Override
+ public Map<String, Object> selectSeal(Page page, Seal seal) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("head", PrintChina.printChina(Seal.class));
+ map.put("body", sealMapper.selectSeal(page, QueryWrappers.queryWrappers(seal)));
+ return map;
+ }
+ @Override
+ public List<Laboratory> Laboratory(Integer labId) {
+ return sealMapper.selectLaboratory(labId);
+ }
+}
diff --git a/cnas-server/src/main/resources/mapper/DeviceMapper.xml b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
index 7f8d103..f24ba1a 100644
--- a/cnas-server/src/main/resources/mapper/DeviceMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DeviceMapper.xml
@@ -80,7 +80,6 @@
</select>
<update id="upDeviceParameter" parameterType="com.yuanchu.mom.pojo.Device">
-
UPDATE device
<set>
<if test="largeCategory!=null and largeCategory!='' ">large_category=#{largeCategory},</if>
diff --git a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
index e750909..bba2d21 100644
--- a/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
+++ b/cnas-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,6 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.LaboratoryMapper">
-
<select id="selectItemParameter" resultType="com.yuanchu.mom.pojo.Laboratory">
select * from
(
diff --git a/cnas-server/src/main/resources/mapper/SealMapper.xml b/cnas-server/src/main/resources/mapper/SealMapper.xml
new file mode 100644
index 0000000..c1e4380
--- /dev/null
+++ b/cnas-server/src/main/resources/mapper/SealMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.SealMapper">
+ <select id="selectSeal" resultType="com.yuanchu.mom.pojo.Seal">
+ select * from seal
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectLaboratory" resultType="com.yuanchu.mom.pojo.Laboratory">
+ SELECT *
+ from laboratory
+ WHERE id =#{labId}
+ </select>
+</mapper>
\ No newline at end of file
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index 9db70b9..428ec1f 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -6,8 +6,10 @@
<select id="selectItemParameterList" resultType="com.yuanchu.mom.pojo.StructureItemParameter">
select id,
inspection_item,
+ inspection_item_en,
inspection_item_classify,
inspection_item_subclass,
+ inspection_item_subclass_en,
laboratory,
unit,
price,
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 3f32791..12210bd 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
@@ -1,5 +1,6 @@
package com.yuanchu.mom.controller;
+import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -18,6 +19,8 @@
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
@@ -57,7 +60,7 @@
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
- JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
+ JSONArray jsonArray = JSON.parseArray(map.get("list")+"");
List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
return Result.success(insOrderService.addInsOrder(list, insOrder));
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 92e92df..687666d 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
@@ -67,6 +67,8 @@
*/
private String model;
+ private String methodS;
+
/**
* 瀛愬疄楠屽
*/
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 b3eda3a..a8ba372 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
@@ -123,9 +123,9 @@
public Map<String, Object> doInsOrder(Integer id, String laboratory) {
InsOrder insOrder = new InsOrder();
insOrder.setId(id);
- insOrder.setInsState(1);
InsOrder order = insOrderMapper.selectById(id);
if (BeanUtil.isEmpty(order.getInsTime())) {
+ insOrder.setInsState(1);
insOrder.setInsTime(LocalDateTime.now());
insOrderMapper.updateById(insOrder);
}
@@ -165,7 +165,7 @@
map.put("v", JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v"));
try {
if ((insValue.get("u") == null || insValue.get("u").equals("")) && StrUtil.isNotEmpty(JSON.parseObject(JSON.toJSONString(insValue.get("v"))).get("v").toString())) {
- map.put("u", userId);
+ map.put("u", userId + "");
} else {
map.put("u", insValue.get("u"));
}
@@ -190,14 +190,23 @@
if (resValue.get("v") != null) {
insProduct.setLastValue(JSON.parseObject(JSON.toJSONString(resValue.get("v"))).get("v") + "");
}
- JSONObject equipValue = JSON.parseObject(JSON.toJSONString(jo.get("equipValue")));
- try {
- result.setEquipValue(JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v") + "");
- } catch (Exception ignored) {
- result.setEquipValue(null);
+ if (jo.get("equipValue") != null) {
+ JSONArray jsonArray2 = JSON.parseArray(JSON.toJSONString(jo.get("equipValue")));
+ List<Map<String, Object>> ev = new ArrayList<>();
+ for (Object o : jsonArray2) {
+ JSONObject equipValue = JSON.parseObject(JSON.toJSONString(o));
+ Map<String, Object> map = new HashMap<>();
+ map.put("v", JSON.parseObject(JSON.toJSONString(equipValue.get("v"))).get("v"));
+ ev.add(map);
+ }
+ result.setEquipValue(JSON.toJSONString(ev));
}
- JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
- insProduct.setInsResult(Integer.parseInt(JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + ""));
+ try {
+ JSONObject insResult = JSON.parseObject(JSON.toJSONString(jo.get("insResult")));
+ String ir = JSON.parseObject(JSON.toJSONString(insResult.get("v"))).get("v") + "";
+ insProduct.setInsResult(Integer.parseInt(ir));
+ } catch (Exception e) {
+ }
if (BeanUtil.isEmpty(result.getId())) {
result.setCreateUser(userId);
result.setUpdateUser(userId);
@@ -496,33 +505,9 @@
JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
-// List<JSONObject> tableData = new ArrayList<>();
Map<String, Object> style = new HashMap<>();
style.put("rowlen", config.get("rowlen"));
style.put("columnlen", config.get("columnlen"));
- /*int r = -1;
- if (BeanUtil.isNotEmpty(cellData)) {
- for (JSONObject o : cellData) {
- JSONObject v = JSON.parseObject(JSON.toJSONString(o.get("v")));
- tableData.add(o);
- if (BeanUtil.isNotEmpty(v.get("ps"))) {
- JSONObject ps = JSON.parseObject(JSON.toJSONString(v.get("ps")));
- if (ps.get("value").equals("妫�楠岄」") && v.get("v").equals(product.getInspectionItem())) {
- tableData.add(o);
- r = Integer.parseInt(o.get("r") + "");
- continue;
- }
- }
- if (tableData.size() > 0) {
- if ((Integer.parseInt(o.get("r") + "") == r + 1 || Integer.parseInt(o.get("r") + "") == r) && !(o.get("v") + "").equals("{\"ht\":\"0\"}")) {
- r = Integer.parseInt(o.get("r") + "");
- tableData.add(o);
- } else {
- break;
- }
- }
- }
- }*/
product.setTemplate(cellData);
product.setStyle(style);
}
@@ -533,9 +518,13 @@
public int submitPlan(Integer orderId, String laboratory) {
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).isNotNull(InsProduct::getInsResult));
- if (insProducts.size() == 0) {
- return 0;
+ List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).eq(InsProduct::getSonLaboratory, laboratory).eq(InsProduct::getState, 1).isNull(InsProduct::getInsResult));
+ if (insProducts.size() > 0) {
+ String str = "";
+ for (InsProduct product : insProducts) {
+ str += product.getInspectionItem()+product.getInspectionItemSubclass()+"锛�";
+ }
+ throw new ErrorException("浠ヤ笅鏄湭妫�楠岀殑椤圭洰锛�"+str);
}
insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 3));
return 1;
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 2f3ea2e..61026bf 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
@@ -181,6 +181,7 @@
pl2.setUpdateTime(LocalDateTime.now());
pl2.setId(pl1.getId());
pl2.setSample(tree.getSample());
+ pl2.setDic(pl1.getDic());
//濡傛灉鏍囧噯搴撻噷闈㈢殑瑕佹眰鏈夊�煎垯涓嶆洿鏂�,瑕佹眰涓簄ull鍒欏悓姝ユ洿鏂�
if (ObjectUtils.isNotEmpty(pl1.getAsk())){
pl2.setAsk(null);
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index f5822aa..1e5bee5 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -104,7 +104,8 @@
template_id,
ipr.ins_value,
ipr.com_value,
- ipr.equip_value
+ ipr.equip_value,
+ ip.method_s
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
@@ -148,7 +149,8 @@
template_id,
ipr.ins_value,
ipr.com_value,
- ipr.equip_value
+ ipr.equip_value,
+ ip.method_s
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
@@ -216,6 +218,7 @@
<result property="createTime" column="ip_create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="ip_update_time" jdbcType="TIMESTAMP"/>
<result property="templateId" column="template_id" jdbcType="INTEGER"/>
+ <result property="methodS" column="method_s"/>
<collection property="insProductResult" resultMap="insProductResult"/>
</resultMap>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 87cdec8..8436085 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -67,7 +67,7 @@
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
- password: null
+ password: 123456
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
timeout: 50
# redis杩炴帴姹犻厤缃�
diff --git a/system-run/src/main/resources/application-prod.yml b/system-run/src/main/resources/application-prod.yml
index bb8421b..a911969 100644
--- a/system-run/src/main/resources/application-prod.yml
+++ b/system-run/src/main/resources/application-prod.yml
@@ -55,7 +55,6 @@
useGlobalDataSourceStat: true #鍚堝苟澶氫釜DruidDatasource鐨勭洃鎺ф暟鎹�
connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500; #閫氳繃connectProperties灞炴�ф潵鎵撳紑mergesql鍔熻兘缃楁參sQL璁板綍
-
redis:
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
--
Gitblit v1.9.3