From 41576aa609c839741260aee6e7880caf28147390 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 11 九月 2023 18:00:21 +0800
Subject: [PATCH] MOM系统-9-11下班
---
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 4 -
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 67 ++++++++++++++++++++-------------
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 7 ++-
inspect-server/src/main/java/com/yuanchu/mom/pojo/dto/InspectionItemDto2.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java | 5 ++
inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 7 +--
7 files changed, 56 insertions(+), 38 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index 8d31020..9415e88 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -46,11 +46,12 @@
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "formTime",value = "鏉ユ枡鏃ユ湡",dataTypeClass = String.class),
- @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
+ @ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = Integer.class),
})
@GetMapping("/selectUnRawInspectsList")
- public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
- IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
+ public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState, Integer productCategories){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState, productCategories);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index 8f9e557..2ab9e78 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -16,9 +16,7 @@
//鏌ヨ鎴愬搧妫�楠屼腑涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
- IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);
-
-
+ IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);
IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/dto/InspectionItemDto2.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/dto/InspectionItemDto2.java
index d9ad4d5..d23112c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/dto/InspectionItemDto2.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/dto/InspectionItemDto2.java
@@ -24,7 +24,7 @@
private String inspectionValue;
@ApiModelProperty(value = "璇曢獙璁惧")
- private Integer deviceId;
+ private String dname;
@ApiModelProperty(value = "缁撹")
private Integer result;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index f75736e..1bd912b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -23,7 +23,7 @@
* @param dealState
* @return
*/
- IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState);
+ IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories);
/**
* 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index d9c00ba..ea412f4 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -28,8 +28,8 @@
//鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
@Override
- public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
- return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
+ public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState, Integer productCategories) {
+ return inspectUnacceptedMapper.selectInsList(page, formTime, dealState, productCategories);
}
@Override
@@ -55,8 +55,7 @@
LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
.eq(InspectUnaccepted::getId, rawId)
.set(InspectUnaccepted::getDealReasult, passOrNo)
- .set(InspectUnaccepted::getDealState, 1);
+ .set(InspectUnaccepted::getDealState, passOrNo);
return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
}
}
-
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
index da3dcd9..7f4ba7f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/OpinionServiceImpl.java
@@ -8,6 +8,7 @@
import com.yuanchu.mom.pojo.Opinion;
import com.yuanchu.mom.mapper.OpinionMapper;
import com.yuanchu.mom.pojo.dto.UpdateInspectUnacceptedDto;
+import com.yuanchu.mom.service.InspectUnacceptedService;
import com.yuanchu.mom.service.OpinionService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.utils.JackSonUtil;
@@ -33,6 +34,9 @@
@Resource
private OpinionMapper opinionMapper;
+
+ @Resource
+ private InspectUnacceptedService inspectUnacceptedService;
@Override
public List<UpdateInspectUnacceptedDto> clickEditingTriggerQuery(Integer rawUnacceptedId) {
@@ -64,6 +68,7 @@
throw new RuntimeException(e);
}
});
+ MyUtil.PrintLog(list.get(1).getRawUnacceptedId().toString());
return opinionMapper.updateOpinion(list);
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index b6471a3..724ac00 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -6,31 +6,46 @@
<!--涓嶅悎鏍肩鐞�-->
<select id="selectInsList" resultType="java.util.Map">
SELECT ru.id,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
- reason,
- material_code,
- project_name,
+ ru.reason,
u.`name`,
- specifications_model,
- unit,
- quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
- u.name,
- deal_state,
- deal_reasult,
- DATE_FORMAT(fi.update_time, '%Y-%m-%d') processingDate
- FROM (inspect_unaccepted ru,
- `user` u)
- LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
- where fi.id = ru.raw_inspect_id
- AND ru.type = 1
+ ru.deal_state,
+ ru.deal_reasult,
+ DATE_FORMAT(fi.dateArrival, '%Y-%m-%d') dateArrival,
+ fi.material_code,
+ fi.project_name,
+ fi.specifications_model,
+ fi.unit,
+ fi.quantity,
+ DATE_FORMAT(fi.inspectionDate, '%Y-%m-%d') inspectionDate,
+ DATE_FORMAT(fi.processingDate, '%Y-%m-%d') processingDate
+ FROM mom_ocean.inspect_unaccepted ru, mom_ocean.`user` u, (
+ SELECT p.id, DATE_FORMAT(p.`create_time`, '%Y-%m-%d') dateArrival, p.`material_code`, p.`material` project_name,
+ p.`specifications_model`,
+ p.`unit`, p.`quantity`,DATE_FORMAT(p.`create_time`, '%Y-%m-%d') inspectionDate, DATE_FORMAT(p.`update_time`,
+ '%Y-%m-%d') processingDate, p.`user_id`, 2 AS
+ classify
+ FROM mom_ocean.process_inspect p
+ WHERE p.`state` = 1
+ UNION ALL
+ SELECT fi.id, DATE_FORMAT(fi.create_time, '%Y-%m-%d')
+ dateArrival,material_code,project_name,specifications_model,
+ unit,quantity,DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,DATE_FORMAT(fi.update_time, '%Y-%m-%d')
+ processingDate, fi.`user_id`, 1 AS classify
+ FROM mom_ocean.finished_inspect fi
+ WHERE fi.`state` = 1) fi
+ WHERE fi.id = ru.raw_inspect_id
+ AND ru.`type` = fi.`classify`
+ AND ru.type != 0
AND ru.state=1
AND fi.`user_id` = u.`id`
<if test="dealState!=null">
- and deal_state = #{dealState}
+ and ru.deal_state = #{dealState}
</if>
<if test="formTime!=null and formTime!=''">
- and fi.create_time=#{formTime}
+ and fi.dateArrival=#{formTime}
+ </if>
+ <if test="productCategories != null">
+ and ru.`type` = #{productCategories}
</if>
order by ru.id desc
</select>
@@ -51,8 +66,8 @@
r.`supplier`,
i.`deal_state`,
i.`deal_reasult`
- FROM inspect_unaccepted i
- LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
+ FROM mom_ocean.inspect_unaccepted i
+ LEFT JOIN mom_ocean.raw_inspect r ON i.`raw_inspect_id` = r.`id`
WHERE i.`state` = 1
AND i.`type` = 0
<if test="formTime != null and formTime != ''">
@@ -74,12 +89,12 @@
<select id="selectDisposal" resultType="map">
SELECT i.`id`, s.`type`, s.name productName, s.`specifications`, s.number, i.`tell` description,
i.`tell` opinions, s.user_name, DATE_FORMAT(i.`create_time`, '%Y-%m-%d') `date`, i.`deal_state`
- FROM inspect_unaccepted i
+ FROM mom_ocean.inspect_unaccepted i
LEFT JOIN
(
-- 鍘熸潗鏂�
SELECT 0 AS `type`, r.`name`, r.`specifications`, r.`number`, r.`id`, r.`user_name`
- FROM raw_inspect r
+ FROM mom_ocean.raw_inspect r
WHERE r.state = 1
<if test="specificationModel != null and specificationModel != ''">AND r.`specifications` LIKE CONCAT('%',
#{specificationModel}, '%')
@@ -90,7 +105,7 @@
UNION ALL
-- 鎴愬搧
SELECT 1 AS `type`, f.`project_name` `name`, f.`specifications_model` specifications, f.`quantity` `number`, f.`id`, u.name user_name
- FROM finished_inspect f, `user` u
+ FROM mom_ocean.finished_inspect f, mom_ocean.`user` u
WHERE f.`state` = 1
AND u.id = f.user_id
<if test="specificationModel != null and specificationModel != ''">
@@ -102,7 +117,7 @@
UNION ALL
-- 鍗婃垚鍝�
SELECT 2 AS `type`, p.`material` `name`, p.`specifications_model` specifications, p.`quantity` `number`, p.`id`, u.name user_name
- FROM process_inspect p, `user` u
+ FROM mom_ocean.process_inspect p, mom_ocean.`user` u
WHERE p.state = 1
AND u.id = p.user_id
<if test="specificationModel != null and specificationModel != ''">
@@ -120,6 +135,6 @@
<if test="productCategories != null">
AND s.`type` = #{productCategories}
</if>
- ORDER BY i.id DESC
+ ORDER BY i.`update_time` DESC
</select>
</mapper>
--
Gitblit v1.9.3