Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

# Conflicts:
#	yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/AdminChangeConfigServiceImpl.java

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/AdminChangeConfigService.java

@@ -15,7 +15,7 @@ public interface AdminChangeConfigService {
      * @param changeConfigQueryReq 参数
      * @return
      */
-    AjaxResult queryChanges(ChangeConfigQueryReq changeConfigQueryReq);
+    AjaxResult queryChanges(Integer pageNum,Integer pageSize,ChangeConfigQueryReq changeConfigQueryReq);
 
     /**
      * 查询更改配置详情
@@ -45,4 +45,10 @@ public interface AdminChangeConfigService {
      * @return
      */
     AjaxResult deleteChange(Long id);
+
+    /**
+     * 查询出所哟一级二级类目
+     * @return
+     */
+    AjaxResult queryConfigType();
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/change/ChangeTypeService.java

 package com.netease.mail.yanxuan.change.biz.service.change;
-
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
-
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author WangJiaXiang
@@ -37,4 +36,12 @@ public interface ChangeTypeService {
 
     Boolean deleteChangeType(List<ChangeType> changeTypes);
 
+    /**
+     * 一级ID 二级ID 是否存在
+     */
+    /**
+     * 二级目录类型查询出所有一级二级
+     * @return
+     */
+    Map<ChangeType,List<ChangeType>> queryConfigType();
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/AdminChangeConfigServiceImpl.java

 package com.netease.mail.yanxuan.change.biz.service.impl;
 
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.netease.mail.yanxuan.change.biz.service.AdminChangeConfigService;
+import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
+import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
-
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.List;
 
 /**
  * @author WangJiaXiang
@@ -14,13 +20,19 @@ import org.springframework.stereotype.Service;
 @Service
 public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
 
+    @Autowired
+    public ChangeConfigMapper mapper;
+
+    @Autowired
+    private ChangeTypeService typeService;
+
     @Override
-    public AjaxResult queryChanges(ChangeConfigQueryReq changeConfigQueryReq) {
-        if (changeConfigQueryReq == null){
-            // return AjaxResult.with(ResponseCode.BAD_REQUEST);
-        }
-        //BeanUtils.copyProperties() 参数转换器
-        return null;
+    public AjaxResult queryChanges(Integer pageNum, Integer pageSize, ChangeConfigQueryReq req) {
+        //进行分页
+        PageHelper.startPage(pageNum,pageSize);
+        List<ChangeConfigPo> changeConfigPos = mapper.selectChangeConfigPo(req);
+        PageInfo<ChangeConfigPo> pageInfo = new PageInfo<>(changeConfigPos);
+        return AjaxResult.success(pageInfo);
     }
 
     @Override
@@ -56,4 +68,14 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         //变更类型表数据信息伪删
         return null;
     }
+
+    /**
+     * 二级目录类型查询出所有一级二级
+     *
+     * @return
+     */
+    @Override
+    public AjaxResult queryConfigType() {
+        return AjaxResult.success(typeService.queryConfigType());
+    }
 }

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeConfigServiceImpl.java

 package com.netease.mail.yanxuan.change.biz.service.impl.change;
-
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeExecConfigServiceImpl.java

@@ -6,14 +6,15 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeExecConfigServic
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-
 import java.util.List;
 
 /**
  * @author WangJiaXiang
  * @date 2022/11/11/011$
  */
+@Service
 public class ChangeExecConfigServiceImpl implements ChangeExecConfigService {
 
     @Autowired

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/change/ChangeTypeServiceImpl.java

@@ -6,16 +6,20 @@ import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeTypeMapper;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 import tk.mybatis.mapper.entity.Example;
-
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author WangJiaXiang
  * @date 2022/11/11/011$
  */
+@Service
 public class ChangeTypeServiceImpl implements ChangeTypeService {
 
     @Autowired
@@ -69,6 +73,33 @@ public class ChangeTypeServiceImpl implements ChangeTypeService {
         return true;
     }
 
+    /**
+     * 二级目录类型查询出所有一级二级
+     *
+     * @return
+     */
+    @Override
+    public Map<ChangeType, List<ChangeType>> queryConfigType() {
+        //获取数据,创建目录集合,遍历分组
+        List<ChangeType> changeTypes = mapper.queryArrayChangeType();
+        Map<ChangeType,List<ChangeType>> typeMap = new HashMap<ChangeType,List<ChangeType>>();
+        for (ChangeType changeType : changeTypes) {
+            if (changeType.getParentId() == 0){
+                //如果是一级 插入MAP 并创建List列表
+                typeMap.put(changeType,new ArrayList<ChangeType>());
+            }else{
+                //二级 就找到父类的一级 并add进入一级的列表
+                for(ChangeType tpye : typeMap.keySet()){
+                    if (tpye.getId() == changeType.getParentId()){
+                        typeMap.get(tpye).add(changeType);
+                    }
+                }
+            }
+        }
+        //MAP 去重如果父类下边包裹的List数量为0的时候就自动剔除
+        typeMap.entrySet().removeIf(next -> next.getValue().size() == 0);
+        return typeMap;
+    }
 
     /**
      * 判断变更类型是否重复(只判断未伪善出的)

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/entity/ChangeConfig.java

@@ -41,12 +41,12 @@ public class ChangeConfig {
     /**
      * 一级变更类型id
      */
-    private Integer parentChangeClassId;
+    private Long parentChangeClassId;
 
     /**
      * 二级变更类型id
      */
-    private Integer sonChangeClassId;
+    private Long sonChangeClassId;
 
     /**
      * 变更等级
@@ -59,6 +59,11 @@ public class ChangeConfig {
     private String changeDepartment;
 
     /**
+     * 变更执行部门
+     */
+    private String participateChangeExecDepartment;
+
+    /**
      * 变更负责人类型
      */
     private Integer changeCommanderType;

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeConfigMapper.java

@@ -6,12 +6,17 @@
  */
 package com.netease.mail.yanxuan.change.dal.mapper;
 
+import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import java.util.List;
 
 /**
  * @Author zcwang
@@ -26,4 +31,9 @@ public interface ChangeConfigMapper extends tk.mybatis.mapper.common.Mapper<Chan
     @Delete("delete from TB_YX_CHANGE_CONFIG where id = #{id}")
     void deleteById(@Param("id") Long id);
 
+    List<ChangeConfigPo> selectChangeConfigPo(ChangeConfigQueryReq req);
+
+    List<ChangeType> queryByparentChangeClassId();
+    //暂时弃用
+    //ChangeExecConfigPo queryChangeDepartment(@Param("id")Long id);
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeExecConfigMapper.java

@@ -6,6 +6,7 @@
  */
 package com.netease.mail.yanxuan.change.dal.mapper;
 
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -28,5 +29,8 @@ public interface ChangeExecConfigMapper extends tk.mybatis.mapper.common.Mapper<
     @Select("select * from TB_YX_CHANGE_EXEC_CONFIG where change_template_id = #{changeTemplateId}")
     List<ChangeExecConfig> queryChangeExecConfig(@Param("changeTemplateId")Long changeTemplateId);
 
-
+    @Select("select COUNT(change_template_id) as coreDepartment, change_exec_department " +
+            "from TB_YX_CHANGE_EXEC_CONFIG where change_template_id = #{id} " +
+            "group by change_exec_department order by coreDepartment DESC LIMIT 1;")
+    ChangeExecConfigPo queryChangeDepartment(@Param("id")Long id);
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeTypeMapper.java

@@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import java.util.List;
 
 /**
  * @Author zcwang
@@ -19,7 +20,11 @@ import org.apache.ibatis.annotations.Select;
 @Mapper
 public interface ChangeTypeMapper extends tk.mybatis.mapper.common.Mapper<ChangeType> {
 
-    @Select("select id from TB_YX_CHANGE_TYPE where type_name = #{typeName} and delete = 0")
+    @Select("select id from TB_YX_CHANGE_TYPE where type_name = #{typeName} and `delete`  = 0")
     Integer queryTypeName(@Param("typeName") String typeName);
 
+
+    @Select("select * from tb_yx_change_type where `delete`  = 0 ")
+    List<ChangeType> queryArrayChangeType();
+
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/po/ChangeConfigPo.java

 package com.netease.mail.yanxuan.change.dal.meta.model.po;
 
+import com.netease.mail.yanxuan.change.dal.entity.ChangeType;
 import lombok.Data;
+import java.util.List;
 
 /**
  * @author WangJiaXiang
@@ -18,21 +20,11 @@ public class ChangeConfigPo {
     private Integer changeSubject;
 
     /**
-     * 一级变更类型名称 *
-     */
-    private String parentChangeClassName;
-
-    /**
      * 一级变更类型id
      */
     private Integer parentChangeClassId;
 
     /**
-     * 二级变更类型名称 *
-     */
-    private String sonChangeClassName;
-
-    /**
      * 二级变更类型id
      */
     private Integer sonChangeClassId;
@@ -43,11 +35,6 @@ public class ChangeConfigPo {
     private Integer changeLevel;
 
     /**
-     * 变更负责部门名
-     */
-    private String changeDepartment;
-
-    /**
      * 变更负责人类型
      */
     private Integer changeCommanderType;
@@ -72,5 +59,24 @@ public class ChangeConfigPo {
      */
     private Long updateTime;
 
+    /**
+     * 变更负责部门名
+     */
+    private String changeDepartment;
+
+    /**
+     * 变更执行部门
+     */
+    private String participateChangeExecDepartment;
+
+    /**
+     *  变更执行部门 是否还有必要存在？？？
+     */
+    ChangeExecConfigPo changeExecConfigPo;
+
+    /**
+     * 关联的一级二级类目
+     */
+    List<ChangeType> changeTypes;
 
 }

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/po/ChangeExecConfigPo.java

+package com.netease.mail.yanxuan.change.dal.meta.model.po;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/15/015$
+ */
+@Data
+public class ChangeExecConfigPo {
+
+    /**
+     * 主要负责修改部门出现次数
+     */
+    private Integer coreDepartment;
+
+
+    /**
+     * 变更负责部门名
+     */
+    private String changeExecDepartment;
+
+
+}

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeConfigQueryReq.java

@@ -10,13 +10,9 @@ import lombok.Data;
 public class ChangeConfigQueryReq {
 
     /**
-     * 页码
+     * 变更负责部门名
      */
-    private Integer page = 1;
-    /**
-     * 页大小
-     */
-    private Integer pageSize = 10;
+    private String changeDepartment;
 
     /**
      * 变更执行部门名
@@ -29,9 +25,15 @@ public class ChangeConfigQueryReq {
     private String changeType;
 
     /**
-     * 变更等级
+     * 一级变更ID
      */
-    private String changeLevel;
+    private Integer parentChangeClassId;
+    /**
+     * 二级变更ID
+     */
+    private Integer sonChangeClassId;
+
+    private Integer changeLevel;
 
     /**
      * 创建时间

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeConfigMapper.xml

 <?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.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper">
-  <resultMap id="BaseResultMap" type="com.netease.mail.yanxuan.change.dal.entity.ChangeConfig">
+
+  <resultMap id="BaseResultPoMap" type="com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="change_subject" jdbcType="INTEGER" property="changeSubject" />
     <result column="parent_change_class_id" jdbcType="INTEGER" property="parentChangeClassId" />
     <result column="son_change_class_id" jdbcType="INTEGER" property="sonChangeClassId" />
     <result column="change_level" jdbcType="INTEGER" property="changeLevel" />
     <result column="change_department" jdbcType="VARCHAR" property="changeDepartment" />
+    <result column="participate_change_exec_department" jdbcType="VARCHAR" property="participateChangeExecDepartment" />
     <result column="change_commander_type" jdbcType="INTEGER" property="changeCommanderType" />
     <result column="change_commander" jdbcType="VARCHAR" property="changeCommander" />
     <result column="need_file" jdbcType="INTEGER" property="needFile" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
+    <!--查询出现次数最多的部门？   由于业务逻辑转变 不知道是否需要咱是注销-->
+<!--    <association property="changeExecConfigPo" column="id" javaType="com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo"-->
+<!--                 select="queryChangeDepartment">-->
+<!--      <result column="coreDepartment" javaType="INTEGER" property="coreDepartment" />-->
+<!--      <result column="changeExecDepartment" javaType="VARCHAR" property="changeExecDepartment" />-->
+<!--    </association>-->
+    <!--查询变更类型-->
+    <collection property="changeTypes" column="{parentId=parent_change_class_id,sonId=son_change_class_id}" javaType="list" ofType="com.netease.mail.yanxuan.change.dal.entity.ChangeType"
+                select="queryByparentChangeClassId" >
+    </collection>
   </resultMap>
   <sql id="Base_Column_List">
-    id, change_subject, parent_change_class_id, son_change_class_id, change_level, change_department, 
+    id, change_subject, parent_change_class_id, son_change_class_id, change_level,participate_change_exec_department, change_department,
     change_commander_type, change_commander, need_file, create_time, update_time
   </sql>
 
+  <select id="selectChangeConfigPo" resultMap="BaseResultPoMap" parameterType="com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq">
+    select <include refid="Base_Column_List" />
+    from tb_yx_change_config
+    <where>
+      <if test="parentChangeClassId != null ">
+        parent_change_class_id = #{parentChangeClassId} and
+      </if>
+      <if test="sonChangeClassId != null ">
+        son_change_class_id = #{sonChangeClassId} and
+      </if>
+      <if test="changeLevel != null and changeLevel != ''">
+        change_level = #{changeLevel} and
+      </if>
+      <if test="changeDepartment != null and changeDepartment != ''">
+        change_department = #{changeDepartment} and
+      </if>
+      <if test="createTime != null">
+        create_time <![CDATA[ > ]]> #{createTime} and
+      </if>
+      <if test="updateTime != null">
+        update_time <![CDATA[ < ]]> #{updateTime} and
+      </if>
+      <if test="changeExecDepartment != null and changeExecDepartment != ''">
+        participate_change_exec_department like "%" #{changeExecDepartment} "%"
+      </if>
+    </where>
+  </select>
+
+  <select id="queryByparentChangeClassId" resultType="com.netease.mail.yanxuan.change.dal.entity.ChangeType">
+    select * from tb_yx_change_type where id = #{parentId} or id = #{sonId} and `delete`  = 0
+  </select>
+  <!--此查询暂时不需要。。。-->
+<!--  <select id="queryChangeDepartment" resultType="com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo" parameterType="java.lang.Long">-->
+<!--    select-->
+<!--      COUNT(change_template_id) as coreDepartment, change_exec_department as changeExecDepartment-->
+<!--    from tb_yx_change_exec_config-->
+<!--    where change_template_id = #{id}-->
+<!--    GROUP BY change_exec_department-->
+<!--    ORDER BY coreDepartment DESC LIMIT 1;-->
+<!--  </select>-->
+
 </mapper>

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -2,9 +2,6 @@ package com.netease.mail.yanxuan.change.web.controller;
 
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.biz.service.AdminChangeConfigService;
-import com.netease.mail.yanxuan.change.dal.mapper.ChangeConfigMapper;
-import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecConfigMapper;
-import com.netease.mail.yanxuan.change.dal.mapper.ChangeTypeMapper;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,23 +16,27 @@ import org.springframework.web.bind.annotation.*;
 public class ChangeConfigController {
 
     @Autowired
-    private ChangeConfigMapper changeConfigMapper;
-
-    @Autowired
-    private ChangeExecConfigMapper changeExecConfigMapper;
-
-    @Autowired
-    private ChangeTypeMapper changeTypeMapper;
-
-
-    @Autowired
     private AdminChangeConfigService service;
 
 
-    @GetMapping("/list")
+    @PostMapping("/list")
     public AjaxResult queryChanges(
-            @RequestBody ChangeConfigQueryReq changeConfigQueryReq){
-        return service.queryChanges(changeConfigQueryReq);
+            @RequestParam(name = "pageNum",defaultValue = "1") Integer pageNum,
+            @RequestParam(name = "pageSize",defaultValue = "10")Integer pageSize,
+            @RequestParam(name = "changeDepartment",required = false) String changeDepartment,
+            @RequestParam(name = "changeExecDepartment",required = false) String changeExecDepartment,
+            @RequestParam(name = "parentChangeClassId",required = false)Integer parentChangeClassId,
+            @RequestParam(name = "sonChangeClassId",required = false)Integer sonChangeClassId,
+            @RequestParam(name = "createTime",required = false)Long createTime,
+            @RequestParam(name = "updateTime",required = false)Long updateTime){
+        ChangeConfigQueryReq req = new ChangeConfigQueryReq();
+        req.setChangeDepartment(changeDepartment);
+        req.setChangeExecDepartment(changeExecDepartment);
+        req.setParentChangeClassId(parentChangeClassId);
+        req.setSonChangeClassId(sonChangeClassId);
+        req.setCreateTime(createTime);
+        req.setUpdateTime(updateTime);
+        return service.queryChanges(pageNum,pageSize,req);
     }
 
     @GetMapping("/detail")
@@ -67,9 +68,10 @@ public class ChangeConfigController {
         return service.deleteChange(id);
     }
 
-
-
-
+    @GetMapping("/query/config/type")
+    public AjaxResult queryConfigType(){
+        return service.queryConfigType();
+    }