From e05875fa75605595b192fca04e598598cb2f2931 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 九月 2024 17:45:07 +0800
Subject: [PATCH] 代码优化+检验下单新增字段下发至对象
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java | 2
inspect-server/src/main/resources/mapper/StandardProductListMapper.xml | 10
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java | 3
inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java | 4
user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java | 10
inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml | 33 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 8
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 30 -
inspect-server/pom.xml | 4
inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java | 11
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java | 2
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java | 1
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java | 6
inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto.java | 18 +
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 138 +------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 6
user-server/src/main/java/com/yuanchu/mom/service/RoleService.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 91 +++-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 272 +++------------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 198 ++---------
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 13
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java | 12
/dev/null | 20 -
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 2
user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java | 9
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 4
cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java | 19 -
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 1
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 17
user-server/src/main/java/com/yuanchu/mom/service/impl/UserServiceImp.java | 3
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 6
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java | 7
inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java | 8
38 files changed, 325 insertions(+), 654 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
index 2725613..49b6559 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DeviceController.java
@@ -7,10 +7,8 @@
import com.yuanchu.mom.dto.DataConfigDto;
import com.yuanchu.mom.dto.DeviceDto;
import com.yuanchu.mom.pojo.Device;
-import com.yuanchu.mom.pojo.PkMaster;
import com.yuanchu.mom.service.DataConfigService;
import com.yuanchu.mom.service.DeviceService;
-import com.yuanchu.mom.service.PkMasterService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -46,9 +44,6 @@
@Autowired
private DataConfigService dataConfigService;
-
- @Autowired
- private PkMasterService pkMasterService;
@ValueClassify("璁惧")
@ApiOperation(value = "鏌ヨ璁惧璇︽儏鍒楄〃")
@@ -203,13 +198,6 @@
}
- @ValueClassify("璁惧")
- @ApiOperation(value = "娓╁害寰幆鏁伴噰")
- @PostMapping("/temDataAcquisition")
- public Result<?> temDataAcquisition(@RequestBody PkMaster pkMaster) {
- return Result.success(pkMasterService.temDataAcquisition(pkMaster));
- }
-
@ApiOperation(value = "宸︿晶璁惧鏍戝舰鏍�")
@GetMapping("/treeDevice")
@ValueAuth
@@ -217,11 +205,4 @@
return Result.success(deviceService.treeDevice(deviceName));
}
-
- @ApiOperation(value = "娓╁害寰幆鏁伴噰鎬讳綋")
- @PostMapping("/temDataAcquisition2")
- @ValueAuth
- public Result<?> temDataAcquisition2(@RequestBody PkMaster pkMaster) {
- return Result.success(pkMasterService.temDataAcquisition2(pkMaster));
- }
}
\ No newline at end of file
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/PkMasterController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/PkMasterController.java
deleted file mode 100644
index 72d21e0..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/PkMasterController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:26
- */
-@RestController
-@RequestMapping("/pkMaster")
-public class PkMasterController {
-
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/PkSlaveController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/PkSlaveController.java
deleted file mode 100644
index 098c425..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/PkSlaveController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:39
- */
-@RestController
-@RequestMapping("/pkSlave")
-public class PkSlaveController {
-
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkMasterMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkMasterMapper.java
deleted file mode 100644
index 85464d7..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkMasterMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.PkMaster;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:26
- */
-public interface PkMasterMapper extends BaseMapper<PkMaster> {
-
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java
deleted file mode 100644
index 0d74e51..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/PkSlaveMapper.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.PkSlave;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:39
- */
-public interface PkSlaveMapper extends BaseMapper<PkSlave> {
-
- List<PkSlave> selectList1(@Param("isid") String isid);
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkMaster.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkMaster.java
deleted file mode 100644
index 7a863c6..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkMaster.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:26
- */
-@Getter
-@Setter
-@TableName("device_pk_master")
-@ApiModel(value = "PkMaster瀵硅薄", description = "娓╁害寰幆鏁伴噰瀛愯〃")
-public class PkMaster extends OrderBy implements Serializable {
-
-
- @ApiModelProperty("涓婚敭id")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("濮旀墭鍗曠紪鍙�")
- private String entrustCode;
-
- @ApiModelProperty("鏍峰搧缂栧彿")
- private String sampleCode;
-
- @ApiModelProperty("鍨嬪彿")
- private String model;
-
- @ApiModelProperty("寰幆娆℃暟")
- private String cycles;
-
- @ApiModelProperty("娓╁害寰幆")
- private String temperature;
-
- @ApiModelProperty("鍏夌氦鏍规暟")
- private Integer numberOpticalFibers;
-
- @ApiModelProperty("device_pk_slave鍏宠仈瀛楁")
- private String isid;
-
- @ApiModelProperty("妫�楠屾椂闂�")
- private LocalDateTime detectionDate;
-
- @ApiModelProperty("妫�楠屼汉")
- private String detectionPeople;
-
-
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkSlave.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkSlave.java
deleted file mode 100644
index ac89dfe..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/PkSlave.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:39
- */
-@Getter
-@Setter
-@TableName("device_pk_slave")
-@ApiModel(value = "PkSlave瀵硅薄", description = "娓╁害寰幆鏁伴噰瀛愯〃")
-public class PkSlave extends OrderBy implements Serializable {
-
- @ApiModelProperty("涓婚敭id")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("琛板噺绯荤粺1310(dB/km)-A绔�")
- private Double weaken1310A;
-
- @ApiModelProperty("琛板噺绯荤粺1310(dB/km)-B绔�")
- private Double weaken1310B;
-
- @ApiModelProperty("琛板噺绯荤粺1550(dB/km)-A绔�")
- private Double weaken1550A;
-
- @ApiModelProperty("琛板噺绯荤粺1550(dB/km)-B绔�")
- private Double weaken1550B;
-
- @ApiModelProperty("琛板噺绯荤粺1625(dB/km)-A绔�")
- private Double weaken1625A;
-
- @ApiModelProperty("琛板噺绯荤粺1625(dB/km)-B绔�")
- private Double weaken1625B;
-
- @ApiModelProperty("琛板噺绯荤粺1383(dB/km)-A绔�")
- private Double weaken1383A;
-
- @ApiModelProperty("琛板噺绯荤粺1383(dB/km)-B绔�")
- private Double weaken1383B;
-
- @ApiModelProperty("琛板噺绯荤粺1490(dB/km)-A绔�")
- private Double weaken1490A;
-
- @ApiModelProperty("琛板噺绯荤粺1490(dB/km)-B绔�")
- private Double weaken1490B;
-
- @ApiModelProperty("绠¤壊鏍噄d")
- private String insBushingId;
-
- @ApiModelProperty("鍏夌氦甯d")
- private String insFibersId;
-
- @ApiModelProperty("鍏夌氦缂栧彿id")
- private String insFiberId;
-
- @ApiModelProperty("device_pk_master鍏宠仈瀛楁")
- private String shiftId;
-
- @ApiModelProperty("鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java
deleted file mode 100644
index 346adf8..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/PkMasterService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.PkMaster;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:26
- */
-public interface PkMasterService extends IService<PkMaster> {
-
- //娓╁害寰幆鏁伴噰
- int temDataAcquisition(PkMaster pkMaster);
-
- //娓╁害寰幆鏁伴噰鎬讳綋
- int temDataAcquisition2(PkMaster pkMaster);
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/PkSlaveService.java b/cnas-server/src/main/java/com/yuanchu/mom/service/PkSlaveService.java
deleted file mode 100644
index cdb6532..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/PkSlaveService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.PkSlave;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:39
- */
-public interface PkSlaveService extends IService<PkSlave> {
-
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java
deleted file mode 100644
index 79469ea..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java
+++ /dev/null
@@ -1,470 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.yuanchu.mom.common.GetLook;
-import com.yuanchu.mom.exception.ErrorException;
-import com.yuanchu.mom.mapper.*;
-import com.yuanchu.mom.pojo.*;
-import com.yuanchu.mom.service.InsOrderPlanService;
-import com.yuanchu.mom.service.PkMasterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.vo.ProductVo;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:26
- */
-@Service
-public class PkMasterServiceImpl extends ServiceImpl<PkMasterMapper, PkMaster> implements PkMasterService {
-
- @Resource
- private PkMasterMapper pkMasterMapper;
-
- @Resource
- private PkSlaveMapper pkSlaveMapper;
-
- @Resource
- private InsOrderMapper insOrderMapper;
-
- @Resource
- private InsSampleMapper insSampleMapper;
-
- @Resource
- private InsProductMapper insProductMapper;
-
- @Resource
- private InsProductResultMapper insProductResultMapper;
-
- @Resource
- private InsProductUserMapper insProductUserMapper;
-
- @Resource
- private UserMapper userMapper;
-
- @Resource
- private InsOrderPlanService insOrderPlanService;
-
- @Resource
- GetLook getLook;
-
- //娓╁害寰幆鏁伴噰
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int temDataAcquisition(PkMaster pkMaster) {
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- //鏌ヨ鏁伴噰鍏宠仈鐨勫瓙琛ㄤ俊鎭�
- PkMaster master = pkMasterMapper.selectOne(Wrappers.<PkMaster>lambdaQuery()
- .eq(PkMaster::getEntrustCode, pkMaster.getEntrustCode())
- .eq(PkMaster::getSampleCode, pkMaster.getSampleCode())
- .eq(PkMaster::getModel, pkMaster.getModel())
- .eq(PkMaster::getTemperature, pkMaster.getTemperature()));
- if (ObjectUtils.isNotEmpty(master)) {
- //throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode() + "鐨勬暟閲囨暟鎹�");
- List<PkSlave> pkSlaves = pkSlaveMapper.selectList1(master.getIsid());
- if (CollectionUtils.isEmpty(pkSlaves)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode() + "鐨勬暟閲囧瓙鏁版嵁");
- }
- //鏌ヨ瀵瑰簲鐨勬楠屽崟琛�
- InsOrder insOrder = insOrderMapper.selectOne(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).eq(InsOrder::getEntrustCode, pkMaster.getEntrustCode()));
- if (ObjectUtils.isEmpty(insOrder)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode());
- }
- //鏌ヨ瀵瑰簲妫�楠屾牱鍝乮d
- InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, insOrder.getId())
- .eq(InsSample::getSampleCode, pkMaster.getSampleCode())
- .eq(InsSample::getModel, pkMaster.getModel()));
- if (ObjectUtils.isEmpty(insSample)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗曚笅鐨勮鏍峰搧" + pkMaster.getSampleCode());
- }
- //鏌ヨ瀵瑰簲妫�楠岄」鐩�
- Map<String, Object> map = insOrderPlanService.temCycle(insSample.getId(), pkMaster.getCycles(), pkMaster.getTemperature());
- List<ProductVo> productVos = (List<ProductVo>) map.get("productVos");
- if (CollectionUtils.isNotEmpty(productVos)) {
- for (PkSlave pkSlave : pkSlaves) {
- for (ProductVo productVo : productVos) {
- if (pkSlave.getInsBushingId().equals(productVo.getBushColor()) &&
- pkSlave.getInsFibersId().equals(productVo.getCode()) &&
- pkSlave.getInsFiberId().equals(productVo.getColor())) {
- //鎵惧埌瀵瑰簲鐨勬暟鎹�(瀵瑰簲濂楃鍏夌氦鐨勬暟鎹�)
- List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, productVo.getInsProduct().getId()));
- InsProductResult result;
- if (CollectionUtils.isEmpty(results)) {
- result = new InsProductResult();
- } else {
- result = results.get(0);
- }
- result.setInsProductId(productVo.getInsProduct().getId());//妫�楠岄」鐩甶d
- List<Map<String, Object>> iv = new ArrayList<>();
- List<Map<String, Object>> cv = new ArrayList<>();
- if (productVo.getInsProduct().getInspectionItemClass().equals("1310nm")) {
- //1310nm澶栫
- Map<String, Object> map1 = new HashMap<>();
- map1.put("u", userId + "");
- map1.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1310A()) ? pkSlave.getWeaken1310A().toString() : null);
- iv.add(map1);
- //1310nm鍐呯
- Map<String, Object> map2 = new HashMap<>();
- map2.put("u", userId + "");
- map2.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1310B()) ? pkSlave.getWeaken1310B().toString() : null);
- iv.add(map2);
- //1310nm琛板噺绯绘暟
- Map<String, Object> map3 = new HashMap<>();
- double v = 0.0;
- if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1310A()) && ObjectUtils.isNotEmpty(pkSlave.getWeaken1310B())) {
- v = (pkSlave.getWeaken1310A() + pkSlave.getWeaken1310B()) / 2;
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1310A()) && ObjectUtils.isEmpty(pkSlave.getWeaken1310B())) {
- v = pkSlave.getWeaken1310A();
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1310B()) && ObjectUtils.isEmpty(pkSlave.getWeaken1310A())) {
- v = pkSlave.getWeaken1310B();
- } else {
- throw new ErrorException("1310鐨勪袱绔兘娌℃湁鏁版嵁!!!");
- }
- BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
- map3.put("v", String.valueOf(decimal));
- cv.add(map3);
- } else if (productVo.getInsProduct().getInspectionItemClass().equals("1550nm")) {
- //1550nm澶栫
- Map<String, Object> map1 = new HashMap<>();
- map1.put("u", userId + "");
- map1.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1550A()) ? pkSlave.getWeaken1550A().toString() : null);
- iv.add(map1);
- //1550nm鍐呯
- Map<String, Object> map2 = new HashMap<>();
- map2.put("u", userId + "");
- map2.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1550B()) ? pkSlave.getWeaken1550B().toString() : null);
- iv.add(map2);
- //1550nm琛板噺绯绘暟
- Map<String, Object> map3 = new HashMap<>();
- double v = 0.0;
- if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1550A()) && ObjectUtils.isNotEmpty(pkSlave.getWeaken1550B())) {
- v = (pkSlave.getWeaken1550A() + pkSlave.getWeaken1550B()) / 2;
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1550A()) && ObjectUtils.isEmpty(pkSlave.getWeaken1550B())) {
- v = pkSlave.getWeaken1550A();
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1550B()) && ObjectUtils.isEmpty(pkSlave.getWeaken1550A())) {
- v = pkSlave.getWeaken1550B();
- } else {
- throw new ErrorException("1550鐨勪袱绔兘娌℃湁鏁版嵁!!!");
- }
- BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
- map3.put("v", String.valueOf(decimal));
- cv.add(map3);
- } else if (productVo.getInsProduct().getInspectionItemClass().equals("1625nm")) {
- //1625nm澶栫
- Map<String, Object> map1 = new HashMap<>();
- map1.put("u", userId + "");
- map1.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1625A()) ? pkSlave.getWeaken1625A().toString() : null);
- iv.add(map1);
- //1625nm鍐呯
- Map<String, Object> map2 = new HashMap<>();
- map2.put("u", userId + "");
- map2.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1625B()) ? pkSlave.getWeaken1625B().toString() : null);
- iv.add(map2);
- //1625nm琛板噺绯绘暟
- Map<String, Object> map3 = new HashMap<>();
- double v = 0.0;
- if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1625A()) && ObjectUtils.isNotEmpty(pkSlave.getWeaken1625B())) {
- v = (pkSlave.getWeaken1625A() + pkSlave.getWeaken1625B()) / 2;
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1625A()) && ObjectUtils.isEmpty(pkSlave.getWeaken1625B())) {
- v = pkSlave.getWeaken1625A();
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1625B()) && ObjectUtils.isEmpty(pkSlave.getWeaken1625A())) {
- v = pkSlave.getWeaken1625B();
- } else {
- throw new ErrorException("1625鐨勪袱绔兘娌℃湁鏁版嵁!!!");
- }
- BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
- map3.put("v", String.valueOf(decimal));
- cv.add(map3);
- } else if (productVo.getInsProduct().getInspectionItemClass().equals("1383nm")) {
- //1383nm澶栫
- Map<String, Object> map1 = new HashMap<>();
- map1.put("u", userId + "");
- map1.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1383A()) ? pkSlave.getWeaken1383A().toString() : null);
- iv.add(map1);
- //1383nm鍐呯
- Map<String, Object> map2 = new HashMap<>();
- map2.put("u", userId + "");
- map2.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1383B()) ? pkSlave.getWeaken1383B().toString() : null);
- iv.add(map2);
- //1383nm琛板噺绯绘暟
- Map<String, Object> map3 = new HashMap<>();
- double v = 0.0;
- if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1383A()) && ObjectUtils.isNotEmpty(pkSlave.getWeaken1383B())) {
- v = (pkSlave.getWeaken1383A() + pkSlave.getWeaken1310B()) / 2;
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1383A()) && ObjectUtils.isEmpty(pkSlave.getWeaken1383B())) {
- v = pkSlave.getWeaken1383A();
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1383B()) && ObjectUtils.isEmpty(pkSlave.getWeaken1383A())) {
- v = pkSlave.getWeaken1383B();
- } else {
- throw new ErrorException("1383鐨勪袱绔兘娌℃湁鏁版嵁!!!");
- }
- BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
- map3.put("v", String.valueOf(decimal));
- cv.add(map3);
- } else if (productVo.getInsProduct().getInspectionItemClass().equals("1490nm")) {
- //1490nm澶栫
- Map<String, Object> map1 = new HashMap<>();
- map1.put("u", userId + "");
- map1.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1490A()) ? pkSlave.getWeaken1490A().toString() : null);
- iv.add(map1);
- //1490nm鍐呯
- Map<String, Object> map2 = new HashMap<>();
- map2.put("u", userId + "");
- map2.put("v", ObjectUtils.isNotEmpty(pkSlave.getWeaken1490B()) ? pkSlave.getWeaken1490B().toString() : null);
- iv.add(map2);
- //1490nm琛板噺绯绘暟
- Map<String, Object> map3 = new HashMap<>();
- double v = 0.0;
- if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1490A()) && ObjectUtils.isNotEmpty(pkSlave.getWeaken1490B())) {
- v = (pkSlave.getWeaken1490A() + pkSlave.getWeaken1310B()) / 2;
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1490A()) && ObjectUtils.isEmpty(pkSlave.getWeaken1490B())) {
- v = pkSlave.getWeaken1490A();
- } else if (ObjectUtils.isNotEmpty(pkSlave.getWeaken1490B()) && ObjectUtils.isEmpty(pkSlave.getWeaken1490A())) {
- v = pkSlave.getWeaken1490B();
- } else {
- throw new ErrorException("1490鐨勪袱绔兘娌℃湁鏁版嵁!!!");
- }
- BigDecimal decimal = BigDecimal.valueOf(v).setScale(3, RoundingMode.HALF_UP);
- map3.put("v", String.valueOf(decimal));
- cv.add(map3);
- } else {
- throw new ErrorException("娌℃湁鎵惧埌璇ユ俯搴︾殑妫�楠岄」鐩�" + productVo.getInsProduct().getInspectionItemClass());
- }
- result.setInsValue(JSON.toJSONString(iv));//妫�楠屽��
- result.setComValue(JSON.toJSONString(cv));//璁＄畻鍊�
- if (BeanUtil.isEmpty(result.getId())) {
- result.setCreateUser(userId);
- result.setUpdateUser(userId);
- insProductResultMapper.insert(result);
- } else {
- result.setUpdateUser(userId);
- result.setUpdateTime(LocalDateTime.now());
- insProductResultMapper.updateById(result);
- }
-
- InsProduct insProduct = productVo.getInsProduct();
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- String comple = insProductResult.getComValue().split(":")[1].split("\"")[1];
- //棣栧厛鏌ョ湅娓╁害鏄惁鏄�20搴﹀父娓�
- if (!pkMaster.getTemperature().equals("20鈩�(甯告俯)")) {
- //濡傛灉涓嶆槸鍏堟煡璇㈡槸鍚︽湁鍊�
- int a = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")).stream().map(InsProduct::getInsResult).anyMatch(ObjectUtils::isEmpty) ? 1 : 0;
- if (a == 1) {
- throw new ErrorException("鍏堣幏鍙�20鈩�(甯告俯)鐨勬楠屽��,鍐嶈幏鍙栧叾浠栨俯搴�" + pkMaster.getSampleCode());
- } else {
- //璁＄畻琛板噺宸�
- InsProduct insPro = null;
- switch (insProduct.getInspectionItemClass()) {
- case "1310nm":
- //鏌ヨ20鈩�(甯告俯)1310nm鐨勮“鍑忕郴鏁�
- try {
- insPro = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, "1310nm")
- .eq(InsProduct::getInsFiberId, productVo.getInsProduct().getInsFiberId()));
- } catch (Exception e) {
- throw new ErrorException("娌℃湁鏌ュ埌20鈩�(甯告俯),1310nm椤圭洰" + productVo.getInsProduct().getInsFiberId() + "鍏夌氦鐨勬楠岄」鐩�");
- }
- break;
- case "1550nm":
- //鏌ヨ20鈩�(甯告俯)1550nm鐨勮“鍑忕郴鏁�
- try {
- insPro = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, "1550nm")
- .eq(InsProduct::getInsFiberId, productVo.getInsProduct().getInsFiberId()));
- } catch (Exception e) {
- throw new ErrorException("娌℃湁鏌ュ埌20鈩�(甯告俯),1625nm椤圭洰" + productVo.getInsProduct().getInsFiberId() + "鍏夌氦鐨勬楠岄」鐩�");
- }
- break;
- case "1625nm":
- //鏌ヨ20鈩�(甯告俯)1625nm鐨勮“鍑忕郴鏁�
- try {
- insPro = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, "1625nm")
- .eq(InsProduct::getInsFiberId, productVo.getInsProduct().getInsFiberId()));
- } catch (Exception e) {
- throw new ErrorException("娌℃湁鏌ュ埌20鈩�(甯告俯),1625nm椤圭洰" + productVo.getInsProduct().getInsFiberId() + "鍏夌氦鐨勬楠岄」鐩�");
- }
- break;
- case "1383nm":
- //鏌ヨ20鈩�(甯告俯)1383nm鐨勮“鍑忕郴鏁�
- try {
- insPro = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, "1383nm")
- .eq(InsProduct::getInsFiberId, productVo.getInsProduct().getInsFiberId()));
- } catch (Exception e) {
- throw new ErrorException("娌℃湁鏌ュ埌20鈩�(甯告俯),1383nm椤圭洰" + productVo.getInsProduct().getInsFiberId() + "鍏夌氦鐨勬楠岄」鐩�");
- }
- break;
- case "1490nm":
- //鏌ヨ20鈩�(甯告俯)1490nm鐨勮“鍑忕郴鏁�
- try {
- insPro = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, "1490nm")
- .eq(InsProduct::getInsFiberId, productVo.getInsProduct().getInsFiberId()));
- } catch (Exception e) {
- throw new ErrorException("娌℃湁鏌ュ埌20鈩�(甯告俯),1490nm椤圭洰" + productVo.getInsProduct().getInsFiberId() + "鍏夌氦鐨勬楠岄」鐩�");
- }
- break;
- }
- InsProductResult insProductRes = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insPro.getId()));
- double abs = Math.abs(Double.parseDouble(insProductRes.getComValue().split(":")[1].split("\"")[1]) - Double.parseDouble(comple));
- BigDecimal scale = BigDecimal.valueOf(abs).setScale(3, RoundingMode.HALF_UP);
- insProduct.setLastValue(String.valueOf(scale));
- String ask = insProduct.getAsk();
- int insResult = 1;
- switch (ask.charAt(0)) {
- case '<':
- insResult = Double.parseDouble(insProduct.getLastValue()) < Double.parseDouble(ask.substring(1)) ? 1 : 0;
- break;
- case '>':
- insResult = Double.parseDouble(insProduct.getLastValue()) > Double.parseDouble(ask.substring(1)) ? 1 : 0;
- break;
- case '=':
- insResult = Double.parseDouble(insProduct.getLastValue()) == Double.parseDouble(ask.substring(1)) ? 1 : 0;
- break;
- case '鈮�':
- insResult = Double.parseDouble(insProduct.getLastValue()) <= Double.parseDouble(ask.substring(1)) ? 1 : 0;
- break;
- case '鈮�':
- insResult = Double.parseDouble(insProduct.getLastValue()) >= Double.parseDouble(ask.substring(1)) ? 1 : 0;
- break;
- }
- insProduct.setInsResult(insResult);
- }
- } else {
- //濡傛灉鏄�20搴﹀父娓�,闇�瑕佺粰鍑哄悎鏍肩殑缁撹
- insProduct.setInsResult(1);//20搴﹀父娓╃殑妫�楠岄」榛樿涓哄悎鏍�
- }
- insProduct.setUpdateUser(userId);
- insProductMapper.updateById(insProduct);
- User user = userMapper.selectOne(Wrappers.<User>lambdaQuery().eq(User::getAccount, master.getDetectionPeople()));
- if (ObjectUtils.isEmpty(user)) {
- throw new ErrorException("lims绯荤粺娌℃湁鎵惧埌璇ョ敤鎴�" + master.getDetectionPeople());
- }
- insProductUserMapper.insert(new InsProductUser(null, user.getId(), master.getDetectionDate(), insProduct.getId()));
- }
- }
- }
- }
- //缁欐俯搴﹀惊鐜殑妫�楠岄」鐩粦瀹氳澶�
- InsProduct product = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getState, 1)
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getInspectionItem, "娓╁害寰幆"));
- if (ObjectUtils.isEmpty(product)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗曚笅璇ユ牱鍝佺殑鐩稿叧娓╁害寰幆妫�楠岄」鐩�");
- }
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, product.getId()));
- if (ObjectUtils.isEmpty(insProductResult)) {
- insProductResult = new InsProductResult();
- insProductResult.setInsProductId(product.getId());
- }
- if (ObjectUtils.isEmpty(insProductResult.getEquipValue())) {
- List<Map<String, Object>> dv = new ArrayList<>();
- Map<String, Object> map4 = new HashMap<>();
- map4.put("v", "JCZX-TX-TT02006");
- dv.add(map4);
- Map<String, Object> map5 = new HashMap<>();
- map5.put("v", "JCZX-TX-TT02001");
- dv.add(map5);
- insProductResult.setEquipValue(JSON.toJSONString(dv));
- List<Map<String, Object>> dn = new ArrayList<>();
- Map<String, Object> map6 = new HashMap<>();
- map6.put("v", "姝ュ叆寮忛珮浣庢俯婀跨儹璇曢獙绠�");
- dn.add(map6);
- Map<String, Object> map7 = new HashMap<>();
- map7.put("v", "姝ュ叆寮忛珮浣庢俯璇曢獙绠�");
- dn.add(map7);
- insProductResult.setEquipName(JSON.toJSONString(dn));
- if (BeanUtil.isEmpty(insProductResult.getId())) {
- insProductResult.setCreateUser(userId);
- insProductResult.setUpdateUser(userId);
- insProductResultMapper.insert(insProductResult);
- } else {
- insProductResult.setUpdateUser(userId);
- insProductResult.setUpdateTime(LocalDateTime.now());
- insProductResultMapper.updateById(insProductResult);
- }
- }
- }
- return 0;
- }
-
- //娓╁害寰幆鏁伴噰鎬讳綋
- @Override
- @Transactional(rollbackFor = Exception.class)
- public int temDataAcquisition2(PkMaster pkMaster) {
- //鏌ヨ鍑烘墍鏈夊惊鐜鏁板拰娓╁害,鐒跺悗寰幆璋冪敤temDataAcquisition鎺ュ彛
- //鏌ヨ瀵瑰簲鐨勬楠屽崟琛�
- InsOrder insOrder = insOrderMapper.selectOne(Wrappers.<InsOrder>lambdaQuery().eq(InsOrder::getState, 1).eq(InsOrder::getEntrustCode, pkMaster.getEntrustCode()));
- if (ObjectUtils.isEmpty(insOrder)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗�" + pkMaster.getEntrustCode());
- }
- //鏌ヨ瀵瑰簲妫�楠屾牱鍝乮d
- InsSample insSample = insSampleMapper.selectOne(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, insOrder.getId())
- .eq(InsSample::getSampleCode, pkMaster.getSampleCode())
- .eq(InsSample::getModel, pkMaster.getModel()));
- if (ObjectUtils.isEmpty(insSample)) {
- throw new ErrorException("娌℃湁鎵惧埌瀵瑰簲濮旀墭鍗曚笅鐨勮鏍峰搧" + pkMaster.getSampleCode());
- }
- //鏌ユ壘鏍峰搧涓嬫墍鏈夋俯搴﹀惊鐜殑椤圭洰
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, insSample.getId())
- .eq(InsProduct::getState, 1)
- .isNull(InsProduct::getTemplateId)
- .isNotNull(InsProduct::getInspectionItemClass));
- //杩囨护鍑烘墍鏈夊惊鐜鏁板拰娓╁害
- List<String> collect1 = insProducts.stream().map(InsProduct::getInspectionItem).distinct().collect(Collectors.toList());
- List<String> collect2 = insProducts.stream().map(InsProduct::getInspectionItemSubclass).distinct().collect(Collectors.toList());
- for (String s : collect1) {
- for (String s1 : collect2) {
- PkMaster master = new PkMaster();
- master.setEntrustCode(pkMaster.getEntrustCode());
- master.setSampleCode(pkMaster.getSampleCode());
- master.setModel(pkMaster.getModel());
- master.setCycles(s);
- master.setTemperature(s1);
- temDataAcquisition(master);
- }
- }
- return 0;
- }
-}
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkSlaveServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkSlaveServiceImpl.java
deleted file mode 100644
index e620b8b..0000000
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkSlaveServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.yuanchu.mom.pojo.PkSlave;
-import com.yuanchu.mom.mapper.PkSlaveMapper;
-import com.yuanchu.mom.service.PkSlaveService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-07-29 01:16:39
- */
-@Service
-public class PkSlaveServiceImpl extends ServiceImpl<PkSlaveMapper, PkSlave> implements PkSlaveService {
-
-}
diff --git a/cnas-server/src/main/resources/mapper/PkMasterMapper.xml b/cnas-server/src/main/resources/mapper/PkMasterMapper.xml
deleted file mode 100644
index c64186a..0000000
--- a/cnas-server/src/main/resources/mapper/PkMasterMapper.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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.PkMasterMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.PkMaster">
- <id column="id" property="id" />
- <result column="entrust_code" property="entrustCode" />
- <result column="sample_code" property="sampleCode" />
- <result column="model" property="model" />
- <result column="cycles" property="cycles" />
- <result column="temperature" property="temperature" />
- <result column="number_optical_fibers" property="numberOpticalFibers" />
- <result column="ISID" property="isid" />
- <result column="detection_date" property="detectionDate" />
- <result column="detection_people" property="detectionPeople" />
- </resultMap>
-
-</mapper>
diff --git a/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml b/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml
deleted file mode 100644
index adccb35..0000000
--- a/cnas-server/src/main/resources/mapper/PkSlaveMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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.PkSlaveMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.PkSlave">
- <id column="id" property="id" />
- <result column="weaken_1310_A" property="weaken1310A" />
- <result column="weaken_1310_B" property="weaken1310B" />
- <result column="weaken_1550_A" property="weaken1550A" />
- <result column="weaken_1550_B" property="weaken1550B" />
- <result column="weaken_1625_A" property="weaken1625A" />
- <result column="weaken_1625_B" property="weaken1625B" />
- <result column="weaken_1383_A" property="weaken1383A" />
- <result column="weaken_1383_B" property="weaken1383B" />
- <result column="weaken_1490_A" property="weaken1490A" />
- <result column="weaken_1490_B" property="weaken1490B" />
- <result column="ins_bushing_id" property="insBushingId" />
- <result column="ins_fibers_id" property="insFibersId" />
- <result column="ins_fiber_id" property="insFiberId" />
- <result column="shift_id" property="shiftId" />
- <result column="create_time" property="createTime" />
- </resultMap>
-
- <select id="selectList1" resultMap="BaseResultMap">
- select * from device_pk_slave where shift_id=#{isid}
- </select>
-</mapper>
diff --git a/inspect-server/pom.xml b/inspect-server/pom.xml
index f467ec8..e87287c 100644
--- a/inspect-server/pom.xml
+++ b/inspect-server/pom.xml
@@ -73,5 +73,9 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.13.0</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java
deleted file mode 100644
index 92ae84f..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsBushingController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.service.InsBushingService;
-import com.yuanchu.mom.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫绠¤〃 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:58:16
- */
-@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-濂楃")
-@AllArgsConstructor
-@RestController
-@RequestMapping("/insBushing")
-public class InsBushingController {
-
- private InsBushingService insBushingService;
-
- @ValueAuth
- @ApiModelProperty("/閫氳繃鏍峰搧id鑾峰彇鏍峰搧涓嬪厜绾ら厤缃唴瀹�")
- @PostMapping("/selectBushingBySampleId")
- public Result<?> selectBushingBySampleId(Integer sampleId){
- return Result.success(insBushingService.selectBushingBySampleId(sampleId));
- }
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
deleted file mode 100644
index 82a564b..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFiberController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:01
- */
-@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-鍏夌氦琛�")
-@AllArgsConstructor
-@RestController
-@RequestMapping("/insFiber")
-public class InsFiberController {
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java
deleted file mode 100644
index f8accf9..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsFibersController.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.yuanchu.mom.controller;
-
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:13
- */
-@Api(tags = "妫�楠屼笅鍗�-鍏夌氦閰嶇疆-鍏夌氦甯﹁〃")
-@AllArgsConstructor
-@RestController
-@RequestMapping("/insFibers")
-public class InsFibersController {
-
-}
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 4695229..b7eedcc 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
@@ -67,6 +67,7 @@
public Result<?> upInsOrder(Integer orderId, Integer sampleId, String appointed, Integer userId,String sonLaboratory) {
return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId,sonLaboratory));
}
+
@ValueClassify("妫�楠屼笅鍗�")
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/addInsOrder")
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 7dde23f..724cb63 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
@@ -24,6 +24,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -78,13 +79,6 @@
return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
}
- @ApiOperation(value = "鍒囨崲濂楃/鍏夌氦/鍏夌氦甯﹁褰曟ā鐗堟煡璇㈡楠屽唴瀹�")
- @PostMapping("/getReportModel")
- @ValueAuth
- public Result<?> getReportModel(Integer sampleId) {
- return Result.success(insOrderPlanService.getReportModel(sampleId));
- }
-
@ValueAuth
@PostMapping("/getInsProduct")
@ApiOperation("鑾峰彇妫�楠岄」鐩拰妯℃澘鍐呭")
@@ -109,7 +103,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "澶嶆牳妫�楠屼换鍔�")
@PostMapping("/verifyPlan")
- public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
}
@@ -185,13 +179,6 @@
@ValueAuth
public Result<?> write(@RequestBody InsProductDto insProductDto) {
return Result.success(insProductService.write(insProductDto));
- }
-
- @ValueAuth
- @ApiOperation(value = "娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)")
- @PostMapping("/temCycle")
- public Result<?> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
- return Result.success(insOrderPlanService.temCycle(sampleId, inspectionItem, inspectionItemSubclass));
}
@ValueClassify("妫�楠屼换鍔�")
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
index 8a05af5..7029913 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsReportController.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.InsReportDto;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.service.InsReportService;
@@ -149,10 +150,17 @@
return Result.success(insReportService.upAll(file));
}
+ @ValueAuth
+ @ApiOperation(value = "鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�")
+ @GetMapping("/getInsOrderStateCount")
+ public Result getInsOrderStateCount(Integer id){
+ return Result.success(insReportService.getInsOrderStateCount(id));
+ }
+
@ValueClassify("鎶ュ憡缂栧埗")
@ApiOperation(value = "鍒ゆ柇鏄惁鐢熸垚鎬绘姤鍛�")
@PostMapping("/isReport")
- public Result isReport(Integer id,Integer state) {
- return Result.success(insReportService.isReport(id,state));
+ public Result isReport(@RequestBody InsReportDto insReportDto) {
+ return Result.success(insReportService.isReport(insReportDto));
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
index ce2e8d0..f4aacc9 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/SampleOrderController.java
@@ -19,6 +19,7 @@
public class SampleOrderController {
private SampleOrderService sampleOrderService;
+
@ValueAuth
@GetMapping("/list")
public Result list() {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/BushingDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/BushingDto.java
deleted file mode 100644
index 044ed72..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/BushingDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.yuanchu.mom.pojo.InsBushing;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BushingDto extends InsBushing {
-
- private List<FiberDto> fiber;
-
- private List<FibersDto> fibers;
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/FiberDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/FiberDto.java
deleted file mode 100644
index 96fda3c..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/FiberDto.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.yuanchu.mom.pojo.InsFiber;
-import com.yuanchu.mom.pojo.InsProduct;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FiberDto extends InsFiber {
-
- private List<InsProduct> productList;
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/FibersDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/FibersDto.java
deleted file mode 100644
index 80f6775..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/FibersDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.yuanchu.mom.pojo.InsFibers;
-import com.yuanchu.mom.pojo.InsProduct;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FibersDto extends InsFibers {
-
- private List<FiberDto> fiber;
-
- private List<InsProduct> productList;
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto.java
new file mode 100644
index 0000000..8c3d3f6
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto.java
@@ -0,0 +1,18 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class InsReportDto {
+
+ //璁㈠崟id
+ private Integer id;
+
+ //鐢熸垚涓嶇敓鐢熸垚
+ private Integer state;
+
+ //閫夋嫨鐨勬瘡涓珯鐐圭殑绗嚑娆℃暟鎹�
+ private List<InsReportDto1> insReportDto1s;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java
new file mode 100644
index 0000000..c3fc8b2
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/InsReportDto1.java
@@ -0,0 +1,11 @@
+package com.yuanchu.mom.dto;
+
+import lombok.Data;
+
+@Data
+public class InsReportDto1 {
+
+ private String laboratory;
+
+ private Integer num;
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
index bef9b77..a8015ff 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
@@ -11,8 +11,6 @@
private List<InsProduct> insProduct;
- private List<BushingDto> bushing;
-
private List<SampleProductDto> childSampleList;
private InsulatingDto insulating;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
index 8fe28d9..26c702c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto3.java
@@ -11,8 +11,6 @@
private List<InsProduct> insProduct;
- private List<BushingDto> bushing;
-
private List<SampleProductDto3> childSampleList;
private InsulatingDto insulating;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java
deleted file mode 100644
index 09d3d13..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsBushingMapper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.dto.FiberDto;
-import com.yuanchu.mom.dto.FibersDto;
-import com.yuanchu.mom.pojo.InsBushing;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫绠¤〃 Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:58:16
- */
-public interface InsBushingMapper extends BaseMapper<InsBushing> {
-
- List<FibersDto> selectFibersByBushingId(Integer bushingId);
-
- List<FiberDto> selectFiberByBushingId(Integer bushingId);
-
- List<FiberDto> selectFiberByFibersId(Integer fibersId);
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java
deleted file mode 100644
index b772490..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFiberMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.InsFiber;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:01
- */
-public interface InsFiberMapper extends BaseMapper<InsFiber> {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java
deleted file mode 100644
index 61c3e85..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsFibersMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.yuanchu.mom.pojo.InsFibers;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:13
- */
-public interface InsFibersMapper extends BaseMapper<InsFibers> {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
index f527436..6f930c5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java
@@ -44,8 +44,6 @@
String getEnumLabelByValue(String value);
- String getStandardMethodCode(Integer id);
-
int updateStatus( Integer id);
String selLaboratoryCode(String laboratory);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java
index 68035dc..de88699 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java
@@ -3,6 +3,8 @@
import com.yuanchu.mom.pojo.InsOrderState;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+
/**
* @author admin
* @description 閽堝琛ㄣ�恑ns_order_state銆戠殑鏁版嵁搴撴搷浣淢apper
@@ -12,6 +14,7 @@
public interface InsOrderStateMapper extends BaseMapper<InsOrderState> {
+ List<InsOrderState> getInsOrderStateCount(Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
index f014909..837544d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java
@@ -27,8 +27,6 @@
int updateInspected(@Param("id") Integer id);
- List<InsProduct> selectFiberInsProduct(List<Integer> ids, String laboratory);
-
IPage<InsProduct> selectNoProducts(Page page, Integer orderId);
int selectInsProductCountByOrderId(int orderId);
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 28d3c7e..ac01ee9 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
@@ -30,7 +30,6 @@
IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
List<SampleProductDto> selectSampleProductListByOrderId(Integer id);
- List<SampleProductDto> selectSampleProductListByOrder2Id(Integer id);
List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
List<SampleProductDto> selectSampleProductListByOrder2Id2(Integer id);
@@ -53,6 +52,9 @@
String selMethodById(Integer sampleId);
List<Map<String, String>> selectSampleList(Integer orderId);
+
+ //杩囨护鎺夋病鏈夋楠岄」鐩殑鏍峰搧
+ List<InsSample> selectSampleListByOrderId(Integer orderId);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
index a95a131..f8e7ffa 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/StandardProductListMapper.java
@@ -19,9 +19,9 @@
StandardProductList getOne(Integer standardMethodListId, String inspectionItem, String sample, String inspectionItemSubclass, String model, String inspectionItemClass);
- List<StandardProductList> selectDetail(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("model") String model);
+ List<StandardProductList> selectDetail(@Param("ids") List<Integer> ids, @Param("state") int state, @Param("model") String model);
- List<StandardProductList> selectDetail2(@Param("standardMethodListId") Integer standardMethodListId, @Param("state") int state, @Param("tree") String tree);
+ List<StandardProductList> selectDetail2(@Param("ids") List<Integer> ids, @Param("state") int state, @Param("tree") String tree);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java
deleted file mode 100644
index a11e06f..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsBushing.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫绠¤〃
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:58:16
- */
-@Getter
-@Setter
-@TableName("ins_bushing")
-@ApiModel(value = "InsBushing瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫绠¤〃")
-public class InsBushing extends OrderBy implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("绠¤壊鏍�")
- @ValueTableShow(2)
- private String color;
-
- @ApiModelProperty("鏍囬噺")
- @ValueTableShow(3)
- private Integer standNum;
-
- @ApiModelProperty("娴嬭瘯閲�")
- @ValueTableShow(4)
- private Integer testNum;
-
- @ApiModelProperty("鍏宠仈 鏍峰搧id")
- private Integer insSampleId;
-
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @TableField(exist = false,select = false)
- private Integer state;
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
deleted file mode 100644
index e3af79f..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾よ〃
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:01
- */
-@Getter
-@Setter
-@TableName("ins_fiber")
-@ApiModel(value = "InsFiber瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫厜绾よ〃")
-public class InsFiber extends OrderBy implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("绠″鑹叉爣")
- @ValueTableShow(2)
- private String bushColor;
-
- @ApiModelProperty("鍏夌氦鑹叉爣")
- @ValueTableShow(3)
- private String color;
-
- @ApiModelProperty("鍏夌氦瑙勬牸")
- @ValueTableShow(4)
- private String model;
-
- @ApiModelProperty("鍙傝�冩爣鍑�")
- @ValueTableShow(5)
- private String standard;
-
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @ApiModelProperty("鍏宠仈 濂楃琛╥d")
- private Integer insBushingId;
-
- @ApiModelProperty("鍏宠仈 鍏夌氦甯﹁〃id")
- private Integer insFibersId;
-
- @TableField(exist = false,select = false)
- private Integer state;
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java
deleted file mode 100644
index 99cf9c4..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFibers.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.yuanchu.mom.annotation.ValueTableShow;
-import com.yuanchu.mom.common.OrderBy;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:13
- */
-@Getter
-@Setter
-@TableName("ins_fibers")
-@ApiModel(value = "InsFibers瀵硅薄", description = "鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛�")
-public class InsFibers extends OrderBy implements Serializable {
-
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty("鍏夌氦甯︾紪鍙�")
- @ValueTableShow(2)
- private String code;
-
- @ApiModelProperty("鍏夌氦甯﹁鏍�")
- @ValueTableShow(3)
- private String model;
-
- @ApiModelProperty("鍙傝�冩爣鍑�")
- @ValueTableShow(4)
- private String standard;
-
- @ApiModelProperty("鍏夌氦妫�娴嬮噺")
- @ValueTableShow(5)
- private String num;
-
- @ApiModelProperty("鍏宠仈 濂楃琛╥d")
- private Integer insBushingId;
-
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @TableField(exist = false,select = false)
- private Integer state;
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
index a16cae9..f62df21 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java
@@ -197,6 +197,9 @@
private Integer send;
+ /**
+ * 璁㈠崟绫诲瀷(鏁版嵁瀛楀吀)
+ */
private String formType;
@ApiModelProperty("瀹℃牳鏃堕棿")
@@ -243,5 +246,8 @@
@ApiModelProperty("閫氫俊:鎶�鏈礋璐ｄ汉瀹℃牳缁撴灉2:涓嶉�氳繃;1:閫氳繃")
private Integer checkState3;
+ @ApiModelProperty("涓嬪彂瀵硅薄(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)")
+ private Integer issueUser;
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
index 49df4e4..d195db4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
@@ -5,6 +5,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
@@ -92,4 +93,9 @@
* 娆℃暟(妫�娴嬫鏁�)
*/
private Integer num;
+
+ //妫�楠屼汉
+ @TableField(exist = false,select = false)
+ private String userName;
+
}
\ No newline at end of file
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 0394900..9993d86 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
@@ -232,12 +232,6 @@
//婀垮害
private String humidity;
- private Integer insFiberId;
-
- private Integer insFibersId;
-
- private Integer insBushId;
-
private Integer standardMethodListId;
//杩斿洖鐨�20搴﹀父娓╃殑璁＄畻鍊�(娓╁害寰幆)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
index dc5d8a5..65d94be 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java
@@ -86,7 +86,7 @@
*/
private String remark;
- private Integer standardMethodListId;
+ private String standardMethodListId;
@ApiModelProperty("鏍峰搧鍗曚綅")
private String unit;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
index 3b4a0f0..ccd4e21 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java
@@ -27,7 +27,7 @@
private Integer id;
/**
- * 澶栭敭锛氭楠屾牱鍝乮ns_sample琛╥d(瀹為檯鍏宠仈ins_order_state琛╥d)
+ * 澶栭敭锛氭楠屾牱鍝乮ns_sample琛╥d(瀹為檯鍏宠仈ins_order琛╥d)
*/
private Integer insSampleId;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java
deleted file mode 100644
index 32378ca..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsBushingService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.pojo.InsBushing;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫绠¤〃 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:58:16
- */
-public interface InsBushingService extends IService<InsBushing> {
-
- List<BushingDto> selectBushingBySampleId(Integer sampleId);
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java
deleted file mode 100644
index 7c713c7..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFiberService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.InsFiber;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:01
- */
-public interface InsFiberService extends IService<InsFiber> {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java
deleted file mode 100644
index b369ff1..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsFibersService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.mom.service;
-
-import com.yuanchu.mom.pojo.InsFibers;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:13
- */
-public interface InsFibersService extends IService<InsFibers> {
-
-}
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 0bd7690..8402719 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
@@ -9,6 +9,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -32,7 +33,7 @@
int upPlanUser(Integer userId, Integer orderId,String sonLaboratory);
- int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
+ int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException;
int submitPlan(Integer orderId, String laboratory, Integer verifyUser, String entrustCode);
@@ -44,10 +45,6 @@
Map<String,Object> getFileList(Page page, InsOrderFile insOrderFile);
int uploadFile(Integer orderId, MultipartFile file);
-
- Map<String,Object> getReportModel(Integer sampleId);
-
- Map<String,Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass);
List<String> upPlanUser2(Integer orderId);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
index ca89c72..4e6a342 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java
@@ -22,7 +22,7 @@
//鑾峰彇鍗曚綅妫�楠屼笅鍗曟暟鎹�
Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
- //淇敼妫�楠屼笅鍗曟暟鎹�
+ //鍒嗛厤绔欑偣
int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId,String sonLaboratory);
int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
index 0a8c896..5b3532b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsReportService.java
@@ -2,11 +2,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.yuanchu.mom.dto.InsReportDto;
import com.yuanchu.mom.dto.ReportPageDto;
+import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsReport;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.List;
import java.util.Map;
/**
@@ -40,5 +43,8 @@
int upAll(MultipartFile file) throws IOException;
//鏄惁鐢熸垚鎬绘姤鍛�
- int isReport(Integer id,Integer state);
+ int isReport(InsReportDto insReportDto);
+
+ //鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�
+ List<InsOrderState> getInsOrderStateCount(Integer id);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
deleted file mode 100644
index bbb7b7f..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsBushingServiceImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.dto.BushingDto;
-import com.yuanchu.mom.dto.FibersDto;
-import com.yuanchu.mom.mapper.InsBushingMapper;
-import com.yuanchu.mom.pojo.InsBushing;
-import com.yuanchu.mom.pojo.InsProduct;
-import com.yuanchu.mom.service.InsBushingService;
-import com.yuanchu.mom.service.StandardTemplateService;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫绠¤〃 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:58:16
- */
-@Service
-@AllArgsConstructor
-public class InsBushingServiceImpl extends ServiceImpl<InsBushingMapper, InsBushing> implements InsBushingService {
-
- private InsBushingMapper insBushingMapper;
-
- private StandardTemplateService standardTemplateService;
-
- @Override
- public List<BushingDto> selectBushingBySampleId(Integer sampleId) {
- List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
- List<BushingDto> bushingDtos = new ArrayList<>();
- for (InsBushing insBushing : insBushings) {
- BushingDto bushingDto = JSON.parseObject(JSON.toJSONString(insBushing), BushingDto.class);
- bushingDto.setFiber(insBushingMapper.selectFiberByBushingId(bushingDto.getId()));
- if(bushingDto.getFiber().size()==0){
- bushingDto.setFibers(insBushingMapper.selectFibersByBushingId(insBushing.getId()));
- for (FibersDto fibers : bushingDto.getFibers()) {
- fibers.setFiber(insBushingMapper.selectFiberByFibersId(fibers.getId()));
- }
- }
- bushingDtos.add(bushingDto);
- }
- return bushingDtos;
- }
-
- private void getTemplateThing(List<InsProduct> insProducts) {
- Set<Integer> set = new HashSet<>();
- Map<Integer, String> map2 = new HashMap<>();
- for (InsProduct product : insProducts) {
- if (product.getTemplateId() == null) {
- product.setTemplate(new ArrayList<>());
- continue;
- }
- String thing = null;
- if (product.getTemplateId() != null && set.add(product.getTemplateId())) {
- map2.put(product.getTemplateId(), standardTemplateService.getStandTempThingById(product.getTemplateId()) + "");
- thing = map2.get(product.getTemplateId());
- }
- if (StrUtil.isNotEmpty(thing)) {
- 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);
- Map<String, Object> style = new HashMap<>();
- style.put("rowlen", config.get("rowlen"));
- style.put("columnlen", config.get("columnlen"));
- product.setTemplate(cellData);
- product.setStyle(style);
- product.setTemplateName(standardTemplateService.getStandTempNameById(product.getTemplateId()));
- }
- }
- }
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java
deleted file mode 100644
index edc0e58..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFiberServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.yuanchu.mom.pojo.InsFiber;
-import com.yuanchu.mom.mapper.InsFiberMapper;
-import com.yuanchu.mom.service.InsFiberService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾よ〃 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:01
- */
-@Service
-public class InsFiberServiceImpl extends ServiceImpl<InsFiberMapper, InsFiber> implements InsFiberService {
-
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java
deleted file mode 100644
index fb0cd85..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsFibersServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.mom.service.impl;
-
-import com.yuanchu.mom.pojo.InsFibers;
-import com.yuanchu.mom.mapper.InsFibersMapper;
-import com.yuanchu.mom.service.InsFibersService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鍏夌氦閰嶇疆鐨勫厜绾ゅ甫琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2024-05-30 05:59:13
- */
-@Service
-public class InsFibersServiceImpl extends ServiceImpl<InsFibersMapper, InsFibers> implements InsFibersService {
-
-}
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 91912bb..ea2c45c 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,8 +33,14 @@
import com.yuanchu.mom.utils.*;
import com.yuanchu.mom.vo.*;
import org.apache.commons.io.IOUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -127,18 +133,6 @@
private String imgUrl;
@Resource
- private InsBushingService insBushingService;
-
- @Resource
- private InsBushingMapper insBushingMapper;
-
- @Resource
- private InsFiberMapper insFiberMapper;
-
- @Resource
- private InsFibersMapper insFibersMapper;
-
- @Resource
private InsOrderFileMapper insOrderFileMapper;
@Override
@@ -229,10 +223,6 @@
}
Map<String, Object> map = insOrderService.getInsOrderAndSample(id, laboratory);
List<SampleProductDto> list = JSON.parseArray(JSON.toJSONString(map.get("sampleProduct")), SampleProductDto.class);
- for (SampleProductDto samples : list) {
- if (BeanUtil.isEmpty(samples.getInsProduct())) continue;
- samples.setBushing(insBushingService.selectBushingBySampleId(samples.getId()));
- }
map.put("sampleProduct", list);
return map;
}
@@ -244,7 +234,7 @@
case 0:
//鏍峰搧
insProducts = insSampleMapper.getInsProduct1(id, laboratory);
- if (insProducts.size()==0){
+ if (insProducts.size() == 0) {
insProducts = insSampleMapper.getIns2Product1(id, laboratory);
}
break;
@@ -266,12 +256,15 @@
}
@Override
- public List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request,Integer num) {
+ public List<InsProduct> getInsProduct2(Integer id, Integer type, String laboratory, HttpServletRequest request, Integer num) {
List<InsProduct> insProducts = new ArrayList<>();
switch (type) {
case 0:
//鏍峰搧
- insProducts = insSampleMapper.get2InsProduct1(id, laboratory,num);
+ insProducts = insSampleMapper.get2InsProduct1(id, laboratory, num);
+ if (insProducts.size() == 0) {
+ throw new ErrorException("褰撳墠妫�楠屾暟鎹繕娌℃湁淇濆瓨,淇濆瓨涔嬪悗鏈夋暟鎹巻鍙�");
+ }
break;
case 1:
//鍏夌氦甯�
@@ -353,185 +346,6 @@
}
}
- //鍒囨崲璁板綍妯＄増鏌ヨ妫�楠屽唴瀹�
- @Override
- public Map<String, Object> getReportModel(Integer sampleId) {
- Map<String, Object> map = new HashMap<>();
- //鍏堟煡鍑哄绠�
- List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
- List<InsFibers> fibers = new ArrayList<>();
- List<InsFiber> fiber = new ArrayList<>();
- List<InsBushing> bush = new ArrayList<>();
- for (InsBushing insBushing : insBushings) {
- //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
- List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
- List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
- if (CollectionUtils.isNotEmpty(insFibers)) {
- for (InsFibers insFiber : insFibers) {
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFibersId, insFiber.getId()));
- List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
- .filter(sm -> ObjectUtils.isNotEmpty(sm) && sm != 2).collect(Collectors.toList());
- if (insProducts.size() == collect.size()) {
- insFiber.setState(1);//宸叉楠�
- } else {
- insFiber.setState(0);//鏈楠�
- }
- }
- fibers.addAll(insFibers);
- //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
- List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().in(InsFiber::getInsFibersId, insFibers.stream().map(InsFibers::getId).collect(Collectors.toList())));
- for (InsFiber insFiber : fiberList) {
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
- List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
- .filter(sm -> ObjectUtils.isNotEmpty(sm) && sm != 2).collect(Collectors.toList());
- if (insProducts.size() == collect.size()) {
- insFiber.setState(1);//宸叉楠�
- } else {
- insFiber.setState(0);//鏈楠�
- }
- }
- fiber.addAll(fiberList);
- }
- //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
- else if (CollectionUtils.isNotEmpty(insFiberList)) {
- for (InsFiber insFiber : insFiberList) {
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsFiberId, insFiber.getId()));
- List<Integer> collect = insProducts.stream().map(InsProduct::getInsResult)
- .filter(sm -> ObjectUtils.isNotEmpty(sm) && sm != 2).collect(Collectors.toList());
- if (insProducts.size() == collect.size()) {
- insFiber.setState(1);//宸叉楠�
- } else {
- insFiber.setState(0);//鏈楠�
- }
- }
- fiber.addAll(insFiberList);
- }
- //濡傛灉鍏夌氦甯﹀拰鍏夌氦閮芥病鏈夊氨鍙湁濂楃(鏉惧绠�)
- else {
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsBushId, insBushing.getId()));
- List<Integer> collect = insProducts.stream()
- .map(InsProduct::getInsResult)
- .filter(sm -> ObjectUtils.isNotEmpty(sm) && sm != 2).collect(Collectors.toList());
- if (insProducts.size() == collect.size()) {
- insBushing.setState(1);//宸叉楠�
- } else {
- insBushing.setState(0);//鏈楠�
- }
- bush.add(insBushing);
- }
- }
- map.put("鍏夌氦甯�", fibers);
- map.put("鍏夌氦", fiber);
- map.put("濂楃", bush);
- return map;
- }
-
- //娓╁害寰幆鏌ョ湅鍒楄〃鏁版嵁(鍖呮嫭閫氳繃鏍峰搧id,寰幆娆℃暟,娓╁害,寰幆娆℃暟杩涜绛涢��)
- @Override
- public Map<String, Object> temCycle(Integer sampleId, String inspectionItem, String inspectionItemSubclass) {
- Map<String, Object> map = new HashMap<>();
- //鏍峰搧淇℃伅
- SampleVo sampleVo = insSampleMapper.getDetailById(sampleId);
- map.put("sampleVo", sampleVo);
- List<ProductVo> productVos = new ArrayList<>();
- //鍏堟煡鍑鸿繖涓牱鍝佷笅鏈夊摢浜涚鑹叉爣,鍏夌氦甯�,鍏夌氦鑹叉爣
- //鍏堟煡鍑哄绠�
- List<InsBushing> insBushings = insBushingMapper.selectList(Wrappers.<InsBushing>lambdaQuery().eq(InsBushing::getInsSampleId, sampleId));
- if (insBushings.size() > 0) {
- //閫氫俊--娓╁害寰幆
- for (InsBushing insBushing : insBushings) {
- //鍐嶆煡璇㈠嚭鎵�鏈夌殑鍏夌氦甯�
- List<InsFibers> insFibers = insFibersMapper.selectList(Wrappers.<InsFibers>lambdaQuery().eq(InsFibers::getInsBushingId, insBushing.getId()));
- if (CollectionUtils.isNotEmpty(insFibers)) {
- for (InsFibers insFiber : insFibers) {
- //鏌ュ嚭鍏夌氦甯︿笅鎵�鏈夌殑鍏夌氦
- List<InsFiber> fiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsFibersId, insFiber.getId()));
- for (InsFiber fiber : fiberList) {
- //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, inspectionItem)
- .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
- .eq(InsProduct::getInsFiberId, fiber.getId()));
- for (InsProduct insProduct : insProducts) {
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
- .eq(InsProductResult::getInsProductId, insProduct.getId()));
- ProductVo productVo = new ProductVo();
- productVo.setCode(insFiber.getCode());
- productVo.setColor(fiber.getColor());
- productVo.setBushColor(insBushing.getColor());
- if (ObjectUtils.isNotEmpty(insProductResult)) {
- insProduct.setInsProductResult(insProductResult);
- }
- //姹傚悓绛夋潯浠朵笅1娆″惊鐜�20搴﹀父娓╃殑璁＄畻鍊�
- InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
- .eq(InsProduct::getInsFiberId, fiber.getId())).getId()));
- if (ObjectUtils.isNotEmpty(insProductResult1) && !insProductResult1.getComValue().equals("[]")) {
- insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
- }
- productVo.setInsProduct(insProduct);
- productVos.add(productVo);
- }
- }
- }
- } else {
- //濡傛灉濂楃涓嬫病鏈夊厜绾ゅ甫灏卞彧鏈夊厜绾や簡
- List<InsFiber> insFiberList = insFiberMapper.selectList(Wrappers.<InsFiber>lambdaQuery().eq(InsFiber::getInsBushingId, insBushing.getId()));
- for (InsFiber fiber : insFiberList) {
- //鍐嶆牴鎹叧鑱旂殑鍏夌氦閰嶇疆鐨刬d鍜屽惊鐜鏁板拰娓╁害鍜屾牱鍝乮d杩涜鏌ヨ妫�楠岄」鐩�
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, inspectionItem)
- .eq(InsProduct::getInspectionItemSubclass, inspectionItemSubclass)
- .eq(InsProduct::getInsFiberId, fiber.getId()));
- for (InsProduct insProduct : insProducts) {
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- ProductVo productVo = new ProductVo();
- productVo.setCode("-");
- productVo.setColor(fiber.getColor());
- productVo.setBushColor(fiber.getBushColor());
- insProduct.setInsProductResult(insProductResult);
- //姹傚悓绛夋潯浠朵笅1娆″惊鐜�20搴﹀父娓╃殑璁＄畻鍊�
- InsProductResult insProductResult1 = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, "1")
- .eq(InsProduct::getInspectionItemSubclass, "20鈩�(甯告俯)")
- .eq(InsProduct::getInspectionItemClass, insProduct.getInspectionItemClass())
- .eq(InsProduct::getInsFiberId, fiber.getId())).getId()));
- if (ObjectUtils.isNotEmpty(insProductResult1) && !insProductResult1.getComValue().equals("[]")) {
- insProduct.setComplue(insProductResult1.getComValue().split(":")[1].split("\"")[1]);
- }
- productVo.setInsProduct(insProduct);
- productVos.add(productVo);
- }
- }
- }
- }
- productVos = productVos.stream().sorted(Comparator.comparing(productVo -> productVo.getInsProduct().getInspectionItemClass())).collect(Collectors.toList());
- } else {
- //鐢靛姏--鐑惊鐜拰娓╁崌璇曢獙
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getInsSampleId, sampleId)
- .eq(InsProduct::getInspectionItem, inspectionItem));
- for (InsProduct insProduct : insProducts) {
- InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, insProduct.getId()));
- ProductVo productVo = new ProductVo();
- if (ObjectUtils.isNotEmpty(insProductResult)) {
- insProduct.setInsProductResult(insProductResult);
- }
- productVo.setInsProduct(insProduct);
- productVos.add(productVo);
- }
- }
- map.put("productVos", productVos);
- return map;
- }
-
@Override
public List<String> upPlanUser2(Integer orderId) {
List<Integer> sampleId = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId)).stream().map(InsSample::getId).collect(Collectors.toList());
@@ -549,7 +363,7 @@
@Override
- public void saveInsContext(Map<String, Object> insContext,Integer num) {
+ public void saveInsContext(Map<String, Object> insContext, Integer num) {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
CompletableFuture.supplyAsync(() -> {
insContext.forEach((k, v) -> {
@@ -557,6 +371,7 @@
InsProduct insProduct = new InsProduct();
insProduct.setId(Integer.parseInt(k));
List<InsProductResult> results = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
+ .eq(InsProductResult::getNum, num)
.eq(InsProductResult::getInsProductId, insProduct.getId()));
InsProductResult result;
if (CollectionUtils.isEmpty(results)) {
@@ -735,6 +550,7 @@
insSampleMapper.updateById(insSample);
/*鏍￠獙涓�涓媟esult琛�*/
List<InsProductResult> insProductResults = insProductResultMapper.selectList(Wrappers.<InsProductResult>lambdaQuery()
+ .eq(InsProductResult::getNum, num)
.eq(InsProductResult::getInsProductId, insProduct.getId()));
if (insProductResults.size() > 1) {
for (int i = 1; i < insProductResults.size(); i++) {
@@ -1024,7 +840,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
+ public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) throws IOException {
LocalDateTime now = LocalDateTime.now();
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
List<InsUnPass> insUnPasses = new ArrayList<>();
@@ -1158,7 +974,52 @@
.set(InsOrderState::getVerifyUser, userId));
break;
}
+ /*澶嶆牳瀹屾垚涔嬪悗鐢熸垚浠栬嚜宸辩殑绔欑偣鎶ュ憡(浠呴檺杈愬皠璇曢獙妫�娴�(杩戝満,杩滃満)鍜岀數璺瘯楠�)*/
+ /*switch (laboratory) {
+ case "杩戝満":
+ uploadFile(orderId, null);
+ break;
+ case "杩滃満":
+ uploadFile(orderId, null);
+ break;
+ case "鐢佃矾璇曢獙":
+ uploadFile(orderId, generateExcelFile(orderId,laboratory));
+ break;
+ default:
+ break;
+ }*/
return 1;
+ }
+
+ //鐢熸垚鐢佃矾璇曢獙鐨別xcel鏂囦欢
+ private MultipartFile generateExcelFile(Integer orderId, String laboratory) throws IOException{
+ // 鍒涘缓涓�涓猈orkbook瀵硅薄
+ Workbook workbook = new XSSFWorkbook();
+
+ // 鍒涘缓绗竴涓猄heet
+ Sheet sheet1 = workbook.createSheet("Sheet1");
+ Row row1 = sheet1.createRow(0);
+ Cell cell1 = row1.createCell(0);
+ cell1.setCellValue("Hello, Sheet1");
+
+ // 鍒涘缓绗簩涓猄heet
+ Sheet sheet2 = workbook.createSheet("Sheet2");
+ Row row2 = sheet2.createRow(0);
+ Cell cell2 = row2.createCell(0);
+ cell2.setCellValue("Hello, Sheet2");
+
+ // 灏哤orkbook鍐欏叆鍒板瓧鑺傛暟缁勪腑
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+ workbook.write(outputStream);
+ workbook.close();
+
+ byte[] excelBytes = outputStream.toByteArray();
+
+ // 鍒涘缓MultipartFile瀵硅薄
+ MultipartFile multipartFile = new MockMultipartFile(
+ "file", "example.xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", new ByteArrayInputStream(excelBytes));
+
+ return multipartFile;
}
private void getTemplateThing(Set<Integer> set, Map<Integer, String> map2, List<InsProduct> insProducts) {
@@ -1204,10 +1065,7 @@
.isNull(InsProduct::getInsResult)
.or()
.eq(InsProduct::getInsResult, 2)
- )
- .isNull(InsProduct::getInsFiberId)
- .isNull(InsProduct::getInsFibersId));
- insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
+ ));
if (insProducts.size() > 0) {
String str = "";
int count = 0;
@@ -1247,7 +1105,11 @@
/*濡傛灉鏄疌绫昏鍗曚笖鏄笅鍙戝埌璐ㄩ噺閮�,鍒欑洿鎺ュ鏍搁�氳繃(缁撴潫璇曢獙)*/
InsOrder insOrder = insOrderMapper.selectById(orderId);
if (insOrder.getOrderType().equals("C") && insOrder.getDepartmentLims().equals("璐ㄩ噺閮�")) {
- verifyPlan(orderId, laboratory, 2, null);
+ try {
+ verifyPlan(orderId, laboratory, 2, null);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
} else {
Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
//LIMS绯荤粺娑堟伅鎺ㄩ��
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 8b7e91f..c857e20 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
@@ -7,6 +7,7 @@
import com.alibaba.excel.write.metadata.WriteSheet;
import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -22,6 +23,7 @@
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.utils.GiveCode;
+import com.yuanchu.mom.utils.QYWXApi;
import com.yuanchu.mom.utils.QueryWrappers;
import com.yuanchu.mom.vo.SampleDefectsFatherVo;
import lombok.AllArgsConstructor;
@@ -75,13 +77,9 @@
PowerMapper powerMapper;
- private InsBushingMapper insBushingMapper;
-
- private InsFibersMapper insFibersMapper;
-
- private InsFiberMapper insFiberMapper;
-
CustomMapper customMapper;
+
+ QYWXApi qywxApi;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@@ -94,16 +92,6 @@
User user = userMapper.selectById(map1.get("userId"));//褰撳墠鐧诲綍鐨勪汉
Integer roleId = user.getRoleId();
String laboratory = null;
- //鑾峰彇褰撳墠浜烘墍灞炲疄楠屽id
- /*String departLimsId = user.getDepartLimsId();
- if (ObjectUtils.isNotEmpty(departLimsId) && !departLimsId.equals("")) {
- String[] split = departLimsId.split(",");
- //鏌ヨ瀵瑰簲鏋舵瀯鍚嶇О(閫氫俊瀹為獙瀹�,鐢靛姏瀹為獙瀹�,妫�娴嬪姙)
- String departLims = baseMapper.seldepLimsId(Integer.parseInt(split[split.length - 1]));
- if (departLims.contains("瀹為獙瀹�")) {
- laboratory = departLims;
- }
- }*/
//鍒ゆ柇鏄惁鏄叏閮ㄦ潈闄�
Power power = powerMapper.selectOne(Wrappers.<Power>lambdaQuery().eq(Power::getRoleId, roleId).eq(Power::getMenuMethod, "selectAllInsOrderParameter"));
if (ObjectUtils.isEmpty(power)) {
@@ -203,7 +191,7 @@
insSampleMapper.insert(a);
//鏍峰搧鐨勬楠岄」鐩�
if (ObjectUtil.isNotEmpty(a.getInsProduct())) {
- addInsProductMethod(a.getId(), a.getInsProduct(), null, 0);
+ addInsProductMethod(a.getId(), a.getInsProduct());
}
//鏍峰搧鐨勬楠屾爣鍑�
if (ObjectUtil.isNotEmpty(a.getInsulating())) {
@@ -214,14 +202,14 @@
for (InsProduct product : ip2) {
product.setStandardMethodListId(a.getInsulating().getStandardMethodListId());
}
- addInsProductMethod(a.getId(), ip2, null, 0);
+ addInsProductMethod(a.getId(), ip2);
}
//鏍峰搧鐨勬楠屾爣鍑�
if (ObjectUtil.isNotEmpty(a.getSheath())) {
for (InsProduct product : a.getSheath().getInsProduct()) {
product.setStandardMethodListId(a.getSheath().getStandardMethodListId());
}
- addInsProductMethod(a.getId(), a.getSheath().getInsProduct(), null, 0);
+ addInsProductMethod(a.getId(), a.getSheath().getInsProduct());
}
//瀛愭牱鍝侀厤缃�
if (ObjectUtil.isNotEmpty(a.getChildSampleList())) {
@@ -235,54 +223,13 @@
}
insSampleMapper.insert(b);
if (ObjectUtil.isNotEmpty(b.getInsProduct())) {
- addInsProductMethod(b.getId(), b.getInsProduct(), null, 0);
+ addInsProductMethod(b.getId(), b.getInsProduct());
}
}
}
}
- //鍏夌氦閰嶇疆
- /*if (ObjectUtil.isEmpty(a.getInsProduct()) && ObjectUtil.isNotEmpty(a.getBushing())) {
- for (BushingDto bushingDto : a.getBushing()) {
- bushingDto.setInsSampleId(a.getId());
- insBushingMapper.insert(bushingDto);
- if (bushingDto.getFiber().size() != 0) {
- for (FiberDto fiberDto : bushingDto.getFiber()) {
- fiberDto.setInsBushingId(bushingDto.getId());
- insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
- }
- } else {
- for (FibersDto fibersDto : bushingDto.getFibers()) {
- fibersDto.setInsBushingId(bushingDto.getId());
- fibersDto.setCode(this.giveCode.giveCode("", "ins_fibers", "", "yyMMdd"));
- insFibersMapper.insert(fibersDto);
- for (FiberDto fiberDto : fibersDto.getFiber()) {
- fiberDto.setInsFibersId(fibersDto.getId());
- insFiberMapper.insert(fiberDto);
- addInsProductMethod(a.getId(), fiberDto.getProductList(), fiberDto.getId(), 2);
- }
- addInsProductMethod(a.getId(), fibersDto.getProductList(), fibersDto.getId(), 1);
- }
- }
- }
- }*/
+
});
- //澶氫釜鏍峰搧灏辨嫾鎺�
- /*for (List<Integer> i : pairing) {
- SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class);
- sample.setSampleCode(list.get(i.get(0) - 1).getSampleCode() + "/" + list.get(i.get(1) - 1).getSampleCode());
- sample.setId(null);
- insSampleMapper.insert(sample);
- try {
- 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) {
- }
- }*/
//閫氫俊:濡傛灉鏄疌绫昏鍗曟棤闇�瀹℃牳鐩存帴閫氳繃
if (insOrder.getOrderType().equals("C")) {
insOrder.setState(1);
@@ -291,17 +238,9 @@
return insOrder.getId();
}
- private void addInsProductMethod(Integer sampleId, List<InsProduct> productList, Integer id, Integer type) {
+ private void addInsProductMethod(Integer sampleId, List<InsProduct> productList) {
for (InsProduct product : productList) {
- if (product.getState() == 1 ) {
- switch (type) {
- case 1:
- product.setInsFibersId(id);
- break;
- case 2:
- product.setInsFiberId(id);
- break;
- }
+ if (product.getState() == 1) {
product.setId(null);
product.setCreateTime(null);
product.setCreateUser(null);
@@ -316,73 +255,12 @@
}
}
- //娓╁害寰幆鐨勫鐞�
- private void dealWithTemperatureLoop(Integer type, Integer id, Integer sampleId, InsProduct product) {
- List<InsProduct> insProductes = new ArrayList<>();
- List<InsProduct> insProducts = new ArrayList<>();
- String[] strings = product.getAsk().split(";");
- for (int i = 0; i < strings.length; i++) {
- int count = Integer.parseInt(strings[strings.length - 1]);
- 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(",");
- if (split[0].equals("20鈩�")) {
- insProduct.setInspectionItem(count + "");//妫�楠岄」--寰幆娆℃暟
- } else {
- insProduct.setInspectionItem("1");//妫�楠岄」--寰幆娆℃暟
- }
- insProduct.setInspectionItemSubclass(split[0]);//妫�楠岄」--娓╁害
- insProduct.setInspectionItemClass(split[1]);//妫�楠岄」--鍏夌氦椤圭洰
- insProduct.setAsk(split[2]);//妫�楠岃姹�
- insProduct.setTell(strings[i]);//妫�楠屾弿杩�
- insProduct.setInsSampleId(sampleId);
- insProduct.setState(1);
- insProduct.setFactory(product.getFactory());
- insProduct.setLaboratory(product.getLaboratory());
- insProduct.setSampleType(product.getSampleType());
- insProduct.setSample(product.getSample());
- insProduct.setModel(product.getModel());
- insProduct.setSonLaboratory(product.getSonLaboratory());
- insProduct.setUnit(product.getUnit());
- insProduct.setManHourGroup(product.getManHourGroup());
- insProduct.setInspectionItemType("0");
- insProduct.setInspectionValueType("1");
- insProducts.add(insProduct);
- insProductes.add(insProduct);
- } else {
- //鏈�鍚庝竴涓暟鎹槸璇存槑浼氬惊鐜灏戞
- if (count > 1) {
- //寰幆瓒呰繃1娆�
- for (int j = 2; j <= count; j++) {
- for (InsProduct insProduct : insProducts) {
- if (!insProduct.getInspectionItemSubclass().equals("20鈩�") && !insProduct.getInspectionItemSubclass().equals("20鈩�(甯告俯)")) {
- InsProduct insProduct1 = new InsProduct();
- BeanUtils.copyProperties(insProduct, insProduct1);
- insProduct1.setInspectionItem(j + "");
- insProductes.add(insProduct1);
- }
- }
- }
- }
- }
- }
- insProductService.saveBatch(insProductes);
- }
-
@Override
public Map<String, Object> getInsOrder(Integer id) {
Map<String, Object> map = new HashMap<>();
InsOrder insOrder = insOrderMapper.selectById(id);
List<SampleProductDto> list = insSampleMapper.selectSampleProductListByOrderId2(id);
- if (list.size()==0){
+ if (list.size() == 0) {
list = insSampleMapper.selectSampleProductListByOrder2Id2(id);
}
map.put("insOrder", insOrder);
@@ -401,35 +279,27 @@
System.out.println("=============" + custom.getCompany());
System.out.println("-------------" + order.getCompany());
insOrder.setEntrustCode(giveCode.giveCode2("TXJC-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMMdd"));
- //绯荤粺鏌ヨ绔欑偣浠诲姟鍒嗗竷鎯呭喌,灏嗘楠屼换鍔′笅鍙戣嚦鏈�灏戠殑绔欏彴
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
- .eq(InsSample::getInsOrderId, insOrder.getId()).select(InsSample::getId));
- List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList());
- List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getState, 1)
- .in(InsProduct::getInsSampleId, ids));
- List<String> collect = insProducts.stream().map(InsProduct::getSonLaboratory).distinct().collect(Collectors.toList());
- //瑕佸垽鏂墿浣欒瘯楠屽涓摢涓渶绌洪棽灏卞畨鎺掔粰鍝釜
- Map<String, Long> dataCounts = new HashMap<>();
- for (String sonLaboratory : collect) {
- Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery()
- .eq(InsOrderState::getLaboratory, sonLaboratory)
- .ne(InsOrderState::getInsState, 4)
- .ne(InsOrderState::getInsState, 5)
- .ne(InsOrderState::getInsState, 6));
- dataCounts.put(sonLaboratory, count);
- }
- // 鏌ユ壘鏁版嵁閲忔渶灏戠殑鍏冪礌
- String minElement = null;
- Long minCount = Long.MAX_VALUE;
- for (Map.Entry<String, Long> entry : dataCounts.entrySet()) {
- if (entry.getValue() < minCount) {
- minCount = entry.getValue();
- minElement = entry.getKey();
- }
- }
int day = insProductService.selectOrderManDay(insOrder.getId());//棰勮瀹屾垚鏃堕棿
- upInsOrder(insOrder.getId(), null, LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")), null, minElement);
+ //纭畾璁㈠崟鐨勪笅鍙戞椂闂村拰绾﹀畾鏃堕棿
+ insOrder.setAppointed(LocalDate.parse(LocalDateTime.now().plusHours(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ insOrder.setSendTime(LocalDateTime.now());
+ /*todo 鏍规嵁璁㈠崟绫诲瀷鍒ゆ柇鏄惁闇�瑕佹帹閫佷紒涓氬井淇� @zss*/
+ if (!order.getFormType().equals("鍏朵粬鎴愬搧")) {
+ /* HashMap<String, Object> map = new HashMap<>();
+ String account = userMapper.selectById(order.getIssueUser()).getAccount();
+ map.put("touser", account);//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'ZT-031292'杩欑绫诲瀷(濡傛灉鏈夊涓敤'|'鍒嗛殧)
+ map.put("toparty", "");//鎺ユ敹閮ㄩ棬id
+ map.put("totag", "");//娑堟伅鏍囩id
+ map.put("msgtype", "text");//娑堟伅绫诲瀷 text:鏂囨湰
+ map.put("agentid", 1000513);//搴旂敤id
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("content", "鎮ㄦ湁涓�鏉¤鍗曢渶鐢熸垚妫�楠�,璇峰墠寰�LIMS绯荤粺鏌ョ湅銆�<a href=\"http://10.1.13.77/enter\"> </a>");
+ map.put("text", JSONArray.toJSONString(hashMap));//娑堟伅鍐呭
+ map.put("safe", 0);//鏄惁淇濆瘑娑堟伅.0鍚�
+ map.put("enable_id_trans", 0);//鏄惁寮�鍚痠d杞瘧.0鍚�
+ map.put("enable_duplicate_check", 0);//鏄惁寮�鍚噸澶嶆秷鎭鏌�.0鍚�
+ qywxApi.send(map);*/
+ }
}
return insOrderMapper.updateById(insOrder);
}
@@ -487,8 +357,8 @@
Map<String, Object> map = new HashMap<>();
InsOrder insOrder = insOrderMapper.selectById2(id);
List<SampleProductDto> list = insSampleMapper.getInsOrderAndSample(id, laboratory);
- if (list.size()==0){
- list=insSampleMapper.getInsOrderAndSample2(id, laboratory);
+ if (list.size() == 0) {
+ list = insSampleMapper.getInsOrderAndSample2(id, laboratory);
}
for (SampleProductDto sampleProductDto : list) {
List<Integer> ids = sampleProductDto.getInsProduct().stream().map(InsProduct::getId).collect(Collectors.toList());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index 3a719a9..93888e0 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -25,6 +25,8 @@
import com.itextpdf.text.pdf.PdfStamper;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.dto.InsReportDto;
+import com.yuanchu.mom.dto.InsReportDto1;
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.exception.ErrorException;
@@ -95,10 +97,19 @@
private InsOrderMapper insOrderMapper;
@Resource
+ private StandardMethodListMapper standardMethodListMapper;
+
+ @Resource
private InsOrderStateMapper insOrderStateMapper;
@Resource
private InsProductMapper insProductMapper;
+
+ @Resource
+ private InsProductResultMapper insProductResultMapper;
+
+ @Resource
+ private InsProductResult2Mapper insProductResult2Mapper;
@Resource
private InsSampleMapper insSampleMapper;
@@ -364,16 +375,16 @@
//鏄惁闇�瑕佺敓鎴愭姤鍛�: 0涓嶉渶瑕�;1闇�瑕�
@Override
@Transactional(rollbackFor = Exception.class)
- public int isReport(Integer id, Integer state) {
+ public int isReport(InsReportDto insReportDto) {
//鍏堝垽鏂璁㈠崟鏄惁鍙互鍘荤敓浜ф姤鍛�
- Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getInsState, 5));
+ Long count = insOrderStateMapper.selectCount(Wrappers.<InsOrderState>lambdaQuery().eq(InsOrderState::getInsOrderId, insReportDto.getId()).eq(InsOrderState::getInsState, 5));
if (count > 0) {
- if (state == 1) {
- generateReport(id);
+ if (insReportDto.getState() == 1) {
+ generateReport(insReportDto.getId(), insReportDto.getInsReportDto1s());
} else {
//缁撴潫璁㈠崟
InsOrder insOrder = new InsOrder();
- insOrder.setId(id);
+ insOrder.setId(insReportDto.getId());
insOrder.setState(4);
insOrderMapper.updateById(insOrder);
}
@@ -381,6 +392,13 @@
throw new ErrorException("璇ヨ鍗曡繕鏈粨鏉熻瘯楠�,鏃犳硶鐢熶骇鎶ュ憡!");
}
return 0;
+ }
+
+ //鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�
+ @Override
+ public List<InsOrderState> getInsOrderStateCount(Integer id) {
+ List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id);
+ return insOrderStates;
}
@@ -578,16 +596,13 @@
}
//鐢熸垚鎶ュ憡
- private void generateReport(Integer orderId) {
+ private void generateReport(Integer orderId, List<InsReportDto1> insReportDto1s) {
LocalDateTime now = LocalDateTime.now();
InsOrder insOrder = insOrderMapper.selectById(orderId);
//濮旀墭閮ㄩ棬 departLims
String departLims = userMapper.selectDepartLims(insOrder.getPrepareUser());
//samples鏄繃婊ゆ帀娌℃湁妫�楠岄」鐩殑鏍峰搧
List<SampleProductDto> samples = insSampleMapper.selectSampleProductListByOrderId(orderId);
- if (samples.size()==0){
- samples=insSampleMapper.selectSampleProductListByOrder2Id(orderId);
- }
String sampleCode = samples.get(0).getSampleCode();
InsReport insReport = new InsReport();
insReport.setCode(insOrder.getEntrustCode());
@@ -603,39 +618,67 @@
String[] monthNames = {"January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
samples.forEach(s -> {
models.add(s.getModel());
- standardMethod.add(insOrderMapper.getStandardMethodCode(s.getStandardMethodListId()));
+ standardMethod.addAll(standardMethodListMapper.selectList(Wrappers.<StandardMethodList>lambdaQuery()
+ .in(StandardMethodList::getId,Arrays.stream(s.getStandardMethodListId().replaceAll("[\\[\\]]", "").split(","))
+ .map(String::trim).map(Integer::parseInt).collect(Collectors.toList()))).stream().map(StandardMethodList::getCode).distinct().collect(Collectors.toList()));
//鎬绘暟
- Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery().eq(InsProduct::getInsSampleId, s.getId()));
+ Long productCount = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId, s.getId()));
productSize.set(productSize.get() + Integer.parseInt(productCount + ""));
//涓嶅垽瀹�
Long productCount1 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
- .eq(InsProduct::getInsResult,3));
+ .eq(InsProduct::getInsResult, 3));
productSize1.set(productSize1.get() + Integer.parseInt(productCount1 + ""));
//涓嶅悎鏍�
Long productCount2 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
- .eq(InsProduct::getInsResult,0));
+ .eq(InsProduct::getInsResult, 0));
productSize2.set(productSize2.get() + Integer.parseInt(productCount2 + ""));
//鍚堟牸
Long productCount3 = insProductMapper.selectCount(Wrappers.<InsProduct>lambdaQuery()
.eq(InsProduct::getInsSampleId, s.getId())
- .eq(InsProduct::getInsResult,1));
+ .eq(InsProduct::getInsResult, 1));
productSize3.set(productSize3.get() + Integer.parseInt(productCount3 + ""));
- for (InsProduct b : s.getInsProduct()) {
- if (b.getInsProductResult() != null) {
- List<JSONObject> jsonObjects = JSON.parseArray(b.getInsProductResult().getEquipValue(), JSONObject.class);
+ //灏嗛」鐩寜鐓х珯鐐硅繘琛屽垎绫�
+ Map<String, List<InsProduct>> listMap = s.getInsProduct().stream().collect(Collectors.groupingBy(InsProduct::getLaboratory));
+ // 鍒涘缓涓�涓� Map 灏嗙珯鐐瑰拰椤圭洰ID鐨勬槧灏勫叧绯�
+ Map<String, Set<Integer>> labToDeviceMap = new HashMap<>();
+ // 鑾峰彇鎵�鏈夌珯鐐圭殑椤圭洰ID 鍒楄〃
+ for (Map.Entry<String, List<InsProduct>> entry : listMap.entrySet()) {
+ Set<Integer> deviceIds = entry.getValue().stream()
+ .map(InsProduct::getId)
+ .collect(Collectors.toSet());
+ labToDeviceMap.put(entry.getKey(), deviceIds);
+ }
+ for (InsReportDto1 insReportDto1 : insReportDto1s) {
+ String laboratory = insReportDto1.getLaboratory();
+ if (!labToDeviceMap.containsKey(laboratory)) {
+ continue;
+ }
+ Set<Integer> deviceIds = labToDeviceMap.get(laboratory);
+ Integer num = insReportDto1.getNum();
+ List<InsProductResult> insProductResults = insProductResultMapper.selectList(
+ Wrappers.<InsProductResult>lambdaQuery()
+ .eq(InsProductResult::getNum, num)
+ .in(InsProductResult::getInsProductId, deviceIds));
+ for (InsProductResult insProductResult : insProductResults) {
+ List<JSONObject> jsonObjects = JSON.parseArray(insProductResult.getEquipValue(), JSONObject.class);
for (JSONObject jsonObject : jsonObjects) {
- if (!"".equals(jsonObject.get("v") + "")) {
- deviceSet.add(jsonObject.get("v") + "");
+ String value = jsonObject.getString("v");
+ if (value != null && !value.isEmpty()) {
+ deviceSet.add(value);
}
}
}
- if (b.getInsProductResult2() != null) {
- for (InsProductResult2 jsonObject : b.getInsProductResult2()) {
- if (jsonObject.getEquipValue() != null) {
- deviceSet.add(jsonObject.getEquipValue());
- }
+ List<InsProductResult2> insProductResult2s = insProductResult2Mapper.selectList(
+ Wrappers.<InsProductResult2>lambdaQuery()
+ .eq(InsProductResult2::getNum, num)
+ .in(InsProductResult2::getInsProductId, deviceIds));
+ for (InsProductResult2 result2 : insProductResult2s) {
+ String equipValue = result2.getEquipValue();
+ if (equipValue != null && !equipValue.isEmpty()) {
+ deviceSet.add(equipValue);
}
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
index 418555b..6690369 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsUnPassServiceImpl.java
@@ -32,8 +32,6 @@
public Map<String, Object> pageInsUnPass(Page page, UnPassPageDto unPassPageDto) {
Map<String, Object> map = new HashMap<>();
map.put("head", PrintChina.printChina(UnPassPageDto.class));
-// Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("pageInsUnPass");
-// if (map1.get("look") == 1) unPassPageDto.setCreateUser(map1.get("userId"));
map.put("body", insUnPassMapper.pageInsUnPass(page, QueryWrappers.queryWrappers(unPassPageDto)));
return map;
}
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 0f2c8b5..34edcdf 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
@@ -61,17 +61,19 @@
@Override
public List<StandardProductList> selectStandardProductList(InsSample insSample) {
String[] models = insSample.getModel().split("-(?=[^-]*$)");//鎷嗗垎鏈�鍚庝竴涓��-銆�
- List<StandardProductList> list = standardProductListMapper.selectDetail(insSample.getStandardMethodListId(), 1, models[0]);
+ List<Integer> ids = Arrays.stream(insSample.getStandardMethodListId().split(","))
+ .map(String::trim).map(Integer::parseInt).collect(Collectors.toList());
+ List<StandardProductList> list = standardProductListMapper.selectDetail(ids, 1, models[0]);
if (list.size() == 0) {
if (Objects.equals(insSample.getFactory(), "") || insSample.getFactory() == null) {
return null;
}
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.selectDetail2(ids, 1, tree);
if (list.size() == 0) {
String tree1 = split[0] + " - " + split[1] + " - " + split[2] + " - null - " + split[3];
- list = standardProductListMapper.selectDetail2(insSample.getStandardMethodListId(), 1, tree1);
+ list = standardProductListMapper.selectDetail2(ids, 1, tree1);
}
}
String[] split1 = insSample.getFactory().split(" - ");
diff --git a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml b/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
deleted file mode 100644
index 014e4a4..0000000
--- a/inspect-server/src/main/resources/mapper/InsBushingMapper.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?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.InsBushingMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsBushing">
- <id column="id" property="id" />
- <result column="color" property="color" />
- <result column="stand_num" property="standNum" />
- <result column="test_num" property="testNum" />
- <result column="ins_sample_id" property="insSampleId" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
- <result column="update_user" property="updateUser" />
- <result column="update_time" property="updateTime" />
- </resultMap>
- <select id="selectFibersByBushingId" resultMap="FibersDto">
- select
- fs.id, fs.code, fs.model, fs.standard, fs.num, fs.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
- ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
- from ins_fibers fs
- left join ins_product p on p.ins_fibers_id = fs.id
- left join ins_product_result ipr on p.id = ipr.ins_product_id
- where fs.ins_bushing_id = #{bushingId}
- </select>
-
- <select id="selectFiberByBushingId" resultMap="FiberDto">
- select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
- ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
- from ins_fiber f
- left join ins_product p on p.ins_fiber_id = f.id
- left join ins_product_result ipr on p.id = ipr.ins_product_id
- where f.ins_bushing_id = #{bushingId}
- </select>
-
- <select id="selectFiberByFibersId" resultMap="FiberDto">
- select f.id, f.bush_color, f.color, f.model, f.standard, f.ins_bushing_id,
- p.id pid, p.inspection_item, p.inspection_item_subclass, p.factory, p.laboratory, p.sample_type, p.sample, p.model pmodel, p.son_laboratory, p.unit, p.price, p.man_hour, p.man_hour_group, p.inspection_item_type, p.inspection_value_type, p.device_group, p.checkout_number, p.section, p.value_type, p.method, p.man_day, p.bsm, p.ask, p.tell, p.`last_value`, p.ins_result, p.state, p.ins_sample_id, p.template_id, p.dic, p.method_s,
- ipr.ins_value,ipr.com_value,ipr.equip_value,ipr.equip_name
- from ins_fiber f
- left join ins_product p on p.ins_fiber_id = f.id
- left join ins_product_result ipr on p.id = ipr.ins_product_id
- where f.ins_fibers_id = #{fibersId}
- </select>
-
- <resultMap id="FibersDto" type="com.yuanchu.mom.dto.FibersDto">
- <id property="id" column="id"/>
- <result property="code" column="code"/>
- <result property="insBushingId" column="ins_bushing_id"/>
- <result property="model" column="model"/>
- <result property="standard" column="standard"/>
- <result property="num" column="num"/>
- <collection property="productList" resultMap="product"/>
- </resultMap>
-
- <resultMap id="FiberDto" type="com.yuanchu.mom.dto.FiberDto">
- <id property="id" column="id"/>
- <result property="bushColor" column="bush_color"/>
- <result property="insBushingId" column="ins_bushing_id"/>
- <result property="model" column="model"/>
- <result property="standard" column="standard"/>
- <result property="color" column="color"/>
- <collection property="productList" resultMap="product"/>
- </resultMap>
-
- <resultMap id="product" type="com.yuanchu.mom.pojo.InsProduct">
- <id property="id" column="pid" jdbcType="INTEGER"/>
- <result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
- <result property="factory" column="factory" jdbcType="VARCHAR"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
- <result property="model" column="pmodel" jdbcType="VARCHAR"/>
- <result property="sonLaboratory" column="son_laboratory" jdbcType="VARCHAR"/>
- <result property="unit" column="unit" jdbcType="VARCHAR"/>
- <result property="price" column="price" jdbcType="DECIMAL"/>
- <result property="manHour" column="man_hour" jdbcType="DOUBLE"/>
- <result property="manHourGroup" column="man_hour_group" jdbcType="VARCHAR"/>
- <result property="inspectionItemType" column="inspection_item_type" jdbcType="VARCHAR"/>
- <result property="inspectionValueType" column="inspection_value_type" jdbcType="VARCHAR"/>
- <result property="deviceGroup" column="device_group" jdbcType="VARCHAR"/>
- <result property="checkoutNumber" column="checkout_number" jdbcType="INTEGER"/>
- <result property="section" column="section" jdbcType="VARCHAR"/>
- <result property="valueType" column="value_type" jdbcType="VARCHAR"/>
- <result property="method" column="method" jdbcType="VARCHAR"/>
- <result property="manDay" column="man_day" jdbcType="INTEGER"/>
- <result property="bsm" column="bsm" jdbcType="VARCHAR"/>
- <result property="ask" column="ask" jdbcType="VARCHAR"/>
- <result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
- <result property="insResult" column="ins_result" jdbcType="INTEGER"/>
- <result property="state" column="state" jdbcType="INTEGER"/>
- <result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
- <result property="templateId" column="template_id" jdbcType="INTEGER"/>
- <result property="methodS" column="method_s"/>
- <result property="tell" column="tell"/>
- <result property="dic" column="dic"/>
- <collection property="insProductResult" resultMap="insProductResult"/>
- </resultMap>
-
- <resultMap id="insProductResult" type="com.yuanchu.mom.pojo.InsProductResult">
- <result property="insValue" column="ins_value" jdbcType="VARCHAR"/>
- <result property="comValue" column="com_value" jdbcType="VARCHAR"/>
- <result property="equipValue" column="equip_value" jdbcType="VARCHAR"/>
- <result property="equipName" column="equip_name" jdbcType="VARBINARY"/>
- </resultMap>
-
-</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsFiberMapper.xml b/inspect-server/src/main/resources/mapper/InsFiberMapper.xml
deleted file mode 100644
index f1e9676..0000000
--- a/inspect-server/src/main/resources/mapper/InsFiberMapper.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.InsFiberMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFiber">
- <id column="id" property="id" />
- <result column="bush_color" property="bushColor" />
- <result column="color" property="color" />
- <result column="model" property="model" />
- <result column="standard" property="standard" />
- <result column="ins_product_id" property="insProductId" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
- <result column="update_user" property="updateUser" />
- <result column="update_time" property="updateTime" />
- <result column="ins_bushing_id" property="insBushingId" />
- <result column="ins_fibers_id" property="insFibersId" />
- </resultMap>
-
-</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsFibersMapper.xml b/inspect-server/src/main/resources/mapper/InsFibersMapper.xml
deleted file mode 100644
index 59a15bd..0000000
--- a/inspect-server/src/main/resources/mapper/InsFibersMapper.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.InsFibersMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsFibers">
- <id column="id" property="id" />
- <result column="code" property="code" />
- <result column="model" property="model" />
- <result column="standard" property="standard" />
- <result column="num" property="num" />
- <result column="ins_product_id" property="insProductId" />
- <result column="ins_bushing_id" property="insBushingId" />
- <result column="create_user" property="createUser" />
- <result column="create_time" property="createTime" />
- <result column="update_user" property="updateUser" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
-</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index c11b952..f466f31 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -122,31 +122,6 @@
<result column="name" property="name"/>
<result column="create_time" property="create_time"/>
</resultMap>
- <select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
- select *
- from (
- select
- id,
- appointed,
- user_id,
- create_user,
- otc_code,
- code,
- custom,
- update_user,
- update_time,
- type,
- entrust_code,
- company,
- remark,
- create_time,
- state
- from ins_order
- ) a
- <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
- ${ew.customSqlSegment}
- </if>
- </select>
<select id="getLaboratoryCode" resultType="java.lang.String">
select laboratory_number
from laboratory
@@ -337,11 +312,6 @@
select label
from `center-lims`.enums
where value = #{value}
- </select>
- <select id="getStandardMethodCode" resultType="java.lang.String">
- select code
- from `center-lims`.standard_method
- where id = #{id}
</select>
<select id="selLaboratoryCode" resultType="java.lang.String">
select laboratory_code
diff --git a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
index af8aef8..2530442 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
@@ -3,18 +3,17 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsOrderStateMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderState">
- <id property="id" column="id" jdbcType="INTEGER"/>
- <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
- <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
- <result property="insState" column="ins_state" jdbcType="INTEGER"/>
- <result property="sort" column="sort" jdbcType="INTEGER"/>
- <result property="createUser" column="create_user" jdbcType="INTEGER"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
- <result property="sortTime" column="sort_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="INTEGER"/>
+ <result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
+ <result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
+ <result property="insState" column="ins_state" jdbcType="INTEGER"/>
+ <result property="sort" column="sort" jdbcType="INTEGER"/>
+ <result property="createUser" column="create_user" jdbcType="INTEGER"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="sortTime" column="sort_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
@@ -22,4 +21,16 @@
ins_state,create_user,create_time,
update_user,update_time,sort,sort_time
</sql>
+ <select id="getInsOrderStateCount" resultType="com.yuanchu.mom.pojo.InsOrderState">
+ select distinct ios.*,userName
+ from ins_order_state ios
+ LEFT JOIN (
+ SELECT ins_sample_id,GROUP_CONCAT( DISTINCT uu.name SEPARATOR ',') AS userName
+ FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
+ WHERE u.state=0
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id
+ ) isu ON isu.ins_sample_id = ios.ins_order_id
+ where ios.ins_order_id = #{id}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 4394f11..4a192ed 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -87,17 +87,6 @@
where ip.ins_sample_id = #{sampleId}
and template_id is not null
- </select>
- <select id="selectFiberInsProduct" resultType="com.yuanchu.mom.pojo.InsProduct">
- select * from ins_product
- where state = 1
- and (ins_fibers_id is not null or ins_fiber_id is not null)
- and ins_result is null
- and son_laboratory = #{laboratory}
- and ins_sample_id in
- <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
</select>
<select id="selectNoProducts" resultType="com.yuanchu.mom.pojo.InsProduct">
select *
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 3a94afe..780e279 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -27,7 +27,8 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num num1
+ a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id
+ orderStateId,ios.create_time,ios.sort,sort_time,version,ios.num-1 num1
FROM
(
SELECT
@@ -161,21 +162,20 @@
<select id="selectSampleProductListByOrderId" resultMap="sampleDto">
select isa.*,
- ios.num num1,
- ip.id ip_id,
+ ip.id ip_id,
inspection_item,
inspection_item_en,
inspection_item_class,
inspection_item_class_en,
inspection_item_subclass,
inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
+ ip.factory ip_factory,
+ ip.laboratory ip_laboratory,
+ ip.sample_type ip_sample_type,
+ ip.sample ip_sample,
+ ip.model ip_model,
son_laboratory,
- ip.unit ip_unit,
+ ip.unit ip_unit,
price,
man_hour,
man_hour_group,
@@ -191,112 +191,19 @@
ask,
tell,
`last_value`,
- ip.ins_result ip_ins_result,
+ ip.ins_result ip_ins_result,
state,
ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
+ ip.create_user ip_create_user,
+ ip.update_user ip_update_user,
+ ip.create_time ip_create_time,
+ ip.update_time ip_update_time,
template_id,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
- ipr2.frequency,
- ipr2.often,
- ipr2.port,
- ipr2.angle,
- ipr2.value,
- ipr2.result,
- ipr2.equip_value equipValue2,
- ipr2.equip_name equipName2,
ip.method_s
from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
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
- left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
where isa.ins_order_id = #{id}
and state = 1
- and ios.laboratory = #{laboratory}
- and (ipr2.num = ios.num or ipr2.num is null)
- and (ipr.num = ios.num or ipr.num is null)
- and isa.id in (select id1
- from (select is2.id id1, ip.id
- from ins_sample is2
- left join ins_product ip on is2.id =
- ip.ins_sample_id
- where ip.id is not null) s)
- order by case
- when man_hour_group is NULL then 1
- when man_hour_group = '' then 1
- else 0 end,
- CASE
- WHEN man_hour_group REGEXP '^[0-9]' THEN CAST(man_hour_group AS UNSIGNED) -- 濡傛灉浠ユ暟瀛楀紑澶达紝鍒欐寜鐓ф暟瀛楀ぇ灏忔帓搴�
- WHEN man_hour_group REGEXP '[0-9]+'
- THEN CAST(SUBSTRING(man_hour_group, 2) AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
- , id asc
- </select>
- <select id="selectSampleProductListByOrder2Id" resultMap="sampleDto">
- select isa.*,
- ios.num num1,
- ip.id ip_id,
- inspection_item,
- inspection_item_en,
- inspection_item_class,
- inspection_item_class_en,
- inspection_item_subclass,
- inspection_item_subclass_en,
- ip.factory ip_factory,
- ip.laboratory ip_laboratory,
- ip.sample_type ip_sample_type,
- ip.sample ip_sample,
- ip.model ip_model,
- son_laboratory,
- ip.unit ip_unit,
- price,
- man_hour,
- man_hour_group,
- inspection_item_type,
- inspection_value_type,
- device_group,
- checkout_number,
- section,
- value_type,
- method,
- man_day,
- bsm,
- ask,
- tell,
- `last_value`,
- ip.ins_result ip_ins_result,
- state,
- ins_sample_id,
- ip.create_user ip_create_user,
- ip.update_user ip_update_user,
- ip.create_time ip_create_time,
- ip.update_time ip_update_time,
- template_id,
- ipr.ins_value,
- ipr.com_value,
- ipr.equip_value,
- ipr2.frequency,
- ipr2.often,
- ipr2.port,
- ipr2.angle,
- ipr2.value,
- ipr2.result,
- ipr2.equip_value equipValue2,
- ipr2.equip_name equipName2,
- ip.method_s
- from ins_sample isa
- left join ins_order_state ios on isa.ins_order_id = ios.ins_order_id
- 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
- left join ins_product_result_2 ipr2 on ip.id = ipr2.ins_product_id
- where isa.ins_order_id = #{id}
- and state = 1
- and ios.laboratory = #{laboratory}
and isa.id in (select id1
from (select is2.id id1, ip.id
from ins_sample is2
@@ -687,8 +594,6 @@
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
and (ipr2.num = ios.num or ipr2.num is null)
@@ -755,8 +660,6 @@
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
order by ipr.id, ipr2.id
@@ -821,12 +724,9 @@
where ins_sample_id = #{id}
and state = 1
and ip.son_laboratory = #{laboratory}
- and ins_fiber_id is null
- and ins_fibers_id is null
and ip.standard_method_list_id is not null
and ios.laboratory = #{laboratory}
- and ipr2.num = #{num}
- and ipr.num = #{num}
+ and (ipr2.num = #{num} or ipr.num = #{num})
order by ipr.id, ipr2.id
</select>
@@ -891,7 +791,6 @@
<result property="lastValue" column="last_value" jdbcType="VARCHAR"/>
<result property="insResult" column="ip_ins_result" jdbcType="INTEGER"/>
<result property="state" column="state" jdbcType="INTEGER"/>
- <result property="insBushId" column="ins_bush_id" jdbcType="INTEGER"/>
<result property="insSampleId" column="ins_sample_id" jdbcType="INTEGER"/>
<result property="createUser" column="ip_create_user" jdbcType="INTEGER"/>
<result property="updateUser" column="ip_update_user" jdbcType="INTEGER"/>
@@ -995,4 +894,11 @@
where ins_order_id = #{orderId}
and ip.id is not null
</select>
+ <select id="selectSampleListByOrderId" resultType="com.yuanchu.mom.pojo.InsSample">
+ select DISTINCT ins_sample.*
+ from ins_sample
+ left join ins_product ip on ins_sample.id = ip.ins_sample_id
+ where ins_order_id = #{orderId}
+ and ip.id is not null
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
index 3202056..f9668bd 100644
--- a/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/inspect-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -67,7 +67,10 @@
</select>
<select id="selectDetail" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
- where standard_method_list_id = #{standardMethodListId}
+ where standard_method_list_id in
+ <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
and state =#{state}
and model=#{model}
order by case when man_hour_group is NULL then 1
@@ -79,7 +82,10 @@
</select>
<select id="selectDetail2" resultType="com.yuanchu.mom.pojo.StandardProductList">
select * from standard_product_list
- where standard_method_list_id = #{standardMethodListId}
+ where standard_method_list_id in
+ <foreach item="id" index="index" collection="ids" open="(" separator="," close=")">
+ #{id}
+ </foreach>
and state =#{state}
and tree =#{tree}
order by case when man_hour_group is NULL then 1
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
index c87ab6d..a6a3c63 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/RoleController.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.pojo.Role;
import com.yuanchu.mom.service.PowerService;
import com.yuanchu.mom.service.RoleService;
+import com.yuanchu.mom.service.UserService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
@@ -75,4 +77,11 @@
RolePowerDto powers = JSON.parseObject(str, RolePowerDto.class);
return Result.success(roleService.upRole(powers));
}
+
+ @ValueAuth
+ @ApiOperation(value = "鏌ョ湅褰撳墠鐢ㄦ埛鐨勮鑹�")
+ @GetMapping("/getRole")
+ public Result<?> getRole() {
+ return Result.success(roleService.getRole());
+ }
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/RoleService.java b/user-server/src/main/java/com/yuanchu/mom/service/RoleService.java
index bd39cc0..ddcdc96 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/RoleService.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/RoleService.java
@@ -24,4 +24,5 @@
int upRole(RolePowerDto rolePowerDto);
+ String getRole();
}
diff --git a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
index 755548b..3a873e9 100644
--- a/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
+++ b/user-server/src/main/java/com/yuanchu/mom/service/impl/RoleServiceImp.java
@@ -7,6 +7,7 @@
import com.yuanchu.mom.dto.RolePowerDto;
import com.yuanchu.mom.mapper.PowerMapper;
import com.yuanchu.mom.mapper.RoleMapper;
+import com.yuanchu.mom.mapper.UserMapper;
import com.yuanchu.mom.pojo.Menu;
import com.yuanchu.mom.pojo.Power;
import com.yuanchu.mom.pojo.Role;
@@ -29,6 +30,7 @@
private PowerMapper powerMapper;
private GetLook getLook;
+ private UserMapper userMapper;
@Override
public List<Role> selectList() {
@@ -87,4 +89,12 @@
}
return 1;
}
+
+ @Override
+ public String getRole() {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ Integer roleId = userMapper.selectById(userId).getRoleId();
+ Role role = roleMapper.selectById(roleId);
+ return role.getName();
+ }
}
\ No newline at end of file
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 2ff6b56..7416b38 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
@@ -111,10 +111,7 @@
@Override
public List<User> getUserMenu() {
- List<Integer> roleIds = roleMapper.selectList(Wrappers.<Role>lambdaQuery()
- .ne(Role::getCategory, 10003).or(wrapper -> wrapper.isNull(Role::getCategory))).stream().map(Role::getId).distinct().collect(Collectors.toList());
return userMapper.selectList(Wrappers.<User>lambdaQuery()
- .in(User::getRoleId, roleIds)
.eq(User::getState, 1).select(User::getName, User::getId));
}
--
Gitblit v1.9.3