From ea4d3ff1ec0075eab10ef6c214653298f34d8185 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期六, 26 八月 2023 16:22:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java | 21 ++-
inspection-server/src/main/resources/mapper/RawMaterialMapper.xml | 23 ++-
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java | 1
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java | 2
framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java | 0
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 6
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java | 7 +
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java | 8 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java | 4
standard-server/src/main/resources/mapper/ProductMapper.xml | 34 +++++
user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java | 3
user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java | 12 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java | 27 +++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java | 93 ++++++++++++---
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java | 2
/dev/null | 5
user-server/src/main/resources/mapper/RoleManangeMapper.xml | 6
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java | 6 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java | 10 +
user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java | 2
inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml | 4
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java | 23 +--
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java | 4
user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java | 12 ++
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 12 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 7
27 files changed, 254 insertions(+), 82 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java b/framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/utils/HttpUtils.java
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
index f9b7ed3..f0f9007 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/InspectionController.java
@@ -96,6 +96,18 @@
public Result chooseVer(String name, String mcode, String specifications) {
return Result.success(inspectionService.chooseVer(name, mcode, specifications));
}
+ @ApiOperation(value = "鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "mcode", value = "浜у搧缂栧彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "specifications", value = "瑙勬牸鍨嬪彿", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "version", value = "鐗堟湰(榛樿鏈�鏂扮増鏈�)", dataTypeClass = Integer.class,required = true ),
+ @ApiImplicitParam(name = "experiment", value = "璇曢獙椤圭洰(濮旀墭涓撳睘)", dataTypeClass = String.class )
+ })
+ @GetMapping("/lookProByVer")
+ public Result lookProByVer(String name, String mcode, String specifications,Integer version,String experiment) {
+ return Result.success(inspectionService.lookProByVer(name, mcode, specifications,version,experiment));
+ }
@ApiOperation(value = "鏂板妫�楠屽崟")
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
index 559238f..0fb479b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java
@@ -40,12 +40,12 @@
@ApiImplicitParam(name = "pageSize", value = "姣忎竴椤垫暟閲�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "materialCoding", value = "鏉愭枡缂栫爜", dataTypeClass = String.class),
@ApiImplicitParam(name = "materialName", value = "鏉愭枡鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "condition", value = "鐘舵��", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "type", value = "鐘舵��", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "createTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class)
})
@GetMapping("/selectAll")
- public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, Integer condition, String createTime) {
- IPage<RawMaterial> iPage = rawMaterialService.selectRawMaterial(materialCoding, materialName, condition, createTime, new Page<Objects>(pageNo, pageSize));
+ public Result<?> selectRawMaterial(Integer pageSize, Integer pageNo, String materialCoding, String materialName, Integer type, String createTime) {
+ IPage<RawMaterial> iPage = rawMaterialService.selectRawMaterial(materialCoding, materialName, type, createTime, new Page<Objects>(pageNo, pageSize));
Map<String, Object> map = new HashMap<>();
map.put("row", iPage.getRecords());
map.put("total", iPage.getTotal());
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
index f728459..e1c1f08 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/RawMaterialMapper.java
@@ -21,10 +21,10 @@
*/
public interface RawMaterialMapper extends BaseMapper<RawMaterial> {
- IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+ IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page);
- List<RawMaterial> selectRawmaAll();
+ List<Map<String, Object>> selectRawmaAll();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
index 372dd04..04a0f4b 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java
@@ -22,7 +22,7 @@
*/
@Data
@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="RawMaterial瀵硅薄", description="")
+@ApiModel(value = "RawMaterial瀵硅薄", description = "")
public class RawMaterial implements Serializable {
private static final long serialVersionUID = 1L;
@@ -51,19 +51,19 @@
@ApiModelProperty(value = "鎶ユ鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime inspectionDate;
+ private Date inspectionDate;
@ApiModelProperty(value = "妫�楠屼汉")
private String surveyor;
@ApiModelProperty(value = "妫�楠屾棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private LocalDateTime dateSurvey;
+ private Date dateSurvey;
@ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�")
- private Integer condition;
+ private Integer type;
-// @TableLogic(value = "1", delval = "0")
+ // @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
@@ -73,8 +73,8 @@
private Date createTime;
@TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty(value = "涔愯閿�", hidden = true)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
index de59347..a68be8a 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/InspectionVo.java
@@ -10,12 +10,17 @@
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
+
//鏂板妫�楠屽崟
@Data
public class InspectionVo implements Serializable {
+ //濡傛灉鏄師鏉愭枡鍒檌d鏄�夋嫨鍘熸潗鏂欐姤妫�搴撲腑鐨刬d;濡傛灉鏄鎵樺垯id鏄�夋嫨濮旀墭鎶ユ搴撲腑濮旀墭鏍峰搧鐨刬d
+ @JsonSerialize
+ private Integer id;
+
/**
- *妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�
+ * 妫�楠岀被鍨� 0锛氬師鏉愭枡锛�1锛氫骇鍝侊紱2锛氬崐鎴愬搧锛�
**/
@JsonSerialize
@NotNull(message = "妫�楠岀被鍨嬩笉鑳戒负绌�")
@@ -26,7 +31,7 @@
**/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @NotBlank(message = "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖")
+ @NotNull(message = "鏉ユ枡鏃ユ湡涓嶈兘涓虹┖")
private Date formTime;
/**
@@ -75,7 +80,7 @@
**/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @NotBlank(message = "妫�楠屽紑濮嬫椂闂翠笉鑳戒负绌�")
+ @NotNull(message = "妫�楠屽紑濮嬫椂闂翠笉鑳戒负绌�")
private Date startTime;
/**
@@ -83,11 +88,15 @@
**/
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- @NotBlank(message = "妫�楠岀粨鏉熸椂闂翠笉鑳戒负绌�")
+ @NotNull(message = "妫�楠岀粨鏉熸椂闂翠笉鑳戒负绌�")
private Date endTime;
- //璇曢獙椤圭洰
- @NotBlank(message = "璇曢獙椤圭洰涓嶈兘涓虹┖")
+ //璇曢獙椤圭洰(濮旀墭涓撳睘)
@JsonSerialize
private String experiment;
+
+ //鐗堟湰(濮旀墭涓撳睘)
+ @JsonSerialize
+ @NotNull(message = "妫�楠岄」鐩増鏈笉鑳戒负绌�")
+ private Integer version;
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
index e473e4a..fd58af1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/InspectionService.java
@@ -28,6 +28,25 @@
IPage<Map<String, Object>> selectInspectsList(Page<Object> page, String message);
/**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @return
+ */
+ List<Integer> chooseVer(String name, String mcode, String specifications);
+
+ /**
+ * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�
+ * @param name
+ * @param mcode
+ * @param specifications
+ * @param version
+ * @return
+ */
+ List<Map<String,Object>> lookProByVer(String name, String mcode, String specifications, Integer version,String experiment);
+
+ /**
* 鏂板妫�楠岀敵璇疯〃
* @param id
* @param
@@ -59,14 +78,6 @@
*/
String chooseUseProId(Integer id, Integer userProId);
- /**
- * 鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
- * @param name
- * @param mcode
- * @param specifications
- * @return
- */
- List<Map<String,Object>> chooseVer(String name, String mcode, String specifications);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
index fbe9206..f022a88 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java
@@ -22,14 +22,14 @@
*/
public interface RawMaterialService extends IService<RawMaterial> {
- IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page);
+ IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page);
/**
* 鏌ヨ鍘熸潗鏂欐楠�
*
* @return
*/
- List<RawMaterial> selectRawmaAll();
+ List<Map<String, Object>> selectRawmaAll();
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
index 571f2dc..4f5f9c1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/InspectionServiceImpl.java
@@ -60,6 +60,12 @@
@Resource
UserMapper userMapper;
+ @Resource
+ RawMaterialMapper rawMaterialMapper;
+
+ @Resource
+ LinkDetectionMapper linkDetectionMapper;
+
/**
* 鏌ヨ妫�楠岀敵璇峰崟鍒楄〃
@@ -72,10 +78,40 @@
return inspectionMapper.selectInspectsList(page, message);
}
+ //鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
+ @Override
+ public List<Integer> chooseVer(String name, String mcode, String specifications) {
+ Integer specificationId = getSpecificationId(name, mcode, specifications);
+ return productMapper.chooseVersion(specificationId);
+ }
+
+ //鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�-->鏌ョ湅璇ョ増鏈笅鎴戜滑瑕佸仛鐨勯」鐩姹�
+ @Override
+ public List<Map<String, Object>> lookProByVer(String name, String mcode, String specifications, Integer version, String experiment) {
+ Integer specificationId = getSpecificationId(name, mcode, specifications);
+ /*濡傛灉璇曢獙椤圭洰涓虹┖鍒欐槸鎴愬搧妫�楠屾垨鑰呭師鏉愭枡妫�楠屽垯鏄睍绀鸿鐗堟湰鐨勬墍鏈夐」鐩楠岃姹傚弬鏁�*/
+ if (ObjectUtils.isEmpty(experiment)) {
+ return productMapper.pageProductInformation(specificationId, version);
+ }
+ /*濡傛灉涓嶄负绌哄垯鏄鎵樻楠�,鍙睍绀烘垜浠妫�楠岀殑椤圭洰瑕佹眰鍙傛暟*/
+ //鑾峰彇璇曢獙椤圭洰淇℃伅(缁撴瀯,瀵肩嚎澶栧緞)
+ List<String> experiments = Arrays.stream(experiment.split(",")).collect(Collectors.toList());
+ //鏍规嵁鍨嬪彿id鍜岄」鐩俊鎭煡璇㈤」鐩俊鎭�
+ List<Map<String, Object>> products = new ArrayList<>();
+ for (String exper : experiments) {
+ List<Map<String, Object>> list = productMapper.selFath(specificationId, exper, version);
+ if (ObjectUtils.isEmpty(list)) {
+ Map<String, Object> project = productMapper.selNam(specificationId, exper, version);
+ products.add(project);
+ }
+ products.addAll(list);
+ }
+ return products;
+ }
+
/**
* 鏂板妫�楠岀敵璇疯〃
- *
- * @param id
+ * @param id 鐢ㄦ埛id
* @param
* @return
*/
@@ -91,6 +127,21 @@
.userId(id)
.build();
inspectionMapper.insert(inspection);
+ /*濡傛灉鏄師鏉愭枡妫�楠�,鏂板涔嬪悗瑕佹洿鏀瑰師鏉愭枡鎶ユ鐨勭姸鎬佸拰妫�楠屼汉,妫�楠屾棩鏈�*/
+ if (inspectionVo.getType()==0) {
+ RawMaterial rawMaterial = new RawMaterial();
+ rawMaterial.setId(inspectionVo.getId());
+ rawMaterial.setType(1);
+ rawMaterial.setSurveyor(userMapper.selectById(id).getName());
+ rawMaterialMapper.updateById(rawMaterial);
+ }
+ /*濡傛灉鏄鎵樻楠�,鏂板涔嬪悗瑕佹洿鏀瑰鎵樻姤妫�鐨勭姸鎬�*/
+ else if (inspectionVo.getType()==2){
+ LinkDetection linkDetection = new LinkDetection();
+ linkDetection.setId(inspectionVo.getId());
+ linkDetection.setInspectionStatus(2);
+ linkDetectionMapper.updateById(linkDetection);
+ }
/*鏂板妫�楠屾牱鍝佽〃*/
InspectionMaterial inspectionMaterial = InspectionMaterial.builder()
.code(inspectionVo.getMcode())
@@ -106,7 +157,7 @@
/*鏂板妫�楠岄」鐩〃*/
//鏍规嵁鏍峰搧鍚嶇О缂栧彿浠ュ強鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id
Integer specificationId = getSpecificationId(inspectionVo.getName(), inspectionVo.getMcode(), inspectionVo.getSpecifications());
- //濡傛灉璇曢獙椤圭洰瀛楁涓嶄负绌�
+ //濡傛灉璇曢獙椤圭洰瀛楁涓嶄负绌哄垯鎸夎瀛楁鐨勯」鐩繘琛屽尮閰�
if (ObjectUtils.isNotEmpty(inspectionVo.getExperiment())) {
//鑾峰彇璇曢獙椤圭洰淇℃伅(缁撴瀯,瀵肩嚎澶栧緞)
List<String> experiments = Arrays.stream(inspectionVo.getExperiment().split(",")).collect(Collectors.toList());
@@ -115,16 +166,17 @@
for (String experiment : experiments) {
List<Product> productList1 = productMapper.selectList(Wrappers.<Product>query()
.eq("specifications_id", specificationId)
- .eq("father", experiment));
+ .eq("father", experiment)
+ .eq("version", inspectionVo.getVersion()));
if (ObjectUtils.isEmpty(productList1)) {
Product product = productMapper.selectOne(Wrappers.<Product>query()
.eq("specifications_id", specificationId)
.isNull("father")
- .eq("name", experiment));
+ .eq("name", experiment)
+ .eq("version", inspectionVo.getVersion()));
products.add(product);
} else products.addAll(productList1);
}
-
//灏嗘煡璇㈢殑椤圭洰淇℃伅鏋勫缓鎴愭楠岄」鐩�
ArrayList<InspectionProduct> list = new ArrayList<>();
for (Product product : products) {
@@ -137,13 +189,27 @@
.build();
list.add(rawInsProduct);
}
-
//妫�楠岄」鐩壒閲忔坊鍔�
inspectionProductService.saveBatch(list);
return inspection.getId();
}
- //todo:鏈畬
- return null;
+ //濡傛灉璇曢獙椤圭洰涓虹┖鍒欐寜鐓у瀷鍙穒d鍦ㄦ爣鍑嗗簱閲岄潰鍏ㄩ儴鍖归厤
+ List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationId));
+ //灏嗘煡璇㈢殑椤圭洰淇℃伅鏋勫缓鎴愭楠岄」鐩�
+ ArrayList<InspectionProduct> list = new ArrayList<>();
+ for (Product product : productList) {
+ InspectionProduct rawInsProduct = InspectionProduct.builder()
+ .name(product.getName())
+ .unit(product.getUnit())
+ .required(product.getRequired())
+ .internal(product.getInternal())
+ .inspectionMaterialId(inspectionMaterial.getId())
+ .build();
+ list.add(rawInsProduct);
+ }
+ //妫�楠岄」鐩壒閲忔坊鍔�
+ inspectionProductService.saveBatch(list);
+ return inspection.getId();
}
//鏍规嵁妫�楠屽崟id鏌ヨ鍘熸潗鏂欐楠屽崟璇︽儏
@@ -219,15 +285,6 @@
inspectionProductMapper.updateById(inspectionProduct);
return "淇濆瓨鎴愬姛!";
}
-
-
- //鏂板妫�楠屽崟-->閫夋嫨妫�楠岄」鐩増鏈�
- @Override
- public List<Map<String, Object>> chooseVer(String name, String mcode, String specifications) {
- Integer specificationId = getSpecificationId(name, mcode, specifications);
- return null;
- }
-
/*鏍规嵁鏍峰搧鍚嶇О,鏍峰搧缂栧彿,鍨嬪彿瑙勬牸鑾峰彇鍨嬪彿id*/
private Integer getSpecificationId(String name, String mcode, String specification) {
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
index f2ccf94..555110d 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/PlanServiceImpl.java
@@ -1,7 +1,9 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yuanchu.limslaboratory.mapper.*;
import com.yuanchu.limslaboratory.pojo.*;
import com.yuanchu.limslaboratory.service.PlanService;
@@ -44,6 +46,12 @@
@Resource
InspectionMapper inspectionMapper;
+
+ @Resource
+ InspectionMaterialMapper inspectionMaterialMapper;
+
+ @Resource
+ LinkDetectionMapper linkDetectionMapper;
//鏌ヨ妫�楠岃鍒�
@Override
@@ -116,6 +124,7 @@
Inspection inspection = new Inspection();
inspection.setId(id);
inspection.setInspectionStatus(0);
+ //鏇存柊妫�楠屽崟
inspectionMapper.updateById(inspection);
} else if (count == results.size()) {
Inspection inspection = new Inspection();
@@ -139,6 +148,7 @@
report.setStatus(0);
report.setConclusion(conclusion);
report.setInspectionId(id);
+ //鏂板妫�楠屾姤鍛�
reportMapper.insert(report);
return "涓婃姤鎴愬姛!";
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
index de3cc31..b72eba2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -36,8 +37,8 @@
* @return
*/
@Override
- public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer condition, String createTime, Page<Objects> page) {
- return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, condition, createTime, page);
+ public IPage<RawMaterial> selectRawMaterial(String materialCoding, String materialName, Integer type, String createTime, Page<Objects> page) {
+ return rawMaterialMapper.selectRawMaterial(materialCoding, materialName, type, createTime, page);
}
/**
@@ -46,7 +47,7 @@
* @return
*/
@Override
- public List<RawMaterial> selectRawmaAll() {
+ public List<Map<String, Object>> selectRawmaAll() {
return rawMaterialMapper.selectRawmaAll();
}
diff --git a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
index 3ce5aec..619b044 100644
--- a/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
+++ b/inspection-server/src/main/resources/mapper/LinkBasicInformationMapper.xml
@@ -25,7 +25,8 @@
</select>
<select id="selectLinkAll" resultType="java.util.Map">
- SELECT DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
+ SELECT d.id ,
+ DATE_FORMAT(l.`inspection_time`, '%Y-%m-%d') formTime,
l.`entrusted` supplier,
d.`sample_number` mcode,
d.`sample_name` name,
@@ -39,5 +40,6 @@
lims_laboratory.link_detection d
WHERE l.`id` = d.`link_basic_id`
AND l.`state` = 1
+ and inspection_status = 1
</select>
</mapper>
diff --git a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
index 6dc7c1a..7e17cfa 100644
--- a/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
+++ b/inspection-server/src/main/resources/mapper/RawMaterialMapper.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.limslaboratory.mapper.RawMaterialMapper">
-
<select id="selectRawMaterial" resultType="com.yuanchu.limslaboratory.pojo.RawMaterial">
SELECT *
FROM raw_material r
@@ -12,16 +11,26 @@
<if test="materialName != null and materialName != ''">
AND r.`material_name` LIKE CONCAT('%',#{materialName},'%')
</if>
- <if test="condition != null and condition != ''">
- AND r.`condition` = #{condition}
+ <if test="type != null and type != ''">
+ AND r.`type` = #{type}
</if>
<if test="createTime != null and createTime != ''">
AND DATE_FORMAT(r.`create_time`,'%Y-%m-%d') = #{createTime}
</if>
</select>
- <select id="selectRawmaAll" resultType="com.yuanchu.limslaboratory.pojo.RawMaterial">
- select * from lims_laboratory.raw_material where state=1
+ <select id="selectRawmaAll" resultType="java.util.Map">
+ select id,
+ supplier_name supplier,
+ material_coding mcode,
+ material_name name,
+ specifications_models specifications,
+ unit,
+ quantity num,
+ DATE_FORMAT(inspection_date, '%Y-%m-%d') startTime,
+ DATE_FORMAT(date_survey, '%Y-%m-%d') endTime,
+ DATE_FORMAT(create_time, '%Y-%m-%d') formTime
+ from lims_laboratory.raw_material
+ where state = 1
+ and type = 0
</select>
-
-
</mapper>
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
index 79f34f0..5119274 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/ProductController.java
@@ -46,7 +46,6 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鏍囧噯椤圭洰ID", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "required", value = "鏍囧噯鍊�", dataTypeClass = String.class, required = true),
- @ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true),
@ApiImplicitParam(name = "internal", value = "鍐呮帶鍊�", dataTypeClass = String.class, required = true)
})
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
index 13958cd..bb0de57 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/ProductMapper.java
@@ -33,4 +33,10 @@
//鏌ヨ璇ュ瀷鍙蜂笅鐨勬墍鏈夎瘯楠岄」鐩�(鐖剁被)
List<Map<String,Object>> chooseProject(Integer modelId);
+
+ //鏍规嵁椤圭洰鐖剁被,鍨嬪彿id,鐗堟湰鏌ヨ浜岀骇璇︽儏
+ List<Map<String, Object>> selFath(Integer specificationId, String exper, Integer version);
+
+ //鏍规嵁椤圭洰鐖剁被涓虹┖,椤圭洰鍚�,鍨嬪彿id,鐗堟湰鏌ヨ
+ Map<String, Object> selNam(Integer specificationId, String exper, Integer version);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
index eed66aa..fec45c1 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ProductServiceImpl.java
@@ -73,7 +73,9 @@
public Integer addVersion(Integer specificationsId) {
List<Product> productList = productMapper.selectList(Wrappers.<Product>query().eq("specifications_id", specificationsId));
for (Product product : productList) {
+ product.setId(null);
product.setVersion(product.getVersion()+1);
+ product.setSpecifications_id(specificationsId);
}
saveBatch(productList);
return productList.get(0).getVersion();
diff --git a/standard-server/src/main/resources/mapper/ProductMapper.xml b/standard-server/src/main/resources/mapper/ProductMapper.xml
index 398bc0d..b2fefbc 100644
--- a/standard-server/src/main/resources/mapper/ProductMapper.xml
+++ b/standard-server/src/main/resources/mapper/ProductMapper.xml
@@ -37,8 +37,8 @@
from lims_laboratory.product
where state = 1
and specifications_id = #{specificationsId}
- ORDER BY product.`create_time` DESC
and version = #{version}
+ ORDER BY product.`create_time` DESC
</select>
<select id="deleteList">
@@ -71,4 +71,36 @@
where state = 1
and specifications_id = #{modelId}
</select>
+
+ <!--鏍规嵁椤圭洰鐖剁被,鍨嬪彿id,鐗堟湰鏌ヨ浜岀骇璇︽儏-->
+ <select id="selFath" resultMap="pageProductInformationMap">
+ select id,
+ name,
+ father,
+ unit,
+ required,
+ internal,
+ version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationId}
+ and version = #{version}
+ and father = #{exper}
+ </select>
+
+ <!--鏍规嵁椤圭洰鐖剁被涓虹┖,椤圭洰鍚�,鍨嬪彿id,鐗堟湰鏌ヨ-->
+ <select id="selNam" resultType="java.util.Map">
+ select id,
+ name,
+ unit,
+ required,
+ internal,
+ version
+ from lims_laboratory.product
+ where state = 1
+ and specifications_id = #{specificationId}
+ and version = #{version}
+ and name = #{exper}
+ and father is null
+ </select>
</mapper>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
deleted file mode 100644
index 5f202d2..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/RoleController.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.yuanchu.limslaboratory.controller;
-
-
-import com.yuanchu.limslaboratory.service.RoleService;
-import com.yuanchu.limslaboratory.vo.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * <p>
- * 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Api(tags = "鐢ㄦ埛妯″潡")
-@RestController
-@RequestMapping("/role")
-public class RoleController {
-
- @Autowired
- private RoleService roleService;
-
- @ApiOperation("鏂板鐢ㄦ埛-->鑾峰彇鐢ㄦ埛鏉冮檺鍒楄〃")
- @GetMapping("/list")
- public Result<?> getUserRoleList(){
- //鏍规嵁token鑾峰彇鐢ㄦ埛淇℃伅
-// Map<String,Object> data = roleService.getUserRoleList();
-// if (data != null){
-// return Result.success(data);
-// }
- return Result.fail(202,"鐢ㄦ埛鐧诲綍淇℃伅鏃犳晥锛岃閲嶆柊鐧诲綍");
- }
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
index a01ef4c..7e21786 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/controller/UserController.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.clients.UserLoginUtils;
import com.yuanchu.limslaboratory.pojo.User;
+import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.service.UserService;
import com.yuanchu.limslaboratory.shiro.realm.ShiroRealm;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -24,6 +25,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -42,6 +44,9 @@
@Autowired
private UserService userService;
+
+ @Autowired
+ private RoleManagerService roleManagerService;
@ApiOperation("鐢ㄦ埛鐧诲綍")
@ApiImplicitParams(value = {
@@ -75,6 +80,13 @@
}
}
+ @ApiOperation("鏂板鐢ㄦ埛鑾峰彇瑙掕壊鏉冮檺淇℃伅")
+ @GetMapping("/list")
+ public Result<?> getUserListRole(){
+ List<Map<String,Object>> data = roleManagerService.getUserListRole();
+ return Result.success(data);
+ }
+
@ApiOperation("鐧诲綍-->鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("/info")
public Result<?> getUserInfo(@RequestHeader("X-Token") String token){
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
index f0c2e12..d0232db 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleManageMapper.java
@@ -33,4 +33,6 @@
int deleteRoleMenuByRoleId(Long id);
RoleAndMenuDto selectAllRoleAndMenuByRoleId(Long roleId);
+
+ List<Map<String, Object>> getUserListRole();
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java b/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
deleted file mode 100644
index 764ad21..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/mapper/RoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.limslaboratory.mapper;
-
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 鎺ュ彛
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface RoleMapper extends BaseMapper<Role> {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
deleted file mode 100644
index c568112..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/Role.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.yuanchu.limslaboratory.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="Role瀵硅薄", description="")
-public class Role implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- @ApiModelProperty(value = "瑙掕壊id")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
-
- @ApiModelProperty(value = "瑙掕壊鍚�")
- private String name;
-
- @ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺")
- private Integer power;
-
- @TableLogic(value = "1", delval = "0")
- @ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0")
- private Integer state;
-
- @TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone="GMT+8")
- private Date updateTime;
-
- @Version
- @ApiModelProperty(value = "涔愯閿�")
- private Integer version;
-
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
index 26cc155..d8e38a1 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/User.java
@@ -3,9 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
@@ -14,7 +12,6 @@
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
index eef9229..fed072b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/NewPersonnelVo.java
@@ -18,7 +18,7 @@
private String account;
@ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
- private Integer roleId;
+ private Long roleId;
@ApiModelProperty(value = "骞撮緞", example = "23")
private Integer age;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
index dd75f80..8bafbd6 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/vo/UpdatePersonnelVo.java
@@ -20,7 +20,10 @@
private String account;
@ApiModelProperty(value = "0锛氭棤鏉冮檺锛�1锛氭湁鏉冮檺", example = "1", required = true)
- private Long role_id;
+ private Long roleId;
+
+ @ApiModelProperty(value = "鍏宠仈 浼佷笟id")
+ private Integer enterpriseId;
@ApiModelProperty(value = "骞撮緞", example = "23")
private Integer age;
@@ -31,6 +34,9 @@
@ApiModelProperty(value = "閭", example = "12345678@qq.com")
private String email;
+ @ApiModelProperty(value = "缁勭粐鏋舵瀯Id", example = "2")
+ private Integer organizationId;
+
@ApiModelProperty(value = "鍦ㄨ亴鐘舵�� 姝ｅ父>=1,绂昏亴<=0", example = "0")
private Integer jobState;
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
index c051e02..9367e29 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleManagerService.java
@@ -26,4 +26,6 @@
boolean updateRoleMenu(UpdateRoleMenuDto dto);
RoleAndMenuDto getRoleAndMenuByRole(Long roleId);
+
+ List<Map<String, Object>> getUserListRole();
}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
deleted file mode 100644
index f301dfb..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/RoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.yuanchu.limslaboratory.service;
-
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-public interface RoleService extends IService<Role> {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
index 735ee30..2a4313b 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@
import com.yuanchu.limslaboratory.pojo.dto.UpdateRoleMenuDto;
import com.yuanchu.limslaboratory.service.RoleManagerService;
import com.yuanchu.limslaboratory.utils.JsonUtil;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -136,6 +138,11 @@
return roleManageMapper.selectAllRoleAndMenuByRoleId(roleId);
}
+ @Override
+ public List<Map<String, Object>> getUserListRole() {
+ return roleManageMapper.getUserListRole();
+ }
+
private List<Menu> getEnumChildren(Menu root, List<Menu> all) {
return all.stream()
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
deleted file mode 100644
index ba4584e..0000000
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yuanchu.limslaboratory.service.impl;
-
-import com.yuanchu.limslaboratory.pojo.Role;
-import com.yuanchu.limslaboratory.mapper.RoleMapper;
-import com.yuanchu.limslaboratory.service.RoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
- * @since 2023-07-07
- */
-@Service
-public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements RoleService {
-
-}
diff --git a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
index 72e2822..a95c292 100644
--- a/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/UserServiceImpl.java
@@ -126,23 +126,20 @@
@Override
public Integer updateNewPersonnel(UpdatePersonnelVo updatePersonnelVo) {
- User user = new User()
- .setName(updatePersonnelVo.getName())
- .setAccount(updatePersonnelVo.getAccount())
- .setAge(String.valueOf(updatePersonnelVo.getAge()))
- .setPhone(updatePersonnelVo.getPhone())
- .setEmail(updatePersonnelVo.getEmail())
- .setRoleId(updatePersonnelVo.getRole_id())
- .setPassword(updatePersonnelVo.getPassword())
- .setJobState(updatePersonnelVo.getJobState());
- LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
- updateWrapper.eq(User::getId, updatePersonnelVo.getId());
- return userMapper.update(user, updateWrapper);
+ try {
+ MyUtil.PrintLog(updatePersonnelVo.toString());
+ User unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(updatePersonnelVo), User.class);
+
+ LambdaUpdateWrapper<User> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(User::getId, updatePersonnelVo.getId());
+ return userMapper.update(unmarshal, updateWrapper);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
@Override
public IPage<Map<String, Object>> getNewPersonnelPage(String name, Page page, Integer status) {
- MyUtil.PrintLog(name + status + "=============");
return userMapper.getNewPersonnelPage(name, page, status);
}
diff --git a/user-server/src/main/resources/mapper/RoleManangeMapper.xml b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
index f2d1cc1..1944922 100644
--- a/user-server/src/main/resources/mapper/RoleManangeMapper.xml
+++ b/user-server/src/main/resources/mapper/RoleManangeMapper.xml
@@ -91,6 +91,10 @@
and r.id=#{roleId}
</select>
+ <select id="getUserListRole" resultType="map">
+ SELECT CONCAT(r.`id`, '') id, r.`name`
+ FROM role r
+ </select>
<resultMap id="roleAndMenuById" type="com.yuanchu.limslaboratory.pojo.dto.RoleAndMenuDto">
<result property="roleName" column="roleName"/>
<result property="createTime" column="createTime"/>
@@ -124,4 +128,4 @@
<result property="parentId" column="parentId"/>
</collection>
</resultMap>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/user-server/src/main/resources/mapper/RoleMapper.xml b/user-server/src/main/resources/mapper/RoleMapper.xml
deleted file mode 100644
index ea9cf2d..0000000
--- a/user-server/src/main/resources/mapper/RoleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.limslaboratory.mapper.RoleMapper">
-
-</mapper>
--
Gitblit v1.9.3