Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java

@@ -148,4 +148,17 @@
     * @return
     */
    List<CodeClassify>  selectAllParenClassifytByOid(@Param("oid")String oid,@Param("tenantId") String tenantId);

    /**
     * 主键查询当前节点及其子节点
     * @param oid 当前节点主键
     * @return 查询结果
     */
    List<CodeClassify> selectStartWithCurrentOid(String oid);

    /**
     * 批量更新分类状态
     * @param classifyList
     */
    void batchUpdateLcStatus(@Param("records") List<CodeClassify> classifyList);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java

@@ -359,20 +359,32 @@
    @Override
    public R updateLcStatus(String oid, String lcStatus){

        //查询修改前ts
        CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//主要是为了查询ts
        codeClassify.setLcStatus(lcStatus);
        codeClassify.setTs(new Date());
        codeClassify.setLastModifyTime(new Date());
        codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
        List<CodeClassify> classifyList = codeClassifyMapper.selectStartWithCurrentOid(oid);
        Date now = new Date();
        String userId = String.valueOf(AuthUtil.getUserId());
        classifyList = classifyList.stream().map(s -> {
            s.setLcStatus(lcStatus);
            s.setTs(now);
            s.setLastModifier(userId);
            s.setLastModifyTime(now);
            return s;
        }).collect(Collectors.toList());
//        //查询修改前ts
//        CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//主要是为了查询ts
//        codeClassify.setLcStatus(lcStatus);
//        codeClassify.setTs(new Date());
//        codeClassify.setLastModifyTime(new Date());
//        codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
        //启用、停用
//        int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
        int count = codeClassifyMapper.updateById(codeClassify);
//        int count = codeClassifyMapper.updateById(codeClassify);
        codeClassifyMapper.batchUpdateLcStatus(classifyList);
//        //处理数据集成逻辑,成功后执行集成第一步,分类数据特殊处理。
//        if(u!=0) {
//            codeDuckingServiceI.insertCache1(lcStatus,lcStatus,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, oid, codeClassifyDO_old.getTs());
//        }
        return R.data(SqlHelper.retBool(count));
//        return R.data(SqlHelper.retBool(count));
        return R.success("");
    }

    /**

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml

@@ -39,7 +39,9 @@
        <result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
        <result column="TENANT_ID" property="tenantId"/>
    </resultMap>

    <sql id="tableName">
        pl_code_classify
    </sql>
    <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
        select * from PL_CODE_CLASSIFY where is_deleted = 0
    </select>
@@ -487,4 +489,23 @@
          </if>
            connect by prior PARENTCODECLASSIFYOID = codeclassify0.oid
    </select>

    <select id="selectStartWithCurrentOid" resultMap="plCodeClassifyResultMap">
        select * from <include refid="tableName"/>
                          start with oid = #{oid}
        connect by prior oid = parentcodeclassifyoid;
    </select>

    <update id="batchUpdateLcStatus" parameterType="java.util.List">
        BEGIN
        <foreach collection="records" item="item" index="index" separator=";">
            update <include refid="tableName"/> set
            lcstatus = #{item.lcStatus},
            ts = #{item.ts},
            lastModifyTime = #{item.lastModifyTime},
            lastModifier = #{item.lastModifier}
            where oid = #{item.oid,jdbcType=VARCHAR}
        </foreach>
        ;END;
    </update>
</mapper>