检验任务负责人展示修改

zss

2024-08-04 87794ed4e7b7cf7b13f7deef5da3e3ff03255d81

检验任务负责人展示修改

 cnas-server/src/main/java/com/yuanchu/mom/service/impl/DeviceServiceImpl.java

@@ -980,7 +980,6 @@
    public Result<?> determineWhetherToCollectData(String managementNumber, HttpServletRequest request) {
        String ip = DataAcquisition.getIp(request);
        Device device = baseMapper.selectOne(Wrappers.<Device>lambdaQuery()
                .eq(Device::getManagementNumber, managementNumber)
                .eq(Device::getIp, ip));
        if (ObjectUtils.isEmpty(device)) {
            return Result.success(false);

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

@@ -25,7 +25,7 @@
*/
public interface InsSampleMapper extends BaseMapper<InsSample> {

    IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);
    IPage<InsOrderPlanVO> findInsSampleAndOrder(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userName") String userName, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);

    IPage<InsOrderPlanTaskSwitchVo> inspectionOrderDetailsTaskSwitching(Page page, @Param("ew") QueryWrapper<InsOrderPlanDTO> ew, @Param("userId") Integer userId, @Param("sonLaboratory") String sonLaboratory, @Param("laboratory") String laboratory);


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

@@ -39,7 +39,7 @@
    /**
     * 1：确认 0：未确认
     */

    //1是复核人 0是检验人
    private Integer state;

    @TableField(fill = FieldFill.INSERT)

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

@@ -154,13 +154,15 @@
                laboratory = departLims;
            }
        }
        String userName = null;
        Integer userId = null;
        if (ObjectUtil.isNotEmpty(insOrderPlanDTO.getUserId())) {
            userId = map1.get("userId");
            insOrderPlanDTO.setUserId(userId.longValue());
            userName=userMapper.selectById(map1.get("userId")).getName();
            insOrderPlanDTO.setUserId(null);
        }
        String sonLaboratory = insOrderPlanDTO.getSonLaboratory();//试验室
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userId, sonLaboratory, laboratory);
        IPage<InsOrderPlanVO> insOrderPage = insSampleMapper.findInsSampleAndOrder(page, QueryWrappers.queryWrappers(insOrderPlanDTO), userName, sonLaboratory, laboratory);
        map.put("body", insOrderPage);
        return map;
    }
@@ -201,7 +203,7 @@
        }
        Map<String, Integer> map1 = getLook.selectPowerByMethodAndUserId(null);
        Integer userId = map1.get("userId");
        InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 1, entity.getSonLaboratory());
        InsSampleUser insSampleUser = new InsSampleUser(entity.getInsSampleId().intValue(), userId, 0, entity.getSonLaboratory());
        return insSampleUserMapper.insert(insSampleUser) > 0;
    }

@@ -3489,7 +3491,11 @@
                .in(InsProduct::getInsSampleId, ids)
                .eq(InsProduct::getSonLaboratory, laboratory)
                .eq(InsProduct::getState, 1)
                .isNull(InsProduct::getInsResult)
                .and(wrapper -> wrapper
                        .isNull(InsProduct::getInsResult)
                        .or()
                        .eq(InsProduct::getInsResult, 2)
                )
                .isNull(InsProduct::getInsFiberId)
                .isNull(InsProduct::getInsFibersId));
        insProducts.addAll(insProductMapper.selectFiberInsProduct(ids, laboratory));
@@ -3556,7 +3562,7 @@
        InsSampleUser insSampleUser = new InsSampleUser();
        insSampleUser.setUserId(verifyUser);
        insSampleUser.setInsSampleId(orderId);
        insSampleUser.setState(0);
        insSampleUser.setState(1);
        insSampleUser.setSonLaboratory(laboratory);
        insSampleUserMapper.insert(insSampleUser);
        /*校验一下result表*/

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

@@ -332,7 +332,7 @@
                                throw new ErrorException("温度循环的要求描述格式异常,请参照温度范围：20℃，-40℃，65℃；保温时间：12h； 循环次数：2次； 光纤（1310nm，1550nm）附加衰减不大于0.03dB/km");
                            }
                            //拼接
                            String s=null;
                            String s="";
                            for (int i = 0; i < nm.length; i++) {
                                 s+= "20℃(常温)," + nm[i] + ",null;";
                                for (int j = 0; j < message.length; j++) {

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

@@ -199,20 +199,6 @@
        }}, finalUrl);
        wordToPdf(finalUrl, sealUrl);

       /* String replace = finalUrl.replace(".docx", ".pdf");
        CompletableFuture.supplyAsync(() -> {
            try {
                stamperCheckMarkPDF(replace,replace,sealUrl);
                return null;
            } catch (Exception e) {
                throw new ErrorException("骑缝章插入失败");
            }
        }).thenAccept(res -> {
        }).exceptionally(e -> {
            e.printStackTrace();
            return null;
        });*/

        InsOrder insOrder = new InsOrder();
        insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
        insOrder.setState(4);

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

@@ -22,8 +22,10 @@
    @ValueTableShow(value = 5,name = "状态")
    private String insState;

    @ValueTableShow(value = 5,name = "负责人")
    @ValueTableShow(value = 5,name = "检验人")
    private String userName;
    @ValueTableShow(value = 5,name = "复核人")
    private String checkName;

    private Integer userId;


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

@@ -25,7 +25,7 @@
    </resultMap>

    <select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
        select * from(select * from(
        <!--select * from(select * from(
        SELECT
        a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,verify_user
        FROM
@@ -83,6 +83,66 @@
        a.type DESC,
        a.id
        ) b
        where ins_state is not null-->

        select * from(select * from(
        SELECT
        a.*,ios.ins_state,ios.verify_tell,verify_user
        FROM
        (
        SELECT
        io.id,
        io.entrust_code,
        io.type,
        io.appointed,
        io.send_time,
        group_concat(distinct isa.sample,' ') sample,
        userName,
        checkName,
        ip.son_laboratory,
        io.ins_time,
        io.laboratory
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id

        LEFT JOIN (
        SELECT ins_sample_id,GROUP_CONCAT( DISTINCT uu.name SEPARATOR ',') AS userName
        FROM ins_sample_user u LEFT JOIN  user uu ON u.user_id = uu.id
        WHERE son_laboratory=#{sonLaboratory}
        and u.state=0
        GROUP BY ins_sample_id
        ORDER BY ins_sample_id
        ) isu ON isu.ins_sample_id = io.id
        LEFT JOIN (
        SELECT ins_sample_id,uu.name checkName
        FROM ins_sample_user u LEFT JOIN  user uu ON u.user_id = uu.id
        WHERE son_laboratory=#{sonLaboratory}
        and u.state=1
        GROUP BY ins_sample_id
        ORDER BY ins_sample_id
        )isu2 ON isu2.ins_sample_id = io.id

        LEFT JOIN ins_product ip ON ip.ins_sample_id = isa.id
        WHERE  io.state = 1  and send_time is not null
        <if test="userName !=null and userName!=''">
         and    ( (userName like CONCAT ('%', #{userName},'%') )
             or (checkName like CONCAT ('%', #{userName},'%') ) )
        </if>
        and ip.son_laboratory=#{sonLaboratory}
        GROUP BY
        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

        ORDER BY
        a.type DESC,
        a.id
        ) b
        where ins_state is not null
        <if test="laboratory!=null and laboratory!=''">
            and laboratory=#{laboratory}

 inspect-server/src/main/resources/static/report-template.docx

Binary files differ