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)); } } 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; } 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 针对表【ins_order_state】的数据库操作Service @@ -10,4 +12,5 @@ */ public interface InsOrderStateService extends IService<InsOrderState> { int jumpTeam(InsOrderState insOrderState); } 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); } 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 针对表【ins_order_state】的数据库操作Service实现 * @createDate 2024-04-01 11:44:50 */ * @author admin * @description 针对表【ins_order_state】的数据库操作Service实现 * @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); } }
@@ -50,4 +50,6 @@ private Integer orderStateId; private Integer sort; } 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> 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 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);
