From 0d98e9c2d06c5d8b7b6de5ec433a12713744ae6b Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 18 三月 2024 01:04:38 +0800
Subject: [PATCH] 功能大调整
---
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderService.java | 16
framework/src/main/java/com/yuanchu/mom/common/AllController.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java | 6
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 31 ++
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 41 +--
framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java | 4
inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java | 6
inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java | 9
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java | 20
framework/src/main/java/com/yuanchu/mom/config/LogConfig.java | 7
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsProductMapper.java | 2
framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java | 4
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrder.java | 24 -
inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java | 1
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 86 +++++--
system-run/src/main/resources/application-prod.yml | 16
framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java | 1
inspect-server/src/main/resources/mapper/SampleOrderMapper.xml | 2
framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java | 3
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 5
framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java | 25 ++
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 47 +++
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java | 14 +
system-run/src/main/resources/application-dev.yml | 4
/dev/null | 133 -----------
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 48 +--
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java | 64 ++--
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsProduct.java | 43 ++-
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderMapper.java | 11
31 files changed, 350 insertions(+), 332 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/common/AllController.java b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
index 5c4c7a5..f850b67 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/AllController.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/AllController.java
@@ -51,6 +51,7 @@
}
}
}
+ System.out.println("********************鏉冮檺鑿滃崟瀹屾垚********************");
}
@PostConstruct
diff --git a/framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java b/framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java
index 2a58e9d..bf55558 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/FiferConfig.java
@@ -84,12 +84,11 @@
@Override
public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
}
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-// System.out.println("-------------------------鎷︽埅鍣ㄦ牎楠岄�氳繃---------------------------");
+
}
private List<String> list;
diff --git a/framework/src/main/java/com/yuanchu/mom/config/LogConfig.java b/framework/src/main/java/com/yuanchu/mom/config/LogConfig.java
index b92f2b4..3246661 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/LogConfig.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/LogConfig.java
@@ -46,7 +46,11 @@
SystemLog systemLog = new SystemLog();
systemLog.setMethod(method.getName());
systemLog.setMethodName(value);
- systemLogMapper.insert(systemLog);
+ try {
+ systemLogMapper.insert(systemLog);
+ }catch (Exception e){
+ throw new ErrorException("璇烽噸鏂扮櫥褰�");
+ }
}
return HandlerInterceptor.super.preHandle(request, response, handler);
}
@@ -59,5 +63,6 @@
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
+
}
}
diff --git a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
index 710d8ab..1537594 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/OpenFifer.java
@@ -1,6 +1,6 @@
package com.yuanchu.mom.config;
-import org.springframework.beans.factory.annotation.Autowired;
+import cn.hutool.log.Log;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
diff --git a/framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java b/framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java
index ea9b1c3..bc08492 100644
--- a/framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java
+++ b/framework/src/main/java/com/yuanchu/mom/config/PowerConfig.java
@@ -56,5 +56,6 @@
@Override
public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
+
}
}
diff --git a/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java b/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
index c57f37b..c6db317 100644
--- a/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
+++ b/framework/src/main/java/com/yuanchu/mom/mapper/SystemLogMapper.java
@@ -7,6 +7,7 @@
import com.yuanchu.mom.pojo.PageSystemLogDto;
import com.yuanchu.mom.pojo.SystemLog;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
/**
* 绯荤粺鏃ュ織(SystemLog)琛ㄦ暟鎹簱璁块棶灞�
@@ -18,5 +19,8 @@
public interface SystemLogMapper extends BaseMapper<SystemLog> {
IPage<PageSystemLogDto> selectSystemLogList(Page page, QueryWrapper<PageSystemLogDto> ew);
+
+ @Select("select coalesce(count(id), 0) from ${tableName} where create_time like concat('%', #{date}, '%')")
+ int countRowsByNow(String tableName, String date);
}
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
new file mode 100644
index 0000000..42448d5
--- /dev/null
+++ b/framework/src/main/java/com/yuanchu/mom/utils/GiveCode.java
@@ -0,0 +1,25 @@
+package com.yuanchu.mom.utils;
+
+import com.yuanchu.mom.mapper.SystemLogMapper;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+@Component
+public class GiveCode {
+
+ @Resource
+ private SystemLogMapper systemLogMapper;
+
+ public String giveCode(String code, String tableName){
+ String date = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+ int num = systemLogMapper.countRowsByNow(tableName, LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))) + 1;
+ String nums = num + "";
+ if(nums.length() == 1) nums = "00" + num;
+ else if(nums.length() == 2) nums = "0" + num;
+ return code + date + "-" + nums;
+ }
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
index 1cc8262..dc47e67 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderController.java
@@ -1,10 +1,16 @@
package com.yuanchu.mom.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.dto.InsOderDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.service.InsProductService;
import com.yuanchu.mom.service.InsSampleService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
@@ -15,6 +21,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
import java.util.Map;
@RestController
@@ -26,47 +35,38 @@
private InsSampleService insSampleService;
+ private InsProductService insProductService;
+
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@ApiOperation(value = "鏌ヨ妫�楠屼笅鍗曟暟鎹�")
@PostMapping("/selectInsOrderParameter")
public Result selectInsOrderParameter(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- InsOrder itemParameter = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InsOrder.class);
- return Result.success(insOrderService.selectInsOrderParameter(page, itemParameter));
+ SampleOrderDto sampleOrderDto = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), SampleOrderDto.class);
+ return Result.success(insOrderService.selectInsOrderParameter(page, sampleOrderDto));
+ }
+
+ @ApiOperation(value = "妫�楠屼笅鍙�")
+ @PostMapping("/upInsOrder")
+ public Result<?> upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+ return Result.success(insOrderService.upInsOrder(orderId, sampleId, appointed, userId));
}
@ApiOperation(value = "娣诲姞妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/addInsOrderParameter")
- public Result addInsOrderParameter(@RequestBody InsOrder itemParameter) {
- return Result.success(insOrderService.addInsOrderParameter(itemParameter));
- }
-
- @ApiOperation(value = "鍒犻櫎妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/delInsOrderParameter")
- public Result<?> delInsOrderParameter(Integer id) {
- return Result.success(insOrderService.delInsOrderParameter(id));
- }
-
- @ApiOperation(value = "淇敼妫�楠屼笅鍗曟暟鎹�")
- @PostMapping("/upInsOrderParameter")
- public Result<?> upInsOrderParameter(@RequestBody InsOrder itemParameter) {
- return Result.success(insOrderService.upInsOrderParameter(itemParameter));
- }
-
- @ApiOperation(value = "淇敼妫�楠屼笅鍙戞暟鎹�")
- @PostMapping("/updateInsOrder")
- public Result updateInsOrder(@RequestBody InsOderDto insOderDto) {
- InsSample insSample = new InsSample();
- insSample.setId(insOderDto.getId());
- insSample.setCreateTime(insOderDto.getDate());
- insSample.setCreateUser(insOderDto.getOrderName());
- return Result.success(insSampleService.updateById(insSample));
- }
-
- @ApiOperation(value = "鏂板妫�楠屼笅鍙戞暟鎹�")
@PostMapping("/addInsOrder")
- public Result addInsOrder(@RequestBody InsSample insSample) {
- return Result.success(insSampleService.save(insSample));
+ public Result<?> addInsOrder(@RequestBody Map<String, Object> map) {
+ JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(map.get("list")));
+ List<SampleProductDto> list = jsonArray.toJavaList(SampleProductDto.class);
+ InsOrder insOrder = JSON.parseObject(JSON.toJSONString(map.get("insOrder")), InsOrder.class);
+ return Result.success(insOrderService.addInsOrder(list, insOrder));
+ }
+
+ @ApiOperation(value = "鏌ヨ璁㈠崟鎬诲叡棰勮鏃堕棿")
+ @PostMapping("/selectOrderManDay")
+ @ValueAuth
+ public Result<?> selectOrderManDay(Integer id) {
+ int day = insProductService.selectOrderManDay(id);
+ return Result.success("鎴愬姛", LocalDateTime.now().plusDays(day).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
index 0d0d11b..fee7b56 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/StandardTreeController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.yuanchu.mom.service.InsOrderService;
@@ -84,11 +85,11 @@
return Result.success(standardTreeService.delStandardTree(tree));
}
- @ApiOperation(value = "澶栭儴鑾峰彇妫�娴嬫暟鎹�")
- @GetMapping("/getOrderThing")
+ @ApiOperation(value = "閫氳繃鏍囧噯鏍戞煡璇㈠搴旂殑妫�楠岄」鐩�")
+ @PostMapping("/selectStandardProductList")
@ValueAuth
- public Result getOrderThing(){
- return Result.success(insOrderService.getOrderThing());
+ public Result selectStandardProductList(@RequestBody InsSample insSample){
+ return Result.success(standardProductListService.selectStandardProductList(insSample));
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java
deleted file mode 100644
index 852c00d..0000000
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.yuanchu.mom.dto;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.yuanchu.mom.pojo.InsOrder;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * @author gaoaoy
- * @version 1.0.0
- * @create 2024/3/14 18:46
- **/
-@Data
-public class SampleOrder {
- @TableId(type = IdType.AUTO)
- private Integer id;
-
- /**
- * 1锛氬悎鏍� 0锛氫笉鍚堟牸
- */
- private Integer insResult;
-
- /**
- * 澶栭敭锛歩ns_order琛╥d
- */
- private Integer insOrderId;
-
- /**
- * 閰嶅鏍峰搧鍨嬪彿
- */
- private String joinModel;
-
- /**
- * 閰嶅鏍峰搧鍚嶇О
- */
- private String joinName;
-
- /**
- * 鏍峰搧缂栫爜
- */
- private String sampleCode;
-
- /**
- * 妫�楠屽伐鍘�
- */
- private String factory;
-
- /**
- * 瀹為獙瀹ゅ悕绉�
- */
- private String laboratory;
-
- /**
- * 鏍峰搧绫诲瀷
- */
- private String sampleType;
-
- /**
- * 鏍峰搧鍚嶇О
- */
- private String sample;
-
- /**
- * 瑙勬牸鍨嬪彿
- */
- private String model;
-
- /**
- * 鏄惁鐣欐牱 1锛氱暀鏍� 0锛氫笉鐣欐牱
- */
- private Integer isLeave;
-
- /**
- * 鐣欐牱鏁伴噺
- */
- private Integer leaveNum;
-
- /**
- * 妫�娴嬭繘搴�
-
- */
- private String insProgress;
-
- /**
- * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
- */
- private Integer insState;
-
- /**
- * 涓嬪彂鏃堕棿
- */
- private Date sendTime;
-
- /**
- * 閰嶅鏍峰搧鏁伴噺
- */
- private Integer joinNum;
-
- /**
- * 澶囨敞
- */
- private String remark;
-
- /**
- * 绾﹀畾鏃堕棿
- */
- private Date appointed;
-
- /**
- *
- */
- private Integer createUser;
-
- /**
- *
- */
- private Integer updateUser;
-
- /**
- *
- */
- private Date createTime;
-
- /**
- *
- */
- private Date updateTime;
-
- private List<InsOrder> insOrderList;
-}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
new file mode 100644
index 0000000..945396e
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -0,0 +1,47 @@
+package com.yuanchu.mom.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.pojo.InsOrder;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @author gaoaoy
+ * @version 1.0.0
+ * @create 2024/3/14 18:46
+ **/
+@Data
+public class SampleOrderDto extends InsOrder {
+
+ private Integer sampleId;
+
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧缂栧彿")
+ private String sampleCode;
+
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sample;
+
+ @ApiModelProperty("妫�楠岃繘搴�")
+ private Integer insProgress;
+
+ @ValueTableShow(7)
+ @ApiModelProperty("妫�楠岃繘搴�%")
+ private String insProgress2;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+
+ public String getInsProgress2() {
+ return this.insProgress + "%";
+ }
+
+ @ApiModelProperty("鎶ュ憡id")
+ private String reportId;
+
+}
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
new file mode 100644
index 0000000..eff48f1
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleProductDto.java
@@ -0,0 +1,14 @@
+package com.yuanchu.mom.dto;
+
+import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.pojo.InsSample;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SampleProductDto extends InsSample {
+
+ private List<InsProduct> insProduct;
+
+}
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 19f7c27..e3d5a04 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
@@ -3,11 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yuanchu.mom.dto.InsOderDto;
-import com.yuanchu.mom.dto.OrderThingDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.pojo.InsOrder;
-
-import java.util.List;
/**
* @author gaoaoy
@@ -17,16 +14,12 @@
*/
public interface InsOrderMapper extends BaseMapper<InsOrder> {
- List<OrderThingDto> getOrderThing();
-
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- IPage<InsOrder> selectInsOrderParameter(IPage<InsOrder> page, QueryWrapper<InsOrder> ew);
+ IPage<SampleOrderDto> selectInsOrderPage(IPage<InsOrder> page, QueryWrapper<SampleOrderDto> ew);
//淇敼妫�楠屼笅鍗曟暟鎹�
int upInsOrderParameter(InsOrder itemParameter);
- //娣诲姞妫�楠屼笅鍗曟暟鎹�
- int addInsOrder(InsOderDto insOderDto);
}
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 1f4dba0..6dfaf0e 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
@@ -11,6 +11,8 @@
*/
public interface InsProductMapper extends BaseMapper<InsProduct> {
+ int selectOrderManDay(Integer sampleId);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java
index 14da193..44cbc7a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/SampleOrderMapper.java
@@ -1,7 +1,7 @@
package com.yuanchu.mom.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yuanchu.mom.dto.SampleOrder;
+import com.yuanchu.mom.dto.SampleOrderDto;
import java.util.List;
@@ -10,6 +10,6 @@
* @version 1.0.0
* @create 2024/3/14 18:54
**/
-public interface SampleOrderMapper extends BaseMapper<SampleOrder> {
- List<SampleOrder> selectSampleOrderList();
+public interface SampleOrderMapper extends BaseMapper<SampleOrderDto> {
+ List<SampleOrderDto> selectSampleOrderList();
}
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 d50b2ff..3c2d821 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
@@ -1,9 +1,6 @@
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.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
@@ -21,6 +18,7 @@
* @TableName ins_order
*/
@Data
+@TableName("ins_order")
public class InsOrder extends OrderBy implements Serializable {
@ApiModelProperty(value = "涓婚敭")
@@ -32,7 +30,7 @@
*/
@ValueTableShow(2)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
- @ApiModelProperty("濮旀墭缂栧彿")
+ @ApiModelProperty(value = "濮旀墭缂栧彿")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
private String entrustCode;
@@ -57,7 +55,6 @@
/**
* 宸ュ巶鍩�
*/
- @ValueTableShow(5)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("宸ュ巶鍩�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -66,15 +63,15 @@
/**
* 绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級
*/
- @ValueTableShow(6)
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @ValueTableShow(value = 6, name = "绱ф�ョ▼搴�")
+ @ApiModelProperty("绱ф�ョ▼搴� 锛�0鏅�� 1浼樺厛 2绱ф�ワ級")
private Integer type;
/**
* 绾﹀畾鏃堕棿
*/
@ValueTableShow(7)
- @ApiModelProperty("绾﹀畾鏃堕棿")
+ @ApiModelProperty("闇�姹傛椂闂�")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate appointed;
@@ -82,7 +79,7 @@
/**
* 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�
*/
- @ApiModelProperty("妫�楠屽鐞�")
+ @ApiModelProperty("鐘舵��")
private Integer state;
/**
@@ -97,7 +94,6 @@
/**
* OTC璁㈠崟鍙�
*/
- @ValueTableShow(10)
@Size(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@ApiModelProperty("OTC璁㈠崟鍙�")
@Length(max= 255,message="缂栫爜闀垮害涓嶈兘瓒呰繃255")
@@ -107,7 +103,6 @@
@ApiModelProperty("涓嬪崟浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
-
/**
*
*/
@@ -127,10 +122,13 @@
/**
*
*/
- @ValueTableShow(13)
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+ private Integer userId;
+
+ private Integer mating;
+
}
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 1051f71..2014bd2 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
@@ -35,7 +35,7 @@
private String inspectionItemClassify;
/**
- * 妫�楠岄」灏忕被
+ * 妫�楠岄」瀛愮被
*/
private String inspectionItemSubclass;
@@ -64,7 +64,9 @@
*/
private String model;
- @ApiModelProperty("瀛愬疄楠屽")
+ /**
+ * 瀛愬疄楠屽
+ */
private String sonLaboratory;
/**
@@ -80,7 +82,7 @@
/**
* 宸ユ椂(H)
*/
- private Integer manHour;
+ private Double manHour;
/**
* 宸ユ椂鍒嗙粍
@@ -138,34 +140,43 @@
private String ask;
/**
+ * 鏈�缁堝��
+ */
+ private String lastValue;
+
+ /**
+ * 1锛氬悎鏍� 0锛氫笉鍚堟牸
+ */
+ private Integer insResult;
+
+ /**
* 1锛氭湁鏁� 0锛氭棤鏁�
*/
private Integer state;
- @ApiModelProperty("鍨嬪彿")
- private Integer templateId;
+ /**
+ * 澶栭敭锛歩ns_sample琛╥d
+ */
+ private Integer insSampleId;
- @ApiModelProperty("")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- /**
- *
- */
+
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- /**
- *
- */
- @ApiModelProperty("")
+
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- /**
- *
- */
+
@ApiModelProperty("淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ /**
+ * 澶栭敭锛歴tandard_template琛╥d
+ */
+ private Integer templateId;
}
\ No newline at end of file
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 bf057a2..eb0aced 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
@@ -1,14 +1,15 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
/**
* 妫�楠屾牱鍝�
@@ -85,9 +86,8 @@
/**
* 妫�娴嬭繘搴�
-
*/
- private String insProgress;
+ private Integer insProgress;
/**
* 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃5锛氬鏍搁�氳繃)
@@ -97,7 +97,9 @@
/**
* 涓嬪彂鏃堕棿
*/
- private Date sendTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
/**
* 閰嶅鏍峰搧鏁伴噺
@@ -112,26 +114,22 @@
/**
* 绾﹀畾鏃堕棿
*/
- private Date appointed;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate appointed;
- /**
- *
- */
+ @TableField(fill = FieldFill.INSERT)
private Integer createUser;
- /**
- *
- */
- private Integer updateUser;
-
- /**
- *
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- /**
- *
- */
- private Date updateTime;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
}
\ No newline at end of file
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 ae76ec9..2afb817 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
@@ -3,9 +3,11 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
+import java.time.LocalDateTime;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -39,21 +41,21 @@
private Integer state;
- /**
- * 鍒涘缓浜�
- */
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- /**
- * 鍒涘缓鏃堕棿
- */
+ @ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ private LocalDateTime createTime;
- @TableField(exist = false)
- private static final long serialVersionUID = 1L;
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @ApiModelProperty("淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime updateTime;
public InsSampleUser(Integer insSampleId, Integer userId, Integer state) {
this.insSampleId = insSampleId;
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 24cad7c..8092635 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.pojo.InsOrder;
import java.util.List;
@@ -16,20 +18,12 @@
*/
public interface InsOrderService extends IService<InsOrder> {
- List<OrderThingDto> getOrderThing();
-
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
- Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter);
-
- //娣诲姞妫�楠屼笅鍗曟暟鎹�
- int addInsOrderParameter(InsOrder itemParameter);
-
- //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
- int delInsOrderParameter(Integer id);
+ Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto);
//淇敼妫�楠屼笅鍗曟暟鎹�
- int upInsOrderParameter(InsOrder itemParameter);
+ int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId);
- int addInsOrder(InsOderDto insOderDto);
+ int addInsOrder(List<SampleProductDto> list, InsOrder insOrder);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java
index dfe6fd0..b10bf6a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/SampleOrderService.java
@@ -1,7 +1,7 @@
package com.yuanchu.mom.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.dto.SampleOrder;
+import com.yuanchu.mom.dto.SampleOrderDto;
import java.util.List;
@@ -10,6 +10,6 @@
* @version 1.0.0
* @create 2024/3/14 19:07
**/
-public interface SampleOrderService extends IService<SampleOrder> {
- List<SampleOrder> selectSampleOrderList();
+public interface SampleOrderService extends IService<SampleOrderDto> {
+ List<SampleOrderDto> selectSampleOrderList();
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
index 8d547a1..30e9569 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardProductListService.java
@@ -1,10 +1,12 @@
package com.yuanchu.mom.service;
import com.alibaba.fastjson.JSONArray;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Administrator
@@ -17,4 +19,6 @@
int delStandardProduct(JSONArray list);
+ List<StandardProductList> selectStandardProductList(InsSample insSample);
+
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
index 7ebb3f8..41bcb62 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/StandardTreeService.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.service;
import com.yuanchu.mom.dto.FactoryDto;
+import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.pojo.StandardTree;
import com.baomidou.mybatisplus.extension.service.IService;
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 a2c1f24..5951f29 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
@@ -1,18 +1,31 @@
package com.yuanchu.mom.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
import com.yuanchu.mom.common.PrintChina;
import com.yuanchu.mom.dto.InsOderDto;
import com.yuanchu.mom.dto.OrderThingDto;
+import com.yuanchu.mom.dto.SampleOrderDto;
+import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.InsOrderMapper;
+import com.yuanchu.mom.mapper.InsProductMapper;
+import com.yuanchu.mom.mapper.InsSampleMapper;
+import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
+import com.yuanchu.mom.pojo.InsProduct;
+import com.yuanchu.mom.pojo.InsSample;
+import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.InsOrderService;
+import com.yuanchu.mom.utils.GiveCode;
import com.yuanchu.mom.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,43 +44,66 @@
private InsOrderMapper insOrderMapper;
- @Override
- public List<OrderThingDto> getOrderThing() {
- return insOrderMapper.getOrderThing();
- }
+ private InsSampleMapper insSampleMapper;
+
+ private InsProductMapper insProductMapper;
+
+ private GiveCode giveCode;
+
+ private InsSampleUserMapper insSampleUserMapper;
//鑾峰彇妫�楠屼笅鍗曟暟鎹�
@Override
- public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, InsOrder itemParameter) {
+ public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
Map<String, Object> map = new HashMap<>();
- map.put("head", PrintChina.printChina(InsOrder.class));
+ map.put("head", PrintChina.printChina(SampleOrderDto.class));
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId("selectInsOrderParameter");
- if (map1.get("look") == 1) itemParameter.setCreateUser(map1.get("userId"));
- map.put("body", insOrderMapper.selectPage(page, QueryWrappers.queryWrappers(itemParameter)));
+ if (map1.get("look") == 1) sampleOrderDto.setCreateUser(map1.get("userId"));
+ map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto)));
return map;
}
- //娣诲姞妫�楠屼笅鍗曟暟鎹�
@Override
- public int addInsOrderParameter(InsOrder itemParameter) {
- return insOrderMapper.insert(itemParameter);
- }
-
- //鍒犻櫎妫�楠屼笅鍗曟暟鎹�
- @Override
- public int delInsOrderParameter(Integer id) {
- return insOrderMapper.deleteById(id);
- }
-
- //淇敼妫�楠屼笅鍗曟暟鎹�
- @Override
- public int upInsOrderParameter(InsOrder itemParameter) {
- return insOrderMapper.updateById(itemParameter);
+ @Transactional(rollbackFor = Exception.class)
+ public int upInsOrder(Integer orderId,Integer sampleId, String appointed, Integer userId) {
+ InsOrder insOrder = new InsOrder();
+ insOrder.setId(orderId);
+ insOrderMapper.updateById(insOrder);
+ InsSample insSample = new InsSample();
+ insSample.setId(sampleId);
+ insSample.setAppointed(LocalDate.parse(appointed));
+ insSample.setSendTime(LocalDateTime.now());
+ insSampleMapper.updateById(insSample);
+ InsSampleUser insSampleUser = new InsSampleUser();
+ insSampleUser.setState(0);
+ insSampleUser.setUserId(userId);
+ insSampleUser.setInsSampleId(sampleId);
+ insSampleUserMapper.insert(insSampleUser);
+ return 1;
}
@Override
- public int addInsOrder(InsOderDto insOderDto) {
- return insOrderMapper.addInsOrder(insOderDto);
+ @Transactional(rollbackFor = Exception.class)
+ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder) {
+ insOrder.setState(0);
+ insOrder.setEntrustCode(giveCode.giveCode("JCZX-", "ins_order"));
+ insOrderMapper.insert(insOrder);
+ list.forEach(a->{
+ a.setId(null);
+ a.setInsOrderId(insOrder.getId());
+ a.setInsProgress(0);
+ insSampleMapper.insert(a);
+ for (InsProduct product : a.getInsProduct()) {
+ product.setId(null);
+ product.setCreateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateTime(null);
+ product.setUpdateUser(null);
+ product.setInsSampleId(a.getId());
+ insProductMapper.insert(product);
+ }
+ });
+ return 1;
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java
index b991fea..8e341df 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/SampleOrderServiceImpl.java
@@ -1,7 +1,7 @@
package com.yuanchu.mom.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.dto.SampleOrder;
+import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.mapper.SampleOrderMapper;
import com.yuanchu.mom.service.SampleOrderService;
import lombok.AllArgsConstructor;
@@ -16,13 +16,13 @@
**/
@Service
@AllArgsConstructor
-public class SampleOrderServiceImpl extends ServiceImpl<SampleOrderMapper,SampleOrder> implements SampleOrderService {
+public class SampleOrderServiceImpl extends ServiceImpl<SampleOrderMapper, SampleOrderDto> implements SampleOrderService {
private SampleOrderMapper sampleOrderMapper;
@Override
- public List<SampleOrder> selectSampleOrderList() {
+ public List<SampleOrderDto> selectSampleOrderList() {
return sampleOrderMapper.selectSampleOrderList();
}
}
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 db9964b..96c6738 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
@@ -1,22 +1,28 @@
package com.yuanchu.mom.service.impl;
import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.StandardProductList;
import com.yuanchu.mom.service.StandardProductListService;
import com.yuanchu.mom.mapper.StandardProductListMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-03-05 10:33:29
-*/
+ * @author Administrator
+ * @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-03-05 10:33:29
+ */
@Service
@AllArgsConstructor
public class StandardProductListServiceImpl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService{
+ implements StandardProductListService {
private StandardProductListMapper standardProductListMapper;
@@ -29,6 +35,21 @@
public int delStandardProduct(JSONArray list) {
return standardProductListMapper.deleteBatchIds(list);
}
+
+ @Override
+ public List<StandardProductList> selectStandardProductList(InsSample insSample) {
+ List<StandardProductList> list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()).eq(StandardProductList::getModel, insSample.getModel()));
+ if (list.size() == 0) {
+ list = standardProductListMapper.selectList(Wrappers.<StandardProductList>lambdaQuery().eq(StandardProductList::getFactory, insSample.getFactory()).eq(StandardProductList::getLaboratory, insSample.getLaboratory()).eq(StandardProductList::getSampleType, insSample.getSampleType()).eq(StandardProductList::getSample, insSample.getSample()));
+ try {
+ list = list.stream().filter(a -> {
+ String[] split = a.getSection().split("~");
+ return new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[0])) > -1 && new BigDecimal(insSample.getModel()).compareTo(new BigDecimal(split[1])) < 1;
+ }).collect(Collectors.toList());
+ } catch (Exception e) {}
+ }
+ return list;
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index 9c99c2c..3a6a8cb 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -20,24 +20,6 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,entrust_code,sample_code,
- custom,company,code,
- type,appointed_time,laboratory,
- smaple_type,model,sample,
- sample_num,is_leave,leave_num,
- ins_progress,state,remark,
- otc_code,create_user,create_time,
- update_user,update_time
- </sql>
-
- <select id="addInsOrder">
- insert into ins_order
- (entrust_code,sample_code,custom,company,code,type,laboratory,model,sample,sample_num,is_leave,leave_num,ins_progress,state,remark,otc_code,create_user,create_time,update_user,update_time)
- values
- (#{entrustCode},#{sampleCode},#{custom},#{company},#{code},#{type},#{appointedTime},#{laboratory},#{smapleType},#{model},#{sample},#{sampleNum},#{isLeave},#{leaveNum},#{insProgress},#{state},#{remark},#{otcCode},#{createUser},#{createTime},#{updateUser},#{updateTime})
- </select>
-
<resultMap id="OrderThingDto" type="com.yuanchu.mom.dto.OrderThingDto">
<result property="id" column="id"/>
<result property="company" column="company"/>
@@ -68,13 +50,6 @@
<result property="remark" column="remark"/>
</resultMap>
- <select id="getOrderThing" resultMap="OrderThingDto">
- select *
- from ins_order io
- left join ins_product ip on ip.ins_order_id = io.id
- left join ins_product_result ipr on ip.id = ipr.ins_product_id
- </select>
-
<select id="selectInsOrderParameter" resultType="com.yuanchu.mom.pojo.InsOrder">
select *
from (
@@ -95,6 +70,20 @@
create_time,
state
from ins_order
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+ <select id="selectInsOrderPage" resultType="com.yuanchu.mom.dto.SampleOrderDto">
+ select *
+ from (
+ select io.*,isa.id sampleId,isa.sample_code,isa.sample,isa.ins_progress,ir.id report_id,isa.send_time
+ from ins_order io
+ left join ins_sample isa on io.id = isa.ins_order_id
+ left join (select id, ins_order_id, is_ratify
+ from ins_report
+ where is_ratify = 1) ir on io.id = ir.ins_order_id
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
@@ -121,7 +110,7 @@
</set>
<where>
id=#{id}
- </where>-->
+ </where>
</update>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index 94744ff..de4133c 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -47,4 +47,9 @@
create_user,update_user,create_time,
update_time
</sql>
+ <select id="selectOrderManDay" resultType="java.lang.Integer">
+ select coalesce(sum(ip.man_day), 0) from ins_sample i
+ left join ins_product ip on i.id = ip.ins_sample_id
+ where i.id = #{sampleId}
+ </select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml b/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml
index c2758e7..46ed438 100644
--- a/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/SampleOrderMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.SampleOrderMapper">
- <resultMap id="map" type="com.yuanchu.mom.dto.SampleOrder">
+ <resultMap id="map" type="com.yuanchu.mom.dto.SampleOrderDto">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="insResult" column="ins_result" jdbcType="INTEGER"/>
<result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index f129e9a..46a906f 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -18,7 +18,7 @@
# 鐓х墖瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: /Users/gaoaoy/webapp/images
+ path: D:\Download
# 涓婁紶鏂囦欢鍏佽鐨勬墿灞曞悕
allowed: png,jpg,jpeg,gif
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.0.134
+ host: 127.0.0.1
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
diff --git a/system-run/src/main/resources/application-prod.yml b/system-run/src/main/resources/application-prod.yml
index 5ccc007..d1dc538 100644
--- a/system-run/src/main/resources/application-prod.yml
+++ b/system-run/src/main/resources/application-prod.yml
@@ -5,20 +5,20 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location: /www/wwwroot/syxt.shxiao2.cn/ShengYun
+ file-location: /javaWork/center-lims/img
# 鏁版嵁搴撳浠借矾寰�
backup:
# 鏁版嵁搴撳浠借矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- path: /www/wwwroot/syxt.shxiao2.cn/ShengYun
+ path: /javaWork/center-lims/img
# 鏁版嵁搴撳浠藉ぉ鏁�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
destiny: 7
# 鏁版嵁搴撳浠藉伐鍏疯矾寰�+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- mysqldump: /www/wwwroot/syxt.shxiao2.cn/ShengYun
+ mysqldump: /javaWork/center-lims/img
# 鐓х墖璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
file:
- path: /www/wwwroot/syxt.shxiao2.cn/ShengYun
+ path: /javaWork/center-lims/img
mybatis-plus:
configuration:
@@ -30,8 +30,8 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/center-lims?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
- username: root
- password: 123456
+ username: center-lims
+ password: wSRFBmB5eHZKkSKL
druid:
# Druid鏁版嵁婧愰厤缃�
initialSize: 5 # 鍒濆杩炴帴鏁�
@@ -58,9 +58,9 @@
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负loaclhost锛�
host: 127.0.0.1
# redis绔彛锛堥粯璁や负6379锛�
- port: 6381
+ port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
- # password:
+ password: root2022
# redis杩炴帴瓒呮椂鏃堕棿锛堝崟浣嶆绉掞級
timeout: 20
# redis杩炴帴姹犻厤缃�
--
Gitblit v1.9.3