功能调整

罗媛媛

2024-04-01 edbb9450c78019e7cea4bfb0d0496782e90a4a43

功能调整

 README.md

@@ -1,4 +1,4 @@
# åŽç«¯ä¸­å¤©æµ·æ´‹
# åŽç«¯ä¸­å¤©æ£€æµ‹ä¸­å¿ƒ

#### ä»‹ç»
{**以下是 Gitee å¹³å°è¯´æ˜Žï¼Œæ‚¨å¯ä»¥æ›¿æ¢æ­¤ç®€ä»‹**

 inspect-server/src/main/java/com/yuanchu/mom/controller/InsOrderPlanController.java

@@ -5,6 +5,7 @@
import com.yuanchu.mom.service.InsOrderPlanService;
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +20,7 @@
 */
@RestController
@RequestMapping("/insOrderPlan")
@Api("/检验任务")
@AllArgsConstructor
public class InsOrderPlanController {

@@ -40,8 +42,19 @@

    @ApiOperation(value = "执行检验操作")
    @PostMapping("/doInsOrder")
    public Result<?> doInsOrder(Integer id) {
        return Result.success(insOrderPlanService.doInsOrder(id));
    public Result<?> doInsOrder(Integer id, String laboratory) {
        return Result.success(insOrderPlanService.doInsOrder(id, laboratory));
    }

    @ApiOperation(value = "任务交接")
    @PostMapping("/upPlanUser")
    public Result<?> upPlanUser(Integer userId, Integer orderId) {
        return Result.success(insOrderPlanService.upPlanUser(userId, orderId));
    }

    @ApiOperation(value = "复核检验任务")
    @PostMapping("/verifyPlan")
    public Result<?> verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
        return Result.success(insOrderPlanService.verifyPlan(orderId, laboratory, type, tell));
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderStateMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.yuanchu.mom.mapper;

import com.yuanchu.mom.pojo.InsOrderState;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
* @author admin
* @description é’ˆå¯¹è¡¨ã€ins_order_state】的数据库操作Mapper
* @createDate 2024-04-01 11:44:50
* @Entity com.yuanchu.mom.pojo.InsOrderState
*/
public interface InsOrderStateMapper extends BaseMapper<InsOrderState> {

}





 inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.yuanchu.mom.pojo;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 
 * @TableName ins_order_state
 */
@TableName(value ="ins_order_state")
@Data
public class InsOrderState implements Serializable {
    /**
     * 
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    /**
     * å¤–键：ins_order表id
     */
    @TableField(value = "ins_order_id")
    private Integer insOrderId;

    /**
     * å®žéªŒå®¤
     */
    @TableField(value = "laboratory")
    private String laboratory;

    /**
     * æ£€éªŒçŠ¶æ€(0：待检验1:检验中 2:已检验3：待复核4：复核未通过 5：复核通过)
     */
    @TableField(value = "ins_state")
    private Integer insState;

    @ApiModelProperty("检验时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime insTime;

    @TableField(fill = FieldFill.INSERT)
    private Integer createUser;

    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createTime;

    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Integer updateUser;

    @ApiModelProperty("修改时间")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @ApiModelProperty("复核人")
    private Integer verifyUser;

    @ApiModelProperty("复核理由")
    private String verifyTell;
}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderPlanService.java

@@ -15,5 +15,9 @@

    boolean claimInsOrderPlan(InsOrderPlanDTO entity);

    Map<String, Object> doInsOrder(Integer id);
    Map<String, Object> doInsOrder(Integer id, String laboratory);

    int upPlanUser(Integer userId, Integer orderId);

    int verifyPlan(Integer orderId, String laboratory, Integer type, String tell);
}

 inspect-server/src/main/java/com/yuanchu/mom/service/InsOrderStateService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.yuanchu.mom.service;

import com.yuanchu.mom.pojo.InsOrderState;
import com.baomidou.mybatisplus.extension.service.IService;

/**
* @author admin
* @description é’ˆå¯¹è¡¨ã€ins_order_state】的数据库操作Service
* @createDate 2024-04-01 11:44:50
*/
public interface InsOrderStateService extends IService<InsOrderState> {

}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.common.GetLook;
@@ -14,9 +15,11 @@
import com.yuanchu.mom.dto.InsOrderPlanDTO;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.mapper.InsOrderStateMapper;
import com.yuanchu.mom.mapper.InsSampleMapper;
import com.yuanchu.mom.mapper.InsSampleUserMapper;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.service.InsOrderPlanService;
@@ -49,6 +52,8 @@

    private StandardTemplateService standardTemplateService;

    private InsOrderStateMapper insOrderStateMapper;

    @Override
    public Map<String, Object> selectInsOrderPlanList(Page page, InsOrderPlanDTO insOrderPlanDTO) {
        Map<String, Object> map = new HashMap<>();
@@ -75,7 +80,7 @@
    }

    @Override
    public Map<String, Object> doInsOrder(Integer id) {
    public Map<String, Object> doInsOrder(Integer id, String laboratory) {
        InsOrder insOrder = new InsOrder();
        insOrder.setId(id);
        insOrder.setInsState(1);
@@ -83,6 +88,7 @@
        if(BeanUtil.isEmpty(order.getInsTime())){
            insOrder.setInsTime(LocalDateTime.now());
            insOrderMapper.updateById(insOrder);
            insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, id).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, 1));
        }
        Map<String, Object> map = insOrderService.getInsOrder(id);
        Set<Integer> set = new HashSet<>();
@@ -133,4 +139,19 @@
        map.put("sampleProduct", list);
        return map;
    }

    @Override
    public int upPlanUser(Integer userId, Integer orderId) {
        InsSampleUser insSampleUser = new InsSampleUser();
        insSampleUser.setUserId(userId);
        insSampleUser.setInsSampleId(orderId);
        insSampleUser.setState(0);
        return insSampleUserMapper.insert(insSampleUser);
    }

    @Override
    public int verifyPlan(Integer orderId, String laboratory, Integer type, String tell) {
        Integer num = (type==1?5:4);
        return insOrderStateMapper.update(null, Wrappers.<InsOrderState>lambdaUpdate().eq(InsOrderState::getInsOrderId, orderId).eq(InsOrderState::getLaboratory, laboratory).set(InsOrderState::getInsTime, LocalDateTime.now()).set(InsOrderState::getInsState, num).set(InsOrderState::getVerifyTell, tell));
    }
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java

@@ -14,10 +14,7 @@
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.dto.SampleProductDto;
import com.yuanchu.mom.mapper.*;
import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsProduct;
import com.yuanchu.mom.pojo.InsSample;
import com.yuanchu.mom.pojo.InsSampleUser;
import com.yuanchu.mom.pojo.*;
import com.yuanchu.mom.service.InsOrderService;
import com.yuanchu.mom.service.StandardTemplateService;
import com.yuanchu.mom.utils.GiveCode;
@@ -29,6 +26,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

/**
 * @author gaoaoy
@@ -52,6 +50,8 @@

    private InsSampleUserMapper insSampleUserMapper;

    private InsOrderStateMapper insOrderStateMapper;

    //获取检验下单数据
    @Override
    public Map<String, Object> selectInsOrderParameter(IPage<InsOrder> page, SampleOrderDto sampleOrderDto) {
@@ -71,6 +71,16 @@
        insOrder.setAppointed(LocalDate.parse(appointed));
        insOrder.setSendTime(LocalDateTime.now());
        insOrderMapper.updateById(insOrder);
        List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId));
        List<Integer> ids = insSamples.stream().map(a-> a.getId()).collect(Collectors.toList());
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery().in(InsProduct::getInsSampleId, ids).select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory));
        for (InsProduct insProduct : insProducts) {
            InsOrderState insOrderState = new InsOrderState();
            insOrderState.setInsOrderId(orderId);
            insOrderState.setLaboratory(insProduct.getSonLaboratory());
            insOrderState.setInsState(0);
            insOrderStateMapper.insert(insOrderState);
        }
        if(userId!=null){
            InsSampleUser insSampleUser = new InsSampleUser();
            insSampleUser.setState(0);

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderStateServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,22 @@
package com.yuanchu.mom.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.pojo.InsOrderState;
import com.yuanchu.mom.service.InsOrderStateService;
import com.yuanchu.mom.mapper.InsOrderStateMapper;
import org.springframework.stereotype.Service;

/**
* @author admin
* @description é’ˆå¯¹è¡¨ã€ins_order_state】的数据库操作Service实现
* @createDate 2024-04-01 11:44:50
*/
@Service
public class InsOrderStateServiceImpl extends ServiceImpl<InsOrderStateMapper, InsOrderState>
    implements InsOrderStateService{

}





 inspect-server/src/main/java/com/yuanchu/mom/vo/InsOrderPlanVO.java

@@ -31,6 +31,9 @@
    @ValueTableShow(value = 7,name = "下发时间")
    private String sendTime;

    @ValueTableShow(value = 8,name = "理由")
    private String verifyTell;

    private Integer userId;

    private String sonLaboratory;

 inspect-server/src/main/resources/mapper/InsOrderStateMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
<?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.mom.mapper.InsOrderStateMapper">

    <resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsOrderState">
            <id property="id" column="id" jdbcType="INTEGER"/>
            <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="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"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,ins_order_id,laboratory,
        ins_state,create_user,create_time,
        update_user,update_time
    </sql>
</mapper>

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -29,7 +29,7 @@
    <select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
        select * from(
        SELECT
        *
        a.*,ios.ins_state,ios.verify_tell
        FROM
        (
        SELECT
@@ -41,7 +41,6 @@
        io.sample_type,
        isu.user_id,
        ip.son_laboratory,
        io.ins_state,
        io.ins_result
        FROM
        ins_order io
@@ -56,6 +55,7 @@
        ip.son_laboratory,
        io.id
        ) a
        LEFT JOIN ins_order_state ios ON ios.ins_order_id = a.id AND ios.laboratory = a.son_laboratory
        where a.user_id = #{userId} OR a.user_id is NULL
        ORDER BY
        a.user_id DESC,