检验任务查询回调

zhuo

2025-02-27 e7652ccba51bca69f1a8da50b959b694544267f8

检验任务查询回调

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java

@@ -6,12 +6,12 @@
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.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.GZipUtil;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.mapper.StandardTemplateMapper;
import com.ruoyi.basic.pojo.StandardTemplate;
import com.ruoyi.basic.service.StandardTemplateService;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.GZipUtil;
import com.ruoyi.common.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;


 cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageDocumentControlledController.java

@@ -69,7 +69,7 @@

    @ApiOperation(value = "审核文件受控")
    @PostMapping("/checkManageDocumentControlled")
    public Result checkManageDocumentControlled(@RequestBody ManageDocumentControlled manageDocumentControlled){
    public Result checkManageDocumentControlled(ManageDocumentControlled manageDocumentControlled){
        return Result.success(manageDocumentControlledService.checkManageDocumentControlled(manageDocumentControlled));
    }


 cnas-personnel/src/main/resources/mapper/PersonTrainingDetailedMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
<?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.ruoyi.personnel.mapper.PersonTrainingDetailedMapper">

    <select id="queryTheAnnualPlanDetailsTable" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
        SELECT cptd.*,
        u1.name training_lecturer_name,
        dl.name holding_department_name, !isnull(cptr.training_record_id) whether_claim
        FROM cnas_person_training_detailed cptd
        left join user u1 on cptd.training_lecturer_id = u1.id
        left join department_lims dl on dl.id = cptd.holding_department
        left join cnas_person_training_record cptr on cptr.user_id = #{loginUserId} and cptr.course_id = cptd.id
        <where>
            <if test="id != null">
                and cptd.plan_id = #{id}
            </if>
            <if test="userId != null">
                and u1.id = #{userId}
            </if>
            <if test="trainingLecturerName != null and trainingLecturerName != ''">
                and u1.name like concat('%', #{trainingLecturerName}, '%')
            </if>
            <if test="trainingDate != null and trainingDate != ''">
                and date_format(cptd.training_date,'%Y-%m-%d') = #{trainingDate}
            </if>
        </where>
    </select>

    <!-- æ ¹æ®ä¸»è¡¨id查询详情 -->
    <select id="selectTrainingList" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
        SELECT cptd.*,
               u1.name training_lecturer_name
        FROM cnas_person_training_detailed cptd
                 left join user u1 on cptd.training_lecturer_id = u1.id
        where cptd.plan_id = #{trainingId}
    </select>

    <!-- æŸ¥è¯¢è¯¦ç»† -->
    <select id="selectTrainingDetail" resultType="com.ruoyi.personnel.dto.PersonTrainingDetailedDto">
        SELECT cptd.*,
               u1.name training_lecturer_name
        FROM cnas_person_training_detailed cptd
                 left join user u1 on cptd.training_lecturer_id = u1.id
        where cptd.id = #{id}
    </select>

    <!-- æŸ¥è¯¢ä»Šå¹´äººå‘˜åŸ¹è®­ä¿¡æ¯ -->
    <select id="getThisYearTrainingDetailed" resultType="com.ruoyi.personnel.pojo.PersonTrainingDetailed">
        select cptd.id,
               cptd.training_objectives
        from cnas_person_training_detailed cptd
        where training_date like concat('%', YEAR(NOW()), '%')
    </select>
</mapper>

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

@@ -599,19 +599,19 @@
    private void getTemplateThing(InsOrder order, List<InsProduct> insProducts) {
        Set<Integer> set = new HashSet<>();
        // æ£€éªŒé¡¹åˆ†ç±»+检验项+检验子项的拼接
        List<String> itemNameList = insProducts.stream().map(insProduct -> {
            String itemName = "";
            if (StringUtils.isNotBlank(insProduct.getInspectionItemClass())) {
                itemName += insProduct.getInspectionItemClass().trim();
            }
            if (StringUtils.isNotBlank(insProduct.getInspectionItem())) {
                itemName += insProduct.getInspectionItem().trim();
            }
            if (StringUtils.isNotBlank(insProduct.getInspectionItemSubclass())) {
                itemName += insProduct.getInspectionItemSubclass().trim();
            }
            return itemName;
        }).collect(Collectors.toList());
//        List<String> itemNameList = insProducts.stream().map(insProduct -> {
//            String itemName = "";
//            if (StringUtils.isNotBlank(insProduct.getInspectionItemClass())) {
//                itemName += insProduct.getInspectionItemClass().trim();
//            }
//            if (StringUtils.isNotBlank(insProduct.getInspectionItem())) {
//                itemName += insProduct.getInspectionItem().trim();
//            }
//            if (StringUtils.isNotBlank(insProduct.getInspectionItemSubclass())) {
//                itemName += insProduct.getInspectionItemSubclass().trim();
//            }
//            return itemName;
//        }).collect(Collectors.toList());
        // æŸ¥è¯¢è®¢å•çŠ¶æ€åˆ¤æ–­æ˜¯å¦æ˜¯æŸ¥åŽ†å²æ¨¡æ¿
        if (order.getIsFirstSubmit() != null && order.getIsFirstSubmit().equals(1)) {
            InsOrderState insOrderState = insOrderStateMapper.selectOne(Wrappers.<InsOrderState>lambdaQuery()
@@ -632,11 +632,8 @@
                        thing = one.getThing();
                        if (StrUtil.isNotEmpty(thing)) {
                            thing = GZipUtil.uncompress(thing);
                            JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
                            // æ¸…除没有关联的检验项
                            eliminateItem(sheet, itemNameList);

                            JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
                            JSONObject sheet = JSON.parseObject(thing).getJSONArray("data").getJSONObject(0);
                            JSONObject config = sheet.getJSONObject("config");
                            List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
                            Map<String, Object> style = new HashMap<>();
                            style.put("rowlen", config.get("rowlen"));
@@ -659,10 +656,8 @@
                thing = standardTemplateService.getStandTempThingById(product.getTemplateId());
            }
            if (StrUtil.isNotEmpty(thing)) {
                JSONObject sheet = JSON.parseObject(JSON.toJSONString(JSON.parseArray(JSON.toJSONString(JSON.parseObject(thing).get("data"))).get(0)));
                // æ¸…除没有关联的检验项
                eliminateItem(sheet, itemNameList);
                JSONObject config = JSON.parseObject(JSON.toJSONString(sheet.get("config")));
                JSONObject sheet = JSON.parseObject(thing).getJSONArray("data").getJSONObject(0);
                JSONObject config = sheet.getJSONObject("config");
                List<JSONObject> cellData = JSON.parseArray(JSON.toJSONString(sheet.get("celldata")), JSONObject.class);
                Map<String, Object> style = new HashMap<>();
                style.put("rowlen", config.get("rowlen"));
@@ -675,7 +670,7 @@
    }

    /**
     * æ¸…除没有使用的检验项
     * todo: æ¸…除没有使用的检验项
     * @param sheet
     * @param itemNameList
     */