From a42e0989485009e7196a8e8a7d25473b3d827cff Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 02 九月 2024 17:36:25 +0800
Subject: [PATCH] 插队操作+用户列表
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 9 ++++
inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java | 2 +
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java | 12 ++++++
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java | 25 ++++++++++--
inspect-server/src/main/resources/mapper/InsSampleMapper.xml | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java | 3 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java | 58 +++++------------------------
inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java | 4 +-
inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml | 4 +
9 files changed, 63 insertions(+), 57 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
index 9b23ba0..52b3e9c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java
@@ -194,7 +194,7 @@
@ValueClassify("妫�楠屼换鍔�")
@ApiOperation(value = "鎻掗槦鎿嶄綔")
@PostMapping("/jumpTeam")
- public Result<?> jumpTeam(@RequestBody List<InsOrderState> insOrderStates) {
- return Result.success(insOrderStateService.updateBatchById(insOrderStates));
+ public Result<?> jumpTeam(@RequestBody InsOrderState insOrderState) {
+ return Result.success(insOrderStateService.jumpTeam(insOrderState));
}
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
index aca65d1..af2713f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
@@ -70,4 +70,16 @@
@ApiModelProperty("鎻掗槦鎿嶄綔鐨勬帓搴�")
private Integer sort;
+
+ @ApiModelProperty("鎻掗槦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sortTime;
+
+ //褰撳墠椤�
+ @TableField(exist = false,select = false)
+ private Integer current;
+
+ //椤垫暟
+ @TableField(exist = false,select = false)
+ private Integer size;
}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java
index 2e79e2a..e814ca5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java
@@ -3,6 +3,8 @@
import com.yuanchu.mom.pojo.InsOrderState;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* @author admin
* @description 閽堝琛ㄣ�恑ns_order_state銆戠殑鏁版嵁搴撴搷浣淪ervice
@@ -10,4 +12,5 @@
*/
public interface InsOrderStateService extends IService<InsOrderState> {
+ int jumpTeam(InsOrderState insOrderState);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
index 6e1eb12..1a6804c 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -195,10 +195,16 @@
return false;
}
/*璁ら闇�瑕佸垽鏂鏍峰搧鏄惁鍦ㄥ簱*/
- //鏌ヨ鏍峰搧id
+ //鏌ヨ鏍峰搧id(杩囨护娌℃湁妫�楠岄」鐩殑鏍峰搧)
List<Integer> sampleIds = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
.eq(InsSample::getInsOrderId, entity.getInsSampleId())).stream().map(InsSample::getId).collect(Collectors.toList());
for (Integer samId : sampleIds) {
+ //杩囨护娌℃湁妫�楠岄」鐩殑鏍峰搧id
+ if (ObjectUtils.isEmpty(insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
+ .eq(InsProduct::getInsSampleId,samId)
+ .eq(InsProduct::getState,1)))){
+ continue;
+ }
//鍏ュ簱娆℃暟
Long inCount = warehouseHistoryMapper.selectCount(Wrappers.<WarehouseHistory>lambdaQuery()
.eq(WarehouseHistory::getState, 1)
@@ -208,7 +214,7 @@
.eq(WarehouseHistory::getState, 2)
.eq(WarehouseHistory::getInsSampleId, samId));
if (inCount > 0 && inCount > outCount) {
- //鍏ュ簱
+ continue;
} else {
throw new ErrorException("鎵�閫夌殑鏍峰搧搴撳瓨涓嶈冻,璇锋鏌ュ叆搴撳拰鍑哄簱璁板綍!");
}
@@ -636,51 +642,6 @@
result.setUpdateTime(LocalDateTime.now());
insProductResultMapper.updateById(result);
}
- /*濡傛灉鏄涓�娆￠�夋嫨璁惧淇℃伅,涓旇繕鏈夊叾浣欐牱鍝佷篃鏈夊悓涓�涓粡楠岄」鐩�,閭ｄ箞鎵�鏈夋牱鍝佺殑璇ラ」鐩兘鐢ㄨ繖涓澶囦俊鎭�*/
- /*//鍏堟煡璇㈡槸鍚﹁繕鏈夊叾浣欐牱鍝�
- Integer insSampleId = product.getInsSampleId();
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSampleMapper.selectById(insSampleId).getInsOrderId()));
- //濡傛灉鏈夊涓牱鍝佹垨鑰呬笉鏄噰闆嗙被鍨嬪氨鍚屼竴涓澶�
- if (insSamples.size() > 1 && !product.getInspectionItemType().equals("1")) {
- //瀛樺湪鍏朵綑鏍峰搧,鏌ヨ鏄惁鏈夊悓涓�绉嶆楠岄」鐩�
- for (InsSample sample : insSamples.stream().filter(insSample -> !insSample.getId().equals(insSampleId)).collect(Collectors.toList())) {
- InsProduct product1 = insProductMapper.selectOne(Wrappers.<InsProduct>lambdaQuery()
- .eq(InsProduct::getState, 1)
- .eq(InsProduct::getInsSampleId, sample.getId())
- .eq(InsProduct::getInspectionItem, product.getInspectionItem())
- .eq(InsProduct::getInspectionItemEn, product.getInspectionItemEn())
- .eq(InsProduct::getInspectionItemSubclass, product.getInspectionItemSubclass())
- .eq(InsProduct::getInspectionItemSubclassEn, product.getInspectionItemSubclassEn())
- .eq(InsProduct::getTemplateId, product.getTemplateId())
- .eq(InsProduct::getStandardMethodListId, product.getStandardMethodListId())
- .eq(InsProduct::getInsBushId, product.getInsBushId())
- .eq(InsProduct::getInsFibersId, product.getInsFibersId())
- .eq(InsProduct::getInsFiberId, product.getInsFiberId()));
- if (ObjectUtils.isNotEmpty(product1)) {
- //濡傛灉瀛樺湪椤圭洰,鏌ヨ鏄惁鏈夎〃
- InsProductResult productResult = insProductResultMapper.selectOne(Wrappers.<InsProductResult>lambdaQuery()
- .eq(InsProductResult::getInsProductId, product1.getId()));
- if (ObjectUtils.isEmpty(productResult)) {
- //娌℃湁琛ㄦ柊寤鸿〃
- productResult = new InsProductResult();
- productResult.setInsProductId(product1.getId());
- productResult.setEquipValue(result.getEquipValue());
- productResult.setEquipName(result.getEquipValue());
- productResult.setCreateUser(userId);
- productResult.setUpdateUser(userId);
- insProductResultMapper.insert(productResult);
- } else if (ObjectUtils.isEmpty(productResult.getEquipValue())) {
- //鏈夎〃鍒ゆ柇鏄惁鏈夎澶�
- productResult.setEquipValue(result.getEquipValue());
- productResult.setEquipName(result.getEquipValue());
- productResult.setUpdateUser(userId);
- productResult.setUpdateTime(LocalDateTime.now());
- insProductResultMapper.updateById(productResult);
- }
- }
- }
-
- }*/
insProduct.setUpdateUser(userId);
insProductMapper.updateById(insProduct);
insProductUserMapper.insert(new InsProductUser(null, userId, LocalDateTime.now(), insProduct.getId()));
@@ -980,7 +941,8 @@
insOrderState.setLaboratory(minElement);
insOrderState.setInsState(0);
insOrderStateMapper.insert(insOrderState);
- } else {
+ }
+ else {
//濡傛灉缁х画璇曢獙娌℃湁鍏朵粬绔欑偣鐨勬楠屼换鍔￠偅灏辩粨鏉熻瘯楠�
verifyPlan(orderId, laboratory, 2, tell);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java
index 8db04ee..9fbfadb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java
@@ -6,15 +6,30 @@
import com.yuanchu.mom.mapper.InsOrderStateMapper;
import org.springframework.stereotype.Service;
+import javax.management.remote.rmi._RMIConnection_Stub;
+import java.time.LocalDateTime;
+import java.util.List;
+
/**
-* @author admin
-* @description 閽堝琛ㄣ�恑ns_order_state銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2024-04-01 11:44:50
-*/
+ * @author admin
+ * @description 閽堝琛ㄣ�恑ns_order_state銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
+ * @createDate 2024-04-01 11:44:50
+ */
@Service
public class InsOrderStateServiceImpl extends ServiceImpl<InsOrderStateMapper, InsOrderState>
- implements InsOrderStateService{
+ implements InsOrderStateService {
+ //鎻掗槦鎿嶄綔
+ @Override
+ public int jumpTeam(InsOrderState insOrderState) {
+ if (insOrderState.getCurrent() == 1) {
+ //鍒ゆ柇鍒嗛〉鎯呭喌,濡傛灉鏄涓�椤靛氨鐩存帴鐢�
+ } else {
+ insOrderState.setSort(insOrderState.getSort() + insOrderState.getSize() * (insOrderState.getCurrent() - 1));
+ }
+ insOrderState.setSortTime(LocalDateTime.now());
+ return baseMapper.updateById(insOrderState);
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
index e4164be..2ed3016 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java
@@ -50,4 +50,6 @@
private Integer orderStateId;
+ private Integer sort;
+
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
index adc494b..af8aef8 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml
@@ -9,15 +9,17 @@
<result property="insOrderId" column="ins_order_id" jdbcType="INTEGER"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
<result property="insState" column="ins_state" jdbcType="INTEGER"/>
+ <result property="sort" column="sort" jdbcType="INTEGER"/>
<result property="createUser" column="create_user" jdbcType="INTEGER"/>
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateUser" column="update_user" jdbcType="INTEGER"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="sortTime" column="sort_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
id,ins_order_id,laboratory,
ins_state,create_user,create_time,
- update_user,update_time
+ update_user,update_time,sort,sort_time
</sql>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 1d869dd..f139200 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -27,7 +27,7 @@
<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
select * from(select * from(
SELECT
- a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id orderStateId,ios.create_time,ios.sort
+ a.*,ios.ins_state,ios.verify_tell,verify_user,ios.id orderStateId,ios.create_time,ios.sort,sort_time
FROM
(
SELECT
@@ -75,6 +75,7 @@
LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
ORDER BY
ios.sort,
+ sort_time desc,
a.type DESC,
ios.create_time
) b
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index 9de11ba..ed6f090 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -93,6 +93,15 @@
@ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
+ @PostMapping("/selectUserList2")
+ public Result selectUserList2(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectUserList(page, user));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃(鐢ㄤ簬鍏朵粬椤甸潰鑾峰彇鐢ㄦ埛鏁版嵁)")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
--
Gitblit v1.9.3