提交代码

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyDTO.java

@@ -72,7 +72,7 @@
    /**
     * 是否参与校验，0:不参与;1:参与
     */
    private String isParticipateCheck;
    private Integer isParticipateCheck;

    public boolean getAblechildren() {
        return ablechildren;
@@ -212,6 +212,14 @@
        this.codeResembleRuleOidName = codeResembleRuleOidName;
    }

    public Integer getIsParticipateCheck() {
        return isParticipateCheck;
    }

    public void setIsParticipateCheck(Integer isParticipateCheck) {
        this.isParticipateCheck = isParticipateCheck;
    }

    @Override
    public String toString() {
        return "CodeClassifyDTO{" +

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeClassify.java

@@ -91,7 +91,7 @@
    /**
     * 是否参与校验，0:不参与;1:参与
     */
    private String isParticipateCheck;
    private Integer isParticipateCheck;

    /**
     * 相似项查询规则名称

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyVO.java

@@ -65,7 +65,7 @@
    /**
     * 是否参与校验，0:不参与;1:参与
     */
    private String isParticipateCheck;
    private Integer isParticipateCheck;

    /**
     * 层级的路径

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java

@@ -60,14 +60,9 @@
                    tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
                    // TODO:业务数据总数统计暂时没完善
                    String total = (String) VciBaseUtil.getValueFromField("total", doObject);
                    String isParticipateCheck = (String) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
                    Integer isParticipateCheck = (Integer) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
                    if(Func.isNotEmpty(total)){
                        tree.setCount("【"+total+"】");
                    }
                    if(Func.isNotEmpty(isParticipateCheck)){
                        tree.setIsParticipateCheck(isParticipateCheck);
                    }else {
                        tree.setIsParticipateCheck("1");
                    }
                    if (f != null) {
                        tree.setText((String)f.apply(doObject));

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java

@@ -25,10 +25,6 @@
    private String parentId;
    private String parentName;
    private String parentBtmName;
    /**
     * 是否参与校验，0:不参与;1:参与
     */
    private String isParticipateCheck;
    private boolean expanded = false;
    private String href;
    private String index;
@@ -248,14 +244,6 @@
            }
        }

    }

    public void setIsParticipateCheck(String isParticipateCheck) {
        this.isParticipateCheck = isParticipateCheck;
    }

    public String getIsParticipateCheck() {
        return isParticipateCheck;
    }

    @Override

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -61,6 +62,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
@@ -179,6 +181,7 @@
     * @return 执行结果
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R editSave(CodeClassify codeClassifyEntity) {
        if(codeClassifyEntity == null || codeClassifyEntity.getOid() == null){
            return R.fail("传入数据不能为空！");
@@ -196,15 +199,28 @@
        codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
        codeClassifyEntity.setLastModifyTime(new Date());
        codeClassifyEntity.setTs(new Date());
        int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
        int updateEntity = codeClassifyMapper.updateById(codeClassifyEntity);
        // 如果不是叶子结点，则需要修改其下所有的子分类，是否参与关键属性校验的值
        String oid = codeClassifyEntity.getOid();
        List<CodeClassify> codeClassifies = codeClassifyMapper.selectStartWithCurrentOid(oid);
        int updateAttr = 0;
        // 不为空就需要该当前分类下所有子分类的isParticipateCheck
        if(!codeClassifies.isEmpty()){
            List<String> oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.toList());
            updateAttr = codeClassifyMapper.update(
                null,
                Wrappers.<CodeClassify>update()
                    .lambda().eq(CodeClassify::getOid, oids)
                    .set(CodeClassify::getIsParticipateCheck, codeClassifyEntity.getIsParticipateCheck())
            );
        }

//         //处理数据集成逻辑,成功后执行集成第一步,分类数据特殊处理。只有启用状态的分类才推送
//         if(FRAMEWORK_DATA_ENABLED.equals(codeClassifyDO.getLcStatus()));
//         {
//             codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_EDIT,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), codeClassifyDTO.getTs());
//         }
        return R.status(SqlHelper.retBool(insertNumber));
//        return BaseResult.success(codeClassifyDO2VO(codeClassifyDO));
        return R.status(SqlHelper.retBool(updateAttr) & SqlHelper.retBool(updateEntity));
    }

    /**