From 87794ed4e7b7cf7b13f7deef5da3e3ff03255d81 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期日, 04 八月 2024 23:01:09 +0800
Subject: [PATCH] 检验任务负责人展示修改
---
cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java | 1
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 4 +
inspect-server/src/main/java/com/yuanchu/mom/mapper/InsSampleMapper.java | 2
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 62 ++++++++++++++++++++++++++++++
inspect-server/src/main/resources/static/report-template.docx | 0
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 14 -------
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 16 +++++--
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSampleUser.java | 2
9 files changed, 78 insertions(+), 25 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
index a4714a7..1097201 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java
@@ -980,7 +980,6 @@
public Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request) {
String ip = DataAcquisition.getIp(request);
Device device = baseMapper.selectOne(Wrappers.<Device>lambdaQuery()
- .eq(Device::getManagementNumber, managementNumber)
.eq(Device::getIp, ip));
if (ObjectUtils.isEmpty(device)) {
return Result.success(false);
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 9eb4e61..de7ba20 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
@@ -25,7 +25,7 @@
*/
public interface InsSampleMapper extends BaseMapper<InsSample> {
- IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
+ IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
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 8512567..7dab043 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
@@ -39,7 +39,7 @@
/**
* 1锛氱‘璁� 0锛氭湭纭
*/
-
+ //1鏄鏍镐汉 0鏄楠屼汉
private Integer state;
@TableField(fill = FieldFill.INSERT)
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 967d8e1..97e187c 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
@@ -154,13 +154,15 @@
laboratory = departLims;
}
}
+ String userName = null;
Integer userId = null;
if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
userId = map1.get("userId");
- insOrderPlanDTO.setUserId(userId.longValue());
+ userName=userMapper.selectById(map1.get("userId")).getName();
+ insOrderPlanDTO.setUserId(null);
}
String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//璇曢獙瀹�
- IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId, sonLaboratory, laboratory);
+ IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory);
map.put("body", insOrderPage);
return map;
}
@@ -201,7 +203,7 @@
}
Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
Integer userId = map1.get("userId");
- InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1, entity.getSonLaboratory());
+ InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 0, entity.getSonLaboratory());
return insSampleUserMapper.insert(insSampleUser) > 0;
}
@@ -3489,7 +3491,11 @@
.in(InsProduct::getInsSampleId, ids)
.eq(InsProduct::getSonLaboratory, laboratory)
.eq(InsProduct::getState, 1)
- .isNull(InsProduct::getInsResult)
+ .and(wrapper -> wrapper
+ .isNull(InsProduct::getInsResult)
+ .or()
+ .eq(InsProduct::getInsResult, 2)
+ )
.isNull(InsProduct::getInsFiberId)
.isNull(InsProduct::getInsFibersId));
insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
@@ -3556,7 +3562,7 @@
InsSampleUser insSampleUser = new InsSampleUser();
insSampleUser.setUserId(verifyUser);
insSampleUser.setInsSampleId(orderId);
- insSampleUser.setState(0);
+ insSampleUser.setState(1);
insSampleUser.setSonLaboratory(laboratory);
insSampleUserMapper.insert(insSampleUser);
/*鏍￠獙涓�涓媟esult琛�*/
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 b869df5..9da928c 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
@@ -332,7 +332,7 @@
throw new ErrorException("娓╁害寰幆鐨勮姹傛弿杩版牸寮忓紓甯�,璇峰弬鐓ф俯搴﹁寖鍥达細20鈩冿紝-40鈩冿紝65鈩冿紱淇濇俯鏃堕棿锛�12h锛� 寰幆娆℃暟锛�2娆★紱 鍏夌氦锛�1310nm锛�1550nm锛夐檮鍔犺“鍑忎笉澶т簬0.03dB/km");
}
//鎷兼帴
- String s=null;
+ String s="";
for (int i = 0; i < nm.length; i++) {
s+= "20鈩�(甯告俯)," + nm[i] + ",null;";
for (int j = 0; j < message.length; j++) {
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 9800317..3734f7e 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
@@ -199,20 +199,6 @@
}}, finalUrl);
wordToPdf(finalUrl, sealUrl);
- /* String replace = finalUrl.replace(".docx", ".pdf");
- CompletableFuture.supplyAsync(() -> {
- try {
- stamperCheckMarkPDF(replace,replace,sealUrl);
- return null;
- } catch (Exception e) {
- throw new ErrorException("楠戠紳绔犳彃鍏ュけ璐�");
- }
- }).thenAccept(res -> {
- }).exceptionally(e -> {
- e.printStackTrace();
- return null;
- });*/
-
InsOrder insOrder = new InsOrder();
insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
insOrder.setState(4);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index d4e6ec2..e38a1f1 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -22,8 +22,10 @@
@ValueTableShow(value = 5,name = "鐘舵��")
private String insState;
- @ValueTableShow(value = 5,name = "璐熻矗浜�")
+ @ValueTableShow(value = 5,name = "妫�楠屼汉")
private String userName;
+ @ValueTableShow(value = 5,name = "澶嶆牳浜�")
+ private String checkName;
private Integer userId;
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index ea09efc..f1b69e5 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -25,7 +25,7 @@
</resultMap>
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
- select * from(select * from(
+ <!--select * from(select * from(
SELECT
a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,verify_user
FROM
@@ -83,6 +83,66 @@
a.type DESC,
a.id
) b
+ where ins_state is not null-->
+
+ select * from(select * from(
+ SELECT
+ a.*,ios.ins_state,ios.verify_tell,verify_user
+ FROM
+ (
+ SELECT
+ io.id,
+ io.entrust_code,
+ io.type,
+ io.appointed,
+ io.send_time,
+ group_concat(distinct isa.sample,' ') sample,
+ userName,
+ checkName,
+ ip.son_laboratory,
+ io.ins_time,
+ io.laboratory
+ FROM
+ ins_order io
+ LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id
+
+ 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 son_laboratory=#{sonLaboratory}
+ and u.state=0
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id
+ ) isu ON isu.ins_sample_id = io.id
+ LEFT JOIN (
+ SELECT ins_sample_id,uu.name checkName
+ FROM ins_sample_user u LEFT JOIN user uu ON u.user_id = uu.id
+ WHERE son_laboratory=#{sonLaboratory}
+ and u.state=1
+ GROUP BY ins_sample_id
+ ORDER BY ins_sample_id
+ )isu2 ON isu2.ins_sample_id = io.id
+
+ LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
+ WHERE io.state = 1 and send_time is not null
+ <if test="userName !=null and userName!=''">
+ and ( (userName like CONCAT ('%', #{userName},'%') )
+ or (checkName like CONCAT ('%', #{userName},'%') ) )
+ </if>
+ and ip.son_laboratory=#{sonLaboratory}
+ GROUP BY
+ ip.son_laboratory,
+ io.id
+ ) a
+
+
+
+ LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
+
+ ORDER BY
+ a.type DESC,
+ a.id
+ ) b
where ins_state is not null
<if test="laboratory!=null and laboratory!=''">
and laboratory=#{laboratory}
diff --git a/inspect-server/src/main/resources/static/report-template.docx b/inspect-server/src/main/resources/static/report-template.docx
index aeb7d58..4a6e506 100644
--- a/inspect-server/src/main/resources/static/report-template.docx
+++ b/inspect-server/src/main/resources/static/report-template.docx
Binary files differ
--
Gitblit v1.9.3