From 19c9e29273e8e751847d9dcb06b346dede48d2c8 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 30 八月 2023 15:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml | 4 +-
user-server/src/main/resources/mapper/MenuMapper.xml | 2
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java | 9 ++--
laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java | 2
user-server/src/main/resources/mapper/UserMapper.xml | 2
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java | 2 +
laboratory-server/src/main/resources/mapper/InstrumentMapper.xml | 4 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java | 3 -
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/RawMaterialService.java | 3 +
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/RawMaterialController.java | 30 +++++++++++++-
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/RawMaterial.java | 23 +++++------
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RawMaterialServiceImpl.java | 15 +++++++
user-server/src/main/java/com/yuanchu/limslaboratory/service/impl/RoleManagerServiceImpl.java | 2
13 files changed, 70 insertions(+), 31 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
index 6bdf287..9f78f60 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/QualificationRateStatisticsController.java
@@ -35,7 +35,6 @@
@GetMapping("/getTestSampleStatistics")
@AuthHandler
public Result<?> getTestSampleStatistics(SelectQualificationRateDto dto){
- System.out.println("getTestSampleStatistics______________>"+dto);
return Result.success(service.getTestSampleStatistics(dto));
}
@@ -43,7 +42,6 @@
@GetMapping("/getSupplierNoPassStatistics")
@AuthHandler
public Result<?> getSupplierNoPassStatistics(SelectQualificationRateDto dto){
- System.out.println("getSupplierNoPassStatistics++++++++++++++++>"+dto);
return Result.success(service.getSupplierNoPassStatistics(dto));
}
@@ -51,7 +49,6 @@
@GetMapping("/getNoPassProjectStatistics")
@AuthHandler
public Result<?> getNoPassProjectStatistics(SelectQualificationRateDto dto){
- System.out.println("getNoPassProjectStatistics===============>"+dto);
return Result.success(service.getNoPassProjectStatistics(dto));
}
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 dc56db5..aa08081 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
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
import com.yuanchu.limslaboratory.service.RawMaterialService;
import com.yuanchu.limslaboratory.vo.Result;
@@ -12,9 +14,9 @@
import io.swagger.annotations.ApiImplicitParams;
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.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
@@ -53,4 +55,26 @@
map.put("total", iPage.getTotal());
return Result.success(map);
}
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�娣诲姞")
+ @PostMapping("/add")
+ @AuthHandler(type = InterfaceType.ADD,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> insertRawMaterial(@Validated @RequestBody RawMaterial rawMaterial) {
+ Integer integer = rawMaterialService.insertRawMaterial(rawMaterial);
+ if (integer >= 1) {
+ return Result.success("娣诲姞鎴愬姛");
+ }
+ return Result.fail("娣诲姞澶辫触");
+ }
+
+ @ApiOperation("鍘熸潗鏂欐姤妫�鍒犻櫎")
+ @PostMapping("/delete")
+ @AuthHandler(type = InterfaceType.DELETE,menuId = MenuEnums.reportForInspection,isAdd = true)
+ public Result<?> deleteRawMaterial(String deleteId) {
+ Integer integer = rawMaterialService.deleteRawMaterial(deleteId);
+ if (integer >= 1) {
+ return Result.success("鍒犻櫎鎴愬姛");
+ }
+ return Result.fail("鍒犻櫎澶辫触");
+ }
}
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 04a0f4b..f4150b1 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
@@ -27,43 +27,42 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婚敭")
+ @ApiModelProperty(value = "涓婚敭", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�", required = true, example = "姹熻嫃榈烽洀")
private String supplierName;
- @ApiModelProperty(value = "鏉愭枡缂栫爜")
+ @ApiModelProperty(value = "鏉愭枡缂栫爜", required = true, example = "YCL202308290000002")
private String materialCoding;
- @ApiModelProperty(value = "鏉愭枡鍚嶇О")
+ @ApiModelProperty(value = "鏉愭枡鍚嶇О", required = true, example = "鍏夌氦")
private String materialName;
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿", required = true, example = "GGXH2023")
private String specificationsModels;
- @ApiModelProperty(value = "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅", required = true, example = "KB")
private String unit;
- @ApiModelProperty(value = "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺", example = "100", required = true)
private Integer quantity;
- @ApiModelProperty(value = "鎶ユ鏃ユ湡")
+ @ApiModelProperty(value = "鎶ユ鏃ユ湡", example = "2023-08-29", required = true, dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date inspectionDate;
- @ApiModelProperty(value = "妫�楠屼汉")
+ @ApiModelProperty(value = "妫�楠屼汉", example = "鏉庡崕", required = true)
private String surveyor;
- @ApiModelProperty(value = "妫�楠屾棩鏈�")
+ @ApiModelProperty(value = "妫�楠屾棩鏈�", required = true, example = "2023-08-29", dataType = "date")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dateSurvey;
- @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�")
+ @ApiModelProperty(value = "鐘舵��0:寰呮娴�;1:宸叉娴�", required = true, example = "1")
private Integer type;
- // @TableLogic(value = "1", delval = "0")
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
private Integer state;
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 f022a88..29be66d 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
@@ -32,4 +32,7 @@
List<Map<String, Object>> selectRawmaAll();
+ Integer insertRawMaterial(RawMaterial rawMaterial);
+
+ Integer deleteRawMaterial(String deleteId);
}
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
index 8dd7601..a6b3e78 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/QualificationRateStatisticsServiceImpl.java
@@ -88,7 +88,6 @@
list.add(mapNoPass);
mapResult.put("series",list);
mapResult.put("noData",true);
- //System.out.println(mapResult);
return mapResult;
}
@@ -106,8 +105,10 @@
supplierDistinct.forEach(l -> {
supplierList.add(String.valueOf(l.get("supplier")));
});
+ //x杞�
allMap.put("xAxis", supplierList);
List<SeriesDto> seriesDtoList = new ArrayList<SeriesDto>(2);
+ //title
SeriesDto seriesDto = new SeriesDto("鍚堟牸鏁伴噺");
SeriesDto seriesDto2 = new SeriesDto("涓嶅悎鏍兼暟閲�");
// 鍙栧嚭瀵瑰簲鍚堟牸鏁伴噺涓嶅悎鏍兼暟閲�
@@ -121,7 +122,7 @@
.forEach(l -> {
if (Objects.equals(l.get("inspectionStatus"), 1)) {
integerPass.incrementAndGet();
- } else {
+ } else if(Objects.equals(l.get("inspectionStatus"), 0)) {
integerNoPass.incrementAndGet();
}
});
@@ -158,12 +159,12 @@
public Map<String, Object> getNoPassProjectStatistics(SelectQualificationRateDto dto) {
Map<String, Object> allMap = new HashMap<>(16);
List<ImInfo> imInfos = qualificationRateStatisticsMapper.selectProjectionsByCondition(dto);
- List<String>NameList = new ArrayList<>();
- List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>();
if(imInfos.size()<=0){
allMap.put("noData",false);
return allMap;
}
+ List<String>NameList = new ArrayList<>();
+ List<SelectProjectByCodeAndNameDto>projectByCodeAndNameDtos=new ArrayList<>();
imInfos.forEach(l->{
NameList.add(l.getImCode()+"-"+l.getImName());
projectByCodeAndNameDtos.add(new SelectProjectByCodeAndNameDto(l.getImCode(),l.getImName()));
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 b72eba2..8c0c4a1 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
@@ -1,6 +1,7 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.pojo.RawMaterial;
@@ -31,7 +32,6 @@
* 鍒嗛〉鏌ヨ
* @param materialCoding
* @param materialName
- * @param condition
* @param createTime
* @param page
* @return
@@ -51,5 +51,18 @@
return rawMaterialMapper.selectRawmaAll();
}
+ @Override
+ public Integer insertRawMaterial(RawMaterial rawMaterial) {
+ return rawMaterialMapper.insert(rawMaterial);
+ }
+
+ @Override
+ public Integer deleteRawMaterial(String deleteId) {
+ LambdaUpdateWrapper<RawMaterial> updateWrapper = new LambdaUpdateWrapper<>();
+ updateWrapper.eq(RawMaterial::getId, deleteId);
+ updateWrapper.set(RawMaterial::getState, 0);
+ return rawMaterialMapper.update(new RawMaterial(), updateWrapper);
+ }
+
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
index affbdc7..a0dcfed 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/mapper/InstrumentMapper.java
@@ -26,5 +26,5 @@
//鍒嗛厤-->閫夋嫨璁惧
List<Map<String, Object>> chooseinstum();
- List<Instrument> getInstrument();
+ List<Map<String, String>> getInstrument();
}
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
index b66eb6c..a327be4 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java
@@ -18,8 +18,10 @@
@ApiModelProperty(value = "褰撳墠椤�", example = "1", required = true)
private Long currentPage;
+
@ApiModelProperty(value = "姣忛〉澶氬皯鏉�", example = "10", required = true)
private Long pageSize;
+
@ApiModelProperty(value = "璁″垝鍗曞彿", required = false)
private String plannedOrderNumber;
}
diff --git a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
index 3aa5914..5031258 100644
--- a/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/InstrumentMapper.xml
@@ -46,7 +46,7 @@
left join lims_laboratory.classify c on c.id = instrument.classify_id
where conditions in(1,5)
</select>
- <select id="getInstrument" resultType="com.yuanchu.limslaboratory.pojo.Instrument">
- select id,equipment_name name from instrument where 1=1 and state=1 and conditions=5
+ <select id="getInstrument" resultType="map">
+ select id,equipment_name equipmentName from instrument where 1=1 and state=1 and conditions=5
</select>
</mapper>
diff --git a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
index 1a7b226..87445db 100644
--- a/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
+++ b/laboratory-server/src/main/resources/mapper/MeteringPlanMapper.xml
@@ -46,7 +46,7 @@
from metering_plan
where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
LIMIT #{limitPage.start},#{limitPage.end}) p
LEFT JOIN metrical_information i ON p.id = i.plan
@@ -56,7 +56,7 @@
<select id="getTotal" resultType="java.util.Map">
select count(id) num from metering_plan where 1=1
<if test="dto.plannedOrderNumber!=null and dto.plannedOrderNumber!=''">
- and planned_order_number=#{plannedOrderNumber}
+ and planned_order_number like concat('%',#{dto.plannedOrderNumber},'%')
</if>
</select>
<select id="getPlanMeasureInstrument"
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 5a9cd16..90affac 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
@@ -77,7 +77,7 @@
));
});
if(roleMenuList.size()<1){
- roleMenuList.add(new RoleMenu(null,nextId,39L,false,false,false,false,createTime));
+ roleMenuList.add(new RoleMenu(null,nextId,39L,true,false,false,false,createTime));
}
//roleMenuAddList.forEach(System.out::println);
int i = roleManageMapper.insertBatchRoleMenu(roleMenuList);
diff --git a/user-server/src/main/resources/mapper/MenuMapper.xml b/user-server/src/main/resources/mapper/MenuMapper.xml
index 6d55185..57e059e 100644
--- a/user-server/src/main/resources/mapper/MenuMapper.xml
+++ b/user-server/src/main/resources/mapper/MenuMapper.xml
@@ -7,7 +7,7 @@
from menu
where state = 1
and id != 39
- and parent_id != 39
+ and parent_id != 39
</select>
<select id="getMenuNameAndId" resultType="map">
select url, id, name
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b89ebd9..6b79d8e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -21,7 +21,7 @@
<select id="getNewPersonnelPage" resultType="map">
SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
- u.`age`,
+ u.`age`, CONCAT(r.`id`, '') roleId,
u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
--
Gitblit v1.9.3