From a0b5291eb64b13555d4390aba7782eb76dced376 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 25 二月 2025 11:18:55 +0800
Subject: [PATCH] Merge branch 'dev' into dev_cr
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java | 73 ---------
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 13 +
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 3
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java | 3
basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java | 3
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java | 16 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java | 9 +
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java | 12 +
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java | 84 +++------
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 25 ++-
basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java | 2
ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml | 8 +
inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java | 65 ++++++++
basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java | 5
basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java | 33 ---
basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java | 6
basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 3
/dev/null | 12 -
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java | 14 +
ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java | 24 +++
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java | 29 ---
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java | 2
27 files changed, 227 insertions(+), 231 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
index 327b8f3..45851ec 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
@@ -57,14 +57,6 @@
return Result.success(standardTreeService.addStandardTree(standardTree));
}
- @ApiOperation(value = "缁欐爣鍑嗘爲娣诲姞妫�楠屾爣鍑�")
- @PostMapping("/addStandardMethodList")
- public Result addStandardMethodList(@RequestBody Map<String, Object> map) {
- Integer standardId = (Integer) map.get("standardId");
- String tree = (String) map.get("tree");
- return Result.success(standardMethodListService.addStandardMethodList(standardId, tree));
- }
-
@ApiOperation(value = "鏍规嵁鏍囧噯鏍戣繘琛屾爣鍑嗘煡璇�")
@GetMapping("/selectsStandardMethodByFLSSM")
public Result selectsStandardMethodByFLSSM(String tree) {
@@ -87,27 +79,6 @@
return Result.success(standardProductListService.updateSection(list));
}
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠屾爣鍑�")
- @DeleteMapping("/delStandardMethodByFLSSM")
- public Result delStandardMethodByFLSSM(Integer id) {
- return Result.success(standardMethodListService.delStandardMethodByFLSSM(id));
- }
-
- @ApiOperation(value = "鍒犻櫎鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @DeleteMapping("/delStandardProductByIds")
- public Result delStandardProductByIds(String ids) {
- JSONArray lists = JSON.parseArray(ids);
- return Result.success(standardProductListService.delStandardProduct(lists));
- }
-
- @ApiOperation(value = "鏂板鏍囧噯鏍戜笅鐨勬楠岄」鐩�")
- @PostMapping("/addStandardProduct")
- public Result addStandardProduct(@RequestBody Map<String, String> map) {
- String ids = map.get("ids");
- String tree = map.get("tree");
- return Result.success(standardTreeService.addStandardProduct(ids, tree));
- }
-
@ApiOperation(value = "鍒犻櫎鏍囧噯鏍戠殑灞傜骇")
@DeleteMapping("/delStandardTree")
public Result delStandardTree(String tree) {
@@ -122,8 +93,8 @@
@ApiOperation(value = "閫氳繃妫�楠屾爣鍑嗘煡璇㈡楠岄」鐩�")
@GetMapping("/selectStandardProductListByMethodId")
- public Result selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
- return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree, page));
+ public Result selectStandardProductListByMethodId(Integer id, String tree) {
+ return Result.success(standardProductListService.selectStandardProductListByMethodId(id, tree));
}
@ApiOperation(value = "鎵归噺鏌ヨ妫�楠岄」鐩�")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
index f25f673..05c0fdf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
@@ -62,6 +62,12 @@
@Param("endIndex") Integer endIndex,
@Param("methodId") Integer methodId,
@Param("tree") String tree);
+
+ /**
+ * 鎵归噺娣诲姞鏍囧噯
+ * @param productLists
+ */
+ void saveBatchProductLists(@Param("productLists") List<StandardProductList> productLists);
}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
index fc0aa9f..e732efb 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
@@ -39,9 +39,6 @@
List<SampleTypeDto> getStandardTree2();
- List<SampleDto> getStandardTree3(String sampleType);
-
-
String getLaboratory(String str);
Integer getStructureItemParameterId(String sampleType, String item, String itemChild, String inspectionItemClass);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
index 1c1b79f..fd0d620 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
@@ -153,7 +153,7 @@
@ApiModelProperty("鍨嬪彿")
private String model;
- @ApiModelProperty("鍨嬪彿")
+ @ApiModelProperty("妯℃澘id")
private Integer templateId;
@ApiModelProperty("")
@@ -187,6 +187,7 @@
private String tree;
+ @ApiModelProperty("妫�楠岄」id")
private Integer structureItemParameterId;
@ApiModelProperty(value = "妫�楠岄」鍒嗙被")
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
index 14ee117..2f6a810 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
@@ -13,13 +13,8 @@
*/
public interface StandardMethodListService extends IService<StandardMethodList> {
- int addStandardMethodList(Integer standardId, String tree);
Map<String, List<?>> selectsStandardMethodByFLSSM(String tree);
-
- Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree);
-
- int delStandardMethodByFLSSM(Integer id);
List<StandardMethodList> selectStandardMethodEnum();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
index 39e0754..f2eff64 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
@@ -20,11 +20,9 @@
int upStandardProductList(StandardProductList list);
- int delStandardProduct(JSONArray list);
-
List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample);
- Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page);
+ Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree);
IPage<StandardProductList> selectStandardProductByMethodId(Integer id, String tree, Integer page, String laboratory, String item, String items);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
deleted file mode 100644
index 4f54fe6..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ruoyi.basic.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardProductList;
-
-/**
-* @author Administrator
-* @description 閽堝琛ㄣ�恠tandard_product_list(鏍囧噯鏍戜笅鐨勬楠岄」鐩�)銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2024-03-05 10:33:29
-*/
-public interface StandardProductListService2 extends IService<StandardProductList> {
-
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
index 39d08e7..0ad0f47 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
@@ -23,8 +23,6 @@
int delStandardTree(String tree);
- int addStandardProduct(String ids, String tree);
-
List<SampleTypeDto> getStandardTree2();
int upStandardProducts(Map<String, Object> product);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
index 5ab1ed5..aa95f5d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
@@ -29,48 +29,6 @@
private StandardProductListMapper standardProductListMapper;
- @Override
- public int addStandardMethodList(Integer standardId, String tree) {
- String[] trees = tree.split(" - ");
- Map<String, String> map = standardMethodListMapper.selectStandardMethodById(standardId);
- StandardMethodList list = new StandardMethodList();
- list.setCode(map.get("code"));
- list.setName(map.get("name"));
- list.setRemark(map.get("remark"));
- list.setFactory(trees[0]);
- try {
- list.setLaboratory(trees[1]);
- }catch (Exception e){}
- try {
- list.setSampleType(trees[2]);
- }catch (Exception e){}
- try {
- list.setSample(trees[3]);
- }catch (Exception e){}
- try {
- list.setModel(trees[4]);
- }catch (Exception e){}
- standardMethodListMapper.insert(list);
- List<StandardProductList> standardProductLists = standardMethodListMapper.selectParameterList(list.getCode());
- for (StandardProductList standardProductList : standardProductLists) {
- standardProductList.setStandardMethodListId(list.getId());
- standardProductList.setFactory(trees[0]);
- try {
- standardProductList.setLaboratory(trees[1]);
- }catch (Exception e){}
- try {
- standardProductList.setSampleType(trees[2]);
- }catch (Exception e){}
- try {
- standardProductList.setSample(trees[3]);
- }catch (Exception e){}
- try {
- standardProductList.setModel(trees[4]);
- }catch (Exception e){}
- standardProductListMapper.insert(standardProductList);
- }
- return 1;
- }
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
@@ -103,37 +61,6 @@
return map;
}
- @Override
- public Map<String, List<?>> selectsStandardMethodByFLSSM2(String tree) {
- String[] trees = tree.split(" - ");
- List<StandardMethodList> standardMethodLists = null;
- switch (trees.length){
- case 5:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],trees[4]);
- break;
- case 4:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],trees[3],null);
- break;
- case 3:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],trees[2],null,null);
- break;
- case 2:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],trees[1],null,null,null);
- break;
- case 1:
- standardMethodLists = standardMethodListMapper.selectStandardMethodLists2(trees[0],null,null,null,null);
- break;
- }
- Map<String, List<?>> map = new HashMap<>();
- map.put("standardMethodList", standardMethodLists);
- return map;
- }
-
- @Override
- public int delStandardMethodByFLSSM(Integer id) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate().eq(StandardProductList::getStandardMethodListId, id));
- return standardMethodListMapper.deleteById(id);
- }
@Override
public List<StandardMethodList> selectStandardMethodEnum() {
return standardMethodListMapper.selectListEnum();
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
deleted file mode 100644
index eae1bc2..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.basic.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.service.StandardProductListService2;
-import org.springframework.stereotype.Service;
-
-@Service
-public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService2 {
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
index 5b0b1cd..4bc4557 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
@@ -20,7 +20,6 @@
import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
import com.ruoyi.basic.pojo.StandardTree;
import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -45,8 +44,6 @@
private StandardTreeMapper standardTreeMapper;
- private StandardProductListService2 standardProductListService2;
-
private IfsInventoryQuantityMapper ifsInventoryQuantityMapper;
private StandardProductListSupplierAskMapper standardProductListSupplierAskMapper;
@@ -57,10 +54,6 @@
return standardProductListMapper.updateById(list);
}
- @Override
- public int delStandardProduct(JSONArray list) {
- return standardProductListMapper.deleteBatchIds(list);
- }
@Override
public List<StandardProductList> selectStandardProductList(InsSampleReceiveDto insSample) {
@@ -263,13 +256,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree, Integer page) {
+ public Map<String, Object> selectStandardProductListByMethodId(Integer id, String tree) {
String[] trees = tree.split(" - ");
- try {
- String tree1 = trees[2];
- } catch (Exception e) {
- throw new BaseException("鎿嶄綔澶揩,绯荤粺浼犲弬閿欒!!!!");
- }
+ // 鍒ゆ柇鏄惁鎷栨嫿
boolean isDrag = false;
List<StandardProductList> list = new ArrayList<>();
if (trees.length == 3) {
@@ -411,46 +400,37 @@
if (sp.getTemplateId() != null && !sp.getTemplateId().equals("")) {
pl.setTemplateId(sp.getTemplateId());
}
- //鍥犱负杩樻湁涓骇鍝佸彨鑰愬紶绾垮す 鎺ョ画閲戝叿 ,杩欎袱涓」鐩殑鏁版嵁瀹屽叏涓�鏍�,鐗规畩澶勭悊
- if (sp.getTree() != null && !sp.getTree().equals("") && !pl.getTree().equals("涓ぉ绉戞妧妫�娴嬩腑蹇� - 鐢靛姏浜у搧瀹為獙瀹� - 閲戝叿 - 鑰愬紶绾垮す - null")) {
- pl.setTree(sp.getTree());
- }
break;
}
}
}
- if (page == 1) {
- Integer userId = SecurityUtils.getUserId().intValue();
-// CompletableFuture.supplyAsync(() -> {
- if (trees.length == 5) {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .eq(StandardProductList::getTree, tree));
- } else {
- standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
- .eq(StandardProductList::getStandardMethodListId, id)
- .like(StandardProductList::getTree, tree));
- }
- try {
- standardProductListService2.saveBatch(list.stream().map(a -> {
- a.setFactory(trees[0]);
- a.setLaboratory(trees[1]);
- a.setSampleType(trees[2]);
- a.setCreateUser(userId);
- a.setUpdateUser(userId);
- a.setStandardMethodListId(id);
- return a;
- }).collect(Collectors.toList()));
- } catch (Exception e) {
- // 澶勭悊閲嶅 ID 鐨勮褰曪紝閲嶆柊鐢熸垚 ID 骞剁户缁皾璇曟彃鍏�
- for (StandardProductList productList : list) {
- productList.setId(IdWorker.getId());
- }
- }
-
+ Integer userId = SecurityUtils.getUserId().intValue();
+ if (trees.length == 5) {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .eq(StandardProductList::getTree, tree));
+ } else {
+ standardProductListMapper.delete(Wrappers.<StandardProductList>lambdaUpdate()
+ .eq(StandardProductList::getStandardMethodListId, id)
+ .like(StandardProductList::getTree, tree));
}
- Map<String, Object> map = new HashMap<>();
+
+
+ List<StandardProductList> productLists = list.stream().map(a -> {
+ a.setFactory(trees[0]);
+ a.setLaboratory(trees[1]);
+ a.setSampleType(trees[2]);
+ a.setCreateUser(userId);
+ a.setUpdateUser(userId);
+ a.setStandardMethodListId(id);
+ return a;
+ }).collect(Collectors.toList());
+// this.saveBatch(productLists);
+ // 鎵归噺娣诲姞鏍囧噯
+ baseMapper.saveBatchProductLists(productLists);
+
+
Collections.sort(list, (o1, o2) -> {
String field1 = o1.getManHourGroup();
String field2 = o2.getManHourGroup();
@@ -475,11 +455,9 @@
list.sort((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort())
- (o2.getSort() == null ? 0 : o2.getSort()));
}
- try {
- map.put("productList", list.subList((page - 1) * 300, page * 300));
- } catch (IndexOutOfBoundsException e) {
- map.put("productList", list.subList((page - 1) * 300, list.size()));
- }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("productList", list);
map.put("total", list.size());
return map;
}
@@ -574,7 +552,7 @@
@Override
public void resetTreeDragBatch(List<StandardProductList> standardProductLists) {
- standardProductListService2.updateBatchById(standardProductLists);
+ this.updateBatchById(standardProductLists);
}
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
index 3fe74d1..29c4b90 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
@@ -127,35 +127,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
- public int addStandardProduct(String ids, String tree) {
- String[] trees = tree.split(" - ");
- JSONArray jsonArray = JSON.parseArray(ids);
- for (Object o : jsonArray) {
- StandardProductList standardProductList = standardTreeMapper.selectStandardProductById(Integer.parseInt("" + o));
- standardProductList.setFactory(trees[0]);
- try {
- standardProductList.setLaboratory(trees[1]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSampleType(trees[2]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setSample(trees[3]);
- } catch (Exception e) {
- }
- try {
- standardProductList.setModel(trees[4]);
- } catch (Exception e) {
- }
- standardProductListMapper.insert(standardProductList);
- }
- return 1;
- }
-
- @Override
public List<SampleTypeDto> getStandardTree2() {
return standardTreeMapper.getStandardTree2();
}
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 52d6bfe..cd27a11 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -27,6 +27,19 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
+
+ <!-- 鎵归噺娣诲姞妫�娴嬫爣鍑� -->
+ <insert id="saveBatchProductLists">
+ INSERT INTO standard_product_list (id, inspection_item, inspection_item_en, inspection_item_subclass, inspection_item_subclass_en, factory, laboratory, sample_type, sample, model, son_laboratory, unit, price, man_hour, man_hour_group, inspection_item_type, inspection_value_type, checkout_number, section, cores, method, method_s, man_day, bsm, ask, tell, standard_method_list_id, template_id, state, dic, tree, structure_item_parameter_id, inspection_item_class, inspection_item_class_en, radius, radius_list, rates, sort, conductor_material, conductor_type)
+ VALUES
+ <foreach item="item" collection="productLists" open="(" separator="),(" close=")">
+ #{item.id}, #{item.inspectionItem}, #{item.inspectionItemEn}, #{item.inspectionItemSubclass}, #{item.inspectionItemSubclassEn}, #{item.factory}, #{item.sonLaboratory}, #{item.sampleType}, #{item.sample}, #{item.model}, #{item.sonLaboratory}, #{item.unit}, #{item.price}, #{item.manHour}, #{item.manHourGroup}, #{item.inspectionItemType}, #{item.inspectionValueType}, #{item.checkoutNumber}, #{item.section}, #{item.cores}, #{item.method}, #{item.methodS}, #{item.manDay}, #{item.bsm}, #{item.ask}, #{item.tell}, #{item.standardMethodListId}, #{item.templateId}, #{item.state}, #{item.dic}, #{item.tree}, #{item.structureItemParameterId},
+ #{item.inspectionItemClass}, #{item.inspectionItemClassEn}, #{item.radius}, #{item.radiusList}, #{item.rates}, #{item.sort}, #{item.conductorMaterial}, #{item.conductorType}
+ </foreach>
+
+ </insert>
+
+
<update id="updateSection">
UPDATE standard_product_list
SET price=#{productList.price},
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
index 05cd164..9a715e1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
@@ -102,7 +102,7 @@
*/
@ApiOperation(value = "鍒犻櫎鍐呭绠＄悊绾犳鎺柦闄勪欢")
- @GetMapping("/delInternalCorrectFile")
+ @DeleteMapping("/delInternalCorrectFile")
public Result delInternalCorrectFile(Integer correctFileId){
return Result.success(internalCorrectFileMapper.deleteById(correctFileId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
index 5e1b8d8..9a2b833 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalImplementController.java
@@ -76,7 +76,7 @@
*/
@ApiOperation(value = "鍐呭瀹炴柦璁″垝鍒犻櫎")
- @GetMapping("/delInternalImplement")
+ @DeleteMapping("/delInternalImplement")
public Result delInternalImplement(Integer implementId){
return Result.success(internalImplementService.delInternalImplement(implementId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
index f43c27e..705bd42 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalMeetingController.java
@@ -74,7 +74,7 @@
*/
@ApiOperation(value = "鍐呭浼氳鍒犻櫎")
- @GetMapping("/delInternalMeeting")
+ @DeleteMapping("/delInternalMeeting")
public Result delInternalMeeting(Integer meetingId){
return Result.success(internalMeetingService.delInternalMeeting(meetingId));
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
index fd9c35d..c3d2c87 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalPlanController.java
@@ -76,7 +76,7 @@
*/
@ApiOperation(value = "鍐呭骞村害璁″垝鍒犻櫎")
- @GetMapping("/delInternalPlan")
+ @DeleteMapping("/delInternalPlan")
public Result delInternalPlan(Integer planId){
return Result.success(internalPlanService.delInternalPlan(planId));
}
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
new file mode 100644
index 0000000..4e87b34
--- /dev/null
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/task/PersonTrainingSchedule.java
@@ -0,0 +1,65 @@
+package com.ruoyi.personnel.task;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.utils.WxCpUtils;
+import com.ruoyi.personnel.mapper.PersonTrainingDetailedMapper;
+import com.ruoyi.personnel.pojo.PersonTrainingDetailed;
+import com.ruoyi.system.mapper.UserMapper;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+/**
+ * 鍩硅璁″垝浣跨敤鎻愰啋璁板綍鎻愰啋
+ */
+@Component
+public class PersonTrainingSchedule {
+ @Resource
+ private PersonTrainingDetailedMapper personTrainingDetailedMapper;
+ @Resource
+ private UserMapper userMapper;
+ @Resource
+ private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+ /**
+ * 鎻愰啋濉啓璁惧浣跨敤璁板綍
+ */
+// @Scheduled(cron = "0/5 * * * * *")
+ @Scheduled(cron = "0 0 9 1 * *") // 姣忔湀涓�鍙锋墽琛�
+ public void task1() {
+ // 鏌ヨ褰撴湀鍩硅璁″垝
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.M");
+ String format = LocalDateTime.now().format(formatter);
+ List<PersonTrainingDetailed> personTrainingDetaileds = personTrainingDetailedMapper.selectList(Wrappers.<PersonTrainingDetailed>lambdaQuery()
+ .eq(PersonTrainingDetailed::getTrainingDate, format));
+
+ for (PersonTrainingDetailed personTrainingDetailed : personTrainingDetaileds) {
+ threadPoolTaskExecutor.execute(() -> {
+ // 鏌ヨ鍩硅璁插笀
+ User user = userMapper.selectById(personTrainingDetailed.getTrainingLecturerId());
+ // 浼佷笟寰俊閫氱煡鍩硅
+ String message = "";
+ message += "浜哄憳鍩硅璁″垝鎻愰啋閫氱煡";
+ message += "\n鍩硅鐩爣: " + personTrainingDetailed.getTrainingObjectives();
+ message += "\n鍩硅鍐呭: " + personTrainingDetailed.getTrainingContent();
+ message += "\n鍙傚姞瀵硅薄: " + personTrainingDetailed.getParticipants();
+ message += "\n鍩硅鏃ユ湡: " + personTrainingDetailed.getTrainingDate();
+ message += "\n璁″垝褰撴湀杩涜鍩硅";
+
+ //鍙戦�佷紒涓氬井淇℃秷鎭�氱煡
+ try {
+ WxCpUtils.inform(user.getAccount(), message, null);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ });
+ }
+ }
+
+}
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
index 5dd627c..6b91a0a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessComplainServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.process.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.ExcelWriter;
import com.alibaba.excel.write.metadata.WriteSheet;
@@ -9,6 +10,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.mapper.InsReportMapper;
@@ -26,6 +29,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
+import java.util.Date;
import java.util.List;
/**
@@ -49,6 +53,9 @@
@Resource
private InsSampleMapper insSampleMapper;
+ @Resource
+ private NumberGenerator<ProcessComplain> numberGenerator;
+
@Override
public IPage<ProcessComplain> pageProcessComplain(Page page, ProcessComplain processComplain) {
@@ -68,9 +75,10 @@
throw new ErrorException("鏍峰搧缂栧彿杈撳叆鏈夎");
}
//鎶曡瘔缂栧彿鐢熸垚
- //todo giveCode
-// String giveCode = this.giveCode.giveCode("JCZX-", "cnas_process_complain", "", "yyMMdd");
-// processComplain.setComplainNo(giveCode);
+ String giveCode = numberGenerator.generateNumberWithPrefix(3,
+ "JCZX-" + DateUtil.format(new Date(), "yyMMdd"),
+ ProcessComplain::getComplainNo);
+ processComplain.setComplainNo(giveCode);
return processComplainMapper.insert(processComplain);
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 44bbca5..ca01fca 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -30,6 +30,7 @@
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.common.constant.DictDataConstants;
import com.ruoyi.common.constant.InsOrderTypeConstants;
import com.ruoyi.common.core.domain.entity.Custom;
import com.ruoyi.common.core.domain.entity.InformationNotification;
@@ -1514,9 +1515,9 @@
standardMethod2.append("銆�").append(s);
}
standardMethod2.replace(0, 1, "");
- // todo: 鏌ヨ瀛楀吀妫�娴嬬被鍨�
-// List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByName("");
- String orderType = null;
+
+ // 鏍峰搧绫诲瀷
+ String orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
List<RowRenderData> rows = new ArrayList<>();
List<TextRenderData> text = new ArrayList<>();
@@ -2275,18 +2276,23 @@
String modelStr = CollUtil.join(models, "\n");
String finalModelStr = modelStr;
- // todo: 鏌ヨ瀛楀吀
- // List<SysDictData> sysDictData = iSysDictTypeService.selectDictDataByName("");
+ // 妫�娴嬬被鍨�
String orderType = null;
- String formType = null;
+ orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE, insOrder.getOrderType());
+ // 鍒ゆ柇绗竴涓瓧鍏告槸鍚︿负绌�
+ if (StringUtils.isBlank(orderType)) {
+ orderType = iSysDictTypeService.selectLabelByDict(DictDataConstants.CHECK_TYPE1, insOrder.getOrderType());
+ }
+
+ // 鏉ユ牱鏂瑰紡
+ String formType = iSysDictTypeService.selectLabelByDict(DictDataConstants.FORM_TYPE, insOrder.getFormType());
// 鏍峰搧鐘舵��
- String sampleStatus = null;
+ String sampleStatus = iSysDictTypeService.selectLabelByDict(DictDataConstants.SAMPLE_STATUS_LIST, insOrder.getSampleStatus());;
ConfigureBuilder builder = Configure.builder();
builder.useSpringEL(true);
List<Map<String, String>> finalDeviceList = deviceList;
- Integer userId = insSampleUserMapper.selectOne(Wrappers.<InsSampleUser>lambdaQuery().eq(InsSampleUser::getInsSampleId, orderId).last("limit 1")).getUserId();
Custom custom = customMapper.selectById(insOrder.getCompanyId());
// 鏌ヨ鍒ゆ柇鏄惁鏈変笉鍒ゅ畾椤圭洰,鍜屽叏閮芥槸鍒ゅ畾椤�
@@ -2379,6 +2385,7 @@
String finalResultCh = resultCh;
String finalResultEn = resultEn;
+ String finalOrderType = orderType;
InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
XWPFTemplate template = XWPFTemplate.compile(inputStream, builder.build()).render(
new HashMap<String, Object>() {{
@@ -2403,7 +2410,7 @@
put("images", images);
put("examineUrl", null);
put("ratifyUrl", null);
- put("orderType", orderType);
+ put("orderType", finalOrderType);
put("getTime", finalSendTime.format(DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�")));
put("getTimeEn", monthNames[finalSendTime.getMonthValue() - 1] + " " + finalSendTime.format(DateTimeFormatter.ofPattern("dd, yyyy")));
put("seal1", null);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
index fe6ff0c..d1748f2 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java
@@ -7,7 +7,7 @@
public class InsOrderPlanVO{
- private String id;
+ private Integer id;
@ApiModelProperty("濮旀墭缂栧彿")
private String entrustCode;
@@ -73,6 +73,6 @@
private String tempUrlPdf;
@ApiModelProperty("鎶ュ憡id")
- private String insReportId;
+ private Integer insReportId;
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index c5fb7e2..4bdb129 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -26,7 +26,8 @@
private UserService userService;
/**
- * type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
* @param user
* @param type
* @return
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java
new file mode 100644
index 0000000..43d8fc5
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictDataConstants.java
@@ -0,0 +1,24 @@
+package com.ruoyi.common.constant;
+
+import lombok.Data;
+
+/**
+ * 瀛楀吀绫诲瀷
+ *
+ * @Author zhuo
+ * @Date 2025/2/25
+ */
+public class DictDataConstants {
+
+ // 妫�楠岀被鍨�(鍘熸潗鏂�)
+ public static final String CHECK_TYPE = "check_type";
+
+ // 妫�楠岀被鍨�(鎴愬搧)
+ public static final String CHECK_TYPE1 = "check_type1";
+
+ // 鏉ユ牱鏂瑰紡
+ public static final String FORM_TYPE = "form_type";
+
+ // 鏍峰搧鐘舵��
+ public static final String SAMPLE_STATUS_LIST = "sample_status_list";
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
index 3e5cfb2..c11aae7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDictType;
+import org.apache.ibatis.annotations.Param;
/**
* 瀛楀吀琛� 鏁版嵁灞�
@@ -84,5 +85,20 @@
*/
public SysDictType checkDictTypeUnique(String dictType);
+ /**
+ * 鏍规嵁瀛楀吀鍚嶇О鏌ヨ瀛楀吀鏁版嵁
+ *
+ * @param dictName 瀛楀吀鍚嶇О
+ * @return 瀛楀吀鏁版嵁闆嗗悎淇℃伅
+ */
List<SysDictType> selectList(String dictName);
+
+ /**
+ * 鏍规嵁瀛楀吀缂栧彿, 瀛楀吀鍊紇alue鏌ヨlabel鍐呭
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鍊�
+ * @return 缁撴灉
+ */
+ String selectLabelByDict(@Param("dictType") String dictType, @Param("dictValue") String dictValue);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
index 10e27a8..72bf7b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
@@ -103,4 +103,13 @@
* @return 缁撴灉
*/
public boolean checkDictTypeUnique(SysDictType dictType);
+
+ /**
+ * 鏍规嵁瀛楀吀缂栧彿, 瀛楀吀鍊紇alue鏌ヨlabel鍐呭
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鍊�
+ * @return 缁撴灉
+ */
+ public String selectLabelByDict(String dictType, String dictValue);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
index 05c999f..dd9f15b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -235,4 +235,16 @@
}
return UserConstants.UNIQUE;
}
+
+ /**
+ * 鏍规嵁瀛楀吀缂栧彿, 瀛楀吀鍊紇alue鏌ヨlabel鍐呭
+ *
+ * @param dictType 瀛楀吀绫诲瀷
+ * @param dictValue 瀛楀吀鍊�
+ * @return 缁撴灉
+ */
+ @Override
+ public String selectLabelByDict(String dictType, String dictValue) {
+ return dictTypeMapper.selectLabelByDict(dictType, dictValue);
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index 5288fa9..66640a0 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -140,4 +140,12 @@
from sys_dict_type
where dict_name = #{dictName}
</select>
+
+ <!-- 鏍规嵁瀛楀吀缂栧彿, 瀛楀吀鍊紇alue鏌ヨlabel鍐呭 -->
+ <select id="selectLabelByDict" resultType="java.lang.String">
+ select dict_label
+ from sys_dict_data
+ where dict_type = #{dictType}
+ and dict_value = #{dictValue}
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 8757304..0b30ccc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -69,6 +69,9 @@
<if test="userName != null and userName != ''">
AND u.account like concat('%', #{userName}, '%')
</if>
+ <if test="nickName != null and nickName != ''">
+ AND u.name like concat('%', #{nickName}, '%')
+ </if>
<if test="status != null and status != ''">
AND u.status = #{status}
</if>
--
Gitblit v1.9.3