From 1bc536c54fc1c2f25a4cff4b162cfa6979604fff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 29 八月 2024 17:31:10 +0800
Subject: [PATCH] 企业微信对接+工时优化+设备查询项目树结构优化
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsSample.java | 3
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 1
cnas-server/src/main/java/com/yuanchu/mom/service/impl/PkMasterServiceImpl.java | 1
framework/src/main/java/com/yuanchu/mom/utils/QYWXApi.java | 67 +++++++++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 94 ++++++++++--------
cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 8 -
cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 61 +++++++++--
user-server/src/main/resources/mapper/UserMapper.xml | 2
performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java | 1
user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 4
12 files changed, 180 insertions(+), 66 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 1e72fb4..809e377 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -120,7 +120,7 @@
return Result.success(capacityScopeService.selectTestObjectByName());
}
- @ValueClassify("璁惧")
+ @ValueAuth
@ApiOperation(value = "璁惧閲岄潰閫夋嫨妫�楠岄」鐩�(鏍戝舰缁撴瀯)")
@PostMapping("/getInsProduction")
public Result getInsProduction() {
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
index 9bd92be..79469ea 100644
--- 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
@@ -100,7 +100,6 @@
Map<String, Object> map = insOrderPlanService.temCycle(insSample.getId(), pkMaster.getCycles(), pkMaster.getTemperature());
List<ProductVo> productVos = (List<ProductVo>) map.get("productVos");
if (CollectionUtils.isNotEmpty(productVos)) {
- //todo 濡傛灉娓╁害寰幆鐨勯」鐩畁m鏈夋敼鍔ㄨ繖閲岄渶瑕佹敼鍔� @zss
for (PkSlave pkSlave : pkSlaves) {
for (ProductVo productVo : productVos) {
if (pkSlave.getInsBushingId().equals(productVo.getBushColor()) &&
diff --git a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index e732e26..57616e4 100644
--- a/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -79,20 +79,53 @@
<result property="name" column="subclass"/>
</resultMap>
<select id="getInsProduction" resultMap="getInsProductions">
- select distinct id,
- CASE
- WHEN INSTR(sample, ',') > 0 THEN
- SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1)
- when sample = '[""]' then '*'
- ELSE
- TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1))
- END
- as sample,
- inspection_item,
- case
- when inspection_item_subclass is null then inspection_item
- else inspection_item_subclass end as subclass
- from structure_item_parameter
+ WITH expanded_sample AS (
+ SELECT
+ id,
+ CASE
+ WHEN INSTR(sample, '","') > 0 THEN
+ SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '","', 1), '"', -1)
+ when sample = '[]' then '*'
+ WHEN INSTR(sample, '"],["') > 0 THEN
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '"],["', 1), '"', -1))
+ ELSE
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(REPLACE(sample, '[["', ''), '"]]', 1))
+ END
+ AS component1,
+ CASE
+ WHEN INSTR(sample, '"],["') > 0 THEN
+ TRIM(BOTH '["]' FROM SUBSTRING_INDEX(SUBSTRING_INDEX(sample, '"],["', -1), '"', 1))
+ ELSE
+ NULL
+ END AS component2,
+ inspection_item,
+ CASE
+ WHEN inspection_item_subclass IS NULL THEN inspection_item
+ ELSE inspection_item_subclass
+ END AS subclass
+ FROM
+ structure_item_parameter
+ )
+ SELECT
+ id,
+ CASE
+ WHEN component1 IS NOT NULL THEN component1
+ ELSE '*'
+ END AS sample,
+ inspection_item,
+ subclass
+ FROM
+ expanded_sample
+ UNION ALL
+ SELECT
+ id,
+ component2 AS sample,
+ inspection_item,
+ subclass
+ FROM
+ expanded_sample
+ WHERE
+ component2 IS NOT NULL;
</select>
<select id="getItemTree" resultMap="itemDto">
select sto.id sId, sto.specimen_name sName, p.id pId, p.name pName
diff --git a/framework/src/main/java/com/yuanchu/mom/utils/QYWXApi.java b/framework/src/main/java/com/yuanchu/mom/utils/QYWXApi.java
new file mode 100644
index 0000000..67041a3
--- /dev/null
+++ b/framework/src/main/java/com/yuanchu/mom/utils/QYWXApi.java
@@ -0,0 +1,67 @@
+package com.yuanchu.mom.utils;
+
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.vo.Result;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@Slf4j
+@Component
+//浼佷笟寰俊瀵规帴鎺ュ彛
+public class QYWXApi {
+
+
+ public static final String WWA_423654_B_975441_AC = "wwa423654b975441ac";
+ final String ip = "https://qyapi.weixin.qq.com/";
+ final String corpid = WWA_423654_B_975441_AC;
+ final String corpsecret = "VfTV3D0BFWORlBm8grykUhloQSTM06mIXYEHUqr3UIc";
+
+
+ /**
+ * 浼佷笟寰俊鑾峰彇token
+ *
+ * @return
+ */
+ public String getToken() {
+ try {
+ Map<String, Object> map = new HashMap<>();
+ map.put("corpid", corpid);
+ map.put("corpsecret", corpsecret);
+ String result = HttpRequest.get(ip + "cgi-bin/gettoken")
+ .contentType("application/x-www-form-urlencoded")
+ .form(map).execute().body();
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ return jsonObject.getString("access_token");
+ } catch (Exception e) {
+ throw new RuntimeException("token鑾峰彇寮傚父");
+ }
+ }
+
+ /**
+ * 鍙戦�佸簲鐢ㄥ崱鐗囨秷鎭�
+ *
+ * @param map
+ * @return
+ */
+ public void send(Map map) {
+ try {
+ String result = HttpRequest.post(ip + "cgi-bin/message/send?access_token=" + getToken())
+ .contentType("application/json")
+ .body(JSONArray.toJSONString(map)).execute().body();
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ if (jsonObject.getInteger("errcode") == 0) {
+ } else {
+ throw new ErrorException("浼佷笟寰俊鎺ㄩ�佹秷鎭け璐�" + jsonObject.getString("errmsg"));
+ }
+ } catch (Exception e) {
+ throw new ErrorException("浼佷笟寰俊鎺ㄩ�佹秷鎭け璐�,鑾峰彇寮傚父:" + e.getMessage());
+ }
+ }
+}
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 87c04e6..9b23ba0 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
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -193,10 +194,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎻掗槦鎿嶄綔")
@PostMapping("/jumpTeam")
- public Result<?> jumpTeam(Integer orderStateId,Integer sort) {
- InsOrderState orderState = new InsOrderState();
- orderState.setId(orderStateId);
- orderState.setSort(sort);
- return Result.success(insOrderStateService.updateById(orderState));
+ public Result<?> jumpTeam(@RequestBody List<InsOrderState> insOrderStates) {
+ return Result.success(insOrderStateService.updateBatchById(insOrderStates));
}
}
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 eefacfc..dc5d8a5 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
@@ -114,4 +114,7 @@
@TableField(select = false,exist = false)
private Integer num=1;
+ @ApiModelProperty("璇曢獙瑕佹眰:绉诲姩,鑱旈��,鐢典俊")
+ private String testRequirements;
+
}
\ No newline at end of file
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 f268a67..6e1eb12 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
@@ -30,10 +30,7 @@
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.*;
-import com.yuanchu.mom.utils.JackSonUtil;
-import com.yuanchu.mom.utils.MatrixToImageWriter;
-import com.yuanchu.mom.utils.QueryWrappers;
-import com.yuanchu.mom.utils.RedisUtil;
+import com.yuanchu.mom.utils.*;
import com.yuanchu.mom.vo.*;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
@@ -64,6 +61,7 @@
* 妫�楠屼换鍔�-涓氬姟瀹炵幇灞�
*/
@Service
+@Transactional(rollbackFor = Exception.class)
public class InsOrderPlanServiceImpl extends ServiceImpl<InsOrderMapper, InsOrder> implements InsOrderPlanService {
@Resource
@@ -111,7 +109,7 @@
AuxiliaryOutputWorkingHoursMapper auxiliaryOutputWorkingHoursMapper;
@Resource
- AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService;
+ QYWXApi qywxApi;
@Resource
private InformationNotificationService informationNotificationService;
@@ -552,7 +550,6 @@
insProductResultMapper.deleteById(insProductResultss.get(i));
}
}
- //InsProductResult insProductResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery().eq(InsProductResult::getInsProductId, Integer.parseInt(k)));
//妫�楠屽��
if (jo.get("insValue") != null) {
JSONArray jsonArray = JSON.parseArray(JSON.toJSONString(jo.get("insValue")));
@@ -639,13 +636,11 @@
result.setUpdateTime(LocalDateTime.now());
insProductResultMapper.updateById(result);
}
-
/*濡傛灉鏄涓�娆￠�夋嫨璁惧淇℃伅,涓旇繕鏈夊叾浣欐牱鍝佷篃鏈夊悓涓�涓粡楠岄」鐩�,閭ｄ箞鎵�鏈夋牱鍝佺殑璇ラ」鐩兘鐢ㄨ繖涓澶囦俊鎭�*/
- //鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
-
+ /*//鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
Integer insSampleId = product.getInsSampleId();
List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
- //濡傛灉鏈夊涓牱鍝佹垨鑰呮槸涓嶆槸閲囬泦绫诲瀷灏卞悓涓�涓澶�
+ //濡傛灉鏈夊涓牱鍝佹垨鑰呬笉鏄噰闆嗙被鍨嬪氨鍚屼竴涓澶�
if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
//瀛樺湪鍏朵綑鏍峰搧,鏌ヨ鏄惁鏈夊悓涓�绉嶆楠岄」鐩�
for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
@@ -660,8 +655,7 @@
.eq(InsProduct::getStandardMethodListId, product.getStandardMethodListId())
.eq(InsProduct::getInsBushId, product.getInsBushId())
.eq(InsProduct::getInsFibersId, product.getInsFibersId())
- .eq(InsProduct::getInsFiberId, product.getInsFiberId())
- );
+ .eq(InsProduct::getInsFiberId, product.getInsFiberId()));
if (ObjectUtils.isNotEmpty(product1)) {
//濡傛灉瀛樺湪椤圭洰,鏌ヨ鏄惁鏈夎〃
InsProductResult productResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
@@ -686,13 +680,12 @@
}
}
- }
+ }*/
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
-
insProduct = insProductMapper.selectById(insProduct);
-
+ /*鐢熸垚浜ч噺宸ユ椂*/
//鏌ヨ妫�楠屽崟淇℃伅
InsOrder insOrder = insOrderMapper.selectById(insSampleMapper.selectById(insProduct.getInsSampleId()).getInsOrderId());
//鏍￠獙濡傛灉杩欎釜浜鸿繖涓娴嬮」鐩凡缁忔坊鍔犺繃浜嗗垯涓嶉渶瑕佸啀鏂板
@@ -761,7 +754,8 @@
auxiliaryOutputWorkingHours.setWeekDay(getWeek(localDateTime.format(formatters)));//鏄熸湡
auxiliaryOutputWorkingHours.setWeek(String.valueOf(DateUtil.weekOfYear(DateUtil.offsetDay(parse, 1))));//鍛ㄦ
auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
- } else {
+ }
+ else {
//鍔犵彮
auxiliaryOutputWorkingHours.setInspectionItem(insProduct.getInspectionItem());//妫�娴嬬埗椤�
auxiliaryOutputWorkingHours.setInspectionItemSubclass(insProduct.getInspectionItemSubclass());//妫�娴嬪瓙椤�
@@ -781,7 +775,14 @@
auxiliaryOutputWorkingHours.setCheck(userId);//妫�娴嬩汉
}
try {
- if (CollectionUtils.isEmpty(insProductResultss) && !result.getInsValue().equals("[]") || (CollectionUtils.isNotEmpty(insProductResultss) && !insProductResultss.get(0).getInsValue().equals(result.getInsValue()) && !insProductResultss.get(0).getInsValue().equals("[]"))) {
+ //杩欎釜妫�楠岄」鐩繕娌℃湁濉啓杩囨楠屽�间笖杩欐杩欎釜妫�楠岄」鐩～鍐欑殑妫�楠屽�间笉涓虹┖
+ if (CollectionUtils.isEmpty(insProductResultss) && jo.get("insValue") != null
+ //杩欎釜妫�楠岄」鐩繕娌℃湁濉啓杩囨楠屽�间笖杩欐杩欎釜妫�楠岄」鐩～鍐欑殑璁＄畻鍊间笉涓虹┖浣嗘槸妫�楠屽�间负绌�
+ || CollectionUtils.isEmpty(insProductResultss) && jo.get("insValue") == null && jo.get("comValue") != null
+ //杩欎釜妫�楠岄」鐩湁濉啓杩囨楠屽�间笖杩欐濉啓鐨勬楠屽�煎拰鍘熸潵鐨勬楠屽�间笉鐩哥瓑,涓旇繖娆＄殑妫�楠屽�间笉绛変簬绌�
+ || (CollectionUtils.isNotEmpty(insProductResultss) && !insProductResultss.get(0).getInsValue().equals(result.getInsValue()) && jo.get("insValue") != null)
+ //杩欎釜妫�楠岄」鐩湁濉啓杩囨楠屽�间笖杩欐濉啓鐨勮绠楀�煎拰鍘熸潵鐨勮绠楀�间笉鐩哥瓑,涓旇繖娆＄殑璁＄畻鍊间笉绛変簬绌�,涓旇繖娆＄殑妫�楠屽�肩瓑浜庣┖
+ || (CollectionUtils.isNotEmpty(insProductResultss) && !insProductResultss.get(0).getComValue().equals(result.getComValue()) && jo.get("insValue") == null && jo.get("comValue") != null)) {
auxiliaryOutputWorkingHoursMapper.insert(auxiliaryOutputWorkingHours);
}
} catch (Exception e) {
@@ -803,6 +804,7 @@
.ne(InsProduct::getInsResult, 2)
));
if (l == l1) {
+ //濡傛灉鎵�鏈夐」鐩兘鏈夌粨璁�,閭ｄ箞璇ユ牱鍝佺姸鎬佸凡妫�
insSample.setInsState(2);
}
insSampleMapper.updateById(insSample);
@@ -834,7 +836,6 @@
.or()
.eq(InsProduct::getInsResult, 2)
)
- //.isNull(InsProduct::getInsResult)
.eq(InsProduct::getSonLaboratory, insProduct.getSonLaboratory())
.eq(InsProduct::getState, 1));
if (count == 0) {
@@ -1278,10 +1279,10 @@
List<TableRenderData> tables1 = new ArrayList<>();
tableRenderData.setRows(new ArrayList<>());
int totalHeight = 0;
- int pageHeightLimit = 500; // 鍋囪姣忛〉鐨勯珮搴﹂檺鍒朵负500鍗曚綅
+ int pageHeightLimit = 450; // 鍋囪姣忛〉鐨勯珮搴﹂檺鍒朵负500鍗曚綅
int rowHeight = 0;
List<RowRenderData> firstTwoRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
- List<RowRenderData> endRows = new ArrayList<>(); // 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
+ List<RowRenderData> endRows = new ArrayList<>(); // 淇濆瓨鏈�鍚庝竴琛屽娉ㄤ互渚垮鍒跺埌鏂拌〃鏍�
// 淇濆瓨鍓嶄袱琛屼互渚垮鍒跺埌鏂拌〃鏍�
if (rows.size() >= 3) {
firstTwoRows.add(rows.get(0));
@@ -1676,17 +1677,39 @@
.set(InsOrderState::getInsTime, LocalDateTime.now())
.set(InsOrderState::getInsState, 3)
.set(InsOrderState::getVerifyUser, verifyUser));
- Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- InformationNotification info = new InformationNotification();
- info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
- info.setMessageType("2");
- info.setTheme("澶嶆牳閫氱煡");
- info.setContent("鎮ㄦ湁涓�鏉℃楠屼换鍔″緟澶嶆牳娑堟伅");
- info.setSenderId(userId);
- info.setConsigneeId(verifyUser);
- info.setViewStatus(false);
- info.setJumpPath("b1-inspect-order-plan");
- informationNotificationService.addInformationNotification(info);
+ /*濡傛灉鏄疌绫昏鍗曚笖鏄笅鍙戝埌璐ㄩ噺閮�,鍒欑洿鎺ュ鏍搁�氳繃(缁撴潫璇曢獙)*/
+ InsOrder insOrder = insOrderMapper.selectById(orderId);
+ if (insOrder.getOrderType().equals("C") && insOrder.getDepartmentLims().equals("璐ㄩ噺閮�")) {
+ verifyPlan(orderId, laboratory, 2, null);
+ }else {
+ Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
+ //LIMS绯荤粺娑堟伅鎺ㄩ��
+ InformationNotification info = new InformationNotification();
+ info.setCreateUser(insProductMapper.selectUserById(userId).get("name"));
+ info.setMessageType("2");
+ info.setTheme("澶嶆牳閫氱煡");
+ info.setContent("鎮ㄦ湁涓�鏉℃楠屼换鍔″緟澶嶆牳娑堟伅");
+ info.setSenderId(userId);
+ info.setConsigneeId(verifyUser);
+ info.setViewStatus(false);
+ info.setJumpPath("b1-inspect-order-plan");
+ informationNotificationService.addInformationNotification(info);
+ //todo 浼佷笟寰俊娑堟伅鎺ㄩ�丂zss
+ /* HashMap<String, Object> map = new HashMap<>();
+ String account = userMapper.selectById(userId).getAccount();
+ map.put("touser", *//*account*//*"ZT-012117");//鎺ユ敹娑堟伅鎴愬憳鐨勮处鍙�'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);*/
+ }
//澶嶆牳浜�--妫�楠屽崟鐩稿叧璐熻矗浜�
InsSampleUser insSampleUser = new InsSampleUser();
insSampleUser.setUserId(verifyUser);
@@ -1694,11 +1717,6 @@
insSampleUser.setState(1);
insSampleUser.setSonLaboratory(laboratory);
insSampleUserMapper.insert(insSampleUser);
- /*濡傛灉鏄疌绫昏鍗曚笖鏄笅鍙戝埌璐ㄩ噺閮�,鍒欑洿鎺ュ鏍搁�氳繃(缁撴潫璇曢獙)*/
- InsOrder insOrder = insOrderMapper.selectById(orderId);
- if (insOrder.getOrderType().equals("C") && insOrder.getDepartmentLims().equals("璐ㄩ噺閮�")) {
- verifyPlan(orderId, laboratory, 2, null);
- }
/*鏍￠獙涓�涓媟esult琛�*/
CompletableFuture.supplyAsync(() -> {
List<Integer> ips = insProducts.stream().map(InsProduct::getId).distinct().collect(Collectors.toList());
@@ -1717,10 +1735,6 @@
String key = "frequency" + ":" + entrustCode + ":*";
RedisUtil.delsLike(key);
return 1;
- }
-
- public int pxToCm(int px) {
- return px / 9;
}
// 鑾峰彇涓や釜localDateTime鐨勬瘡涓�澶�
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index dd9c6f8..1d869dd 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -585,6 +585,7 @@
<result property="joinModel" column="join_model" jdbcType="VARCHAR"/>
<result property="joinName" column="join_name" jdbcType="VARCHAR"/>
<result property="sampleCode" column="sample_code" jdbcType="VARCHAR"/>
+ <result property="testRequirements" column="test_requirements" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="sampleType" column="sample_type" jdbcType="VARCHAR"/>
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 8aa3601..4048139 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -123,7 +123,6 @@
@GetMapping("temporaryInterface")
public void temporaryInterface() {
System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
- // TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
//鐝--鏃�(鏌ヨ瀛楀吀)
List<Enums> shiftType = enumService.selectEnumByCategory("鐝绫诲瀷");
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
index e7797f6..09bb019 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java
@@ -59,10 +59,10 @@
if (ObjectUtils.isNotEmpty(power)){
List<Company> companies = new ArrayList<>();
Company company = new Company();
- if (ObjectUtils.isEmpty(user.getCompanyId())){
+ if (ObjectUtils.isEmpty(user.getCompany())){
throw new ErrorException("璇ョ敤鎴锋病鏈夋墍灞炲崟浣�!");
}
- company.setCompanyId(user.getCompanyId());
+ company.setCompanyId(user.getCompany());
companies.add(company);
return Result.success(companies);
}else {
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 96f2074..9de11ba 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -91,7 +91,7 @@
return Result.fail(map.get("info"));
}
- @ValueAuth
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 2df8a68..2ba5d0e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -45,7 +45,7 @@
where u.id = #{userId}
</select>
<select id="getUser" resultType="com.yuanchu.mom.pojo.User">
- select * from user
+ select * from user where state = 1
# where depart_lims_id=FIND_IN_SET(depart_lims_id, (select GROUP_CONCAT(id SEPARATOR ',') from department_lims where department_lims.name like '%瀹為獙瀹�'))
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3