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

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

@@ -46,6 +46,9 @@ public interface AdminChangeConfigService {
      */
     AjaxResult deleteChange(ChangeConfigDeleteReq id);
 
-
+    /**
+     * 返回所有配置类型
+     * @return
+     */
     AjaxResult queryConfigType();
 }

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

 package com.netease.mail.yanxuan.change.biz.service.change;
 
 import com.netease.mail.yanxuan.change.dal.entity.ChangeConfig;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 
 /**
  * @author WangJiaXiang
@@ -13,6 +14,8 @@ public interface ChangeConfigService {
 
     ChangeConfig queryChangeConfig(Long id,Long sonChangeClassId);
 
+    ChangeConfigPo queryInfoPo(Long id);
+
     ChangeConfig queryChangeType(Long parentChangeClassId,Long sonChangeClassId);
 
     Boolean deleteChangeConfig(Long id);

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

@@ -2,6 +2,7 @@ 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;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +27,11 @@ public class ChangeConfigServiceImpl implements ChangeConfigService {
     }
 
     @Override
+    public ChangeConfigPo queryInfoPo(Long id) {
+        return mapper.queryInfoPo(id);
+    }
+
+    @Override
     public ChangeConfig queryChangeType(Long parentChangeClassId, Long sonChangeClassId) {
         if (parentChangeClassId == null || sonChangeClassId == null){
             return null;

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

@@ -28,6 +28,8 @@ public interface ChangeConfigMapper extends tk.mybatis.mapper.common.Mapper<Chan
 
     ChangeConfig queryInfo(@Param("id") Long id,@Param("sonChangeClassId") Long sonChangeClassId);
 
+    ChangeConfigPo queryInfoPo(@Param("id") Long id);
+
     @Delete("delete from TB_YX_QC_CHANGE_CONFIG where id = #{id}")
     void deleteById(@Param("id") Long id);
 

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

@@ -61,7 +61,7 @@
   </select>
 
   <select id="queryByparentChangeClassId" resultType="com.netease.mail.yanxuan.change.dal.entity.ChangeType">
-    select * from TB_YX_QC_CHANGE_TYPE where id = #{parentId} or id = #{sonId} and delete_type  = 0
+    select * from TB_YX_QC_CHANGE_TYPE where id = #{parentId} or id = #{sonId} and delete_type  = 0 order by parent_id
   </select>
 
   <select id="queryInfo" resultType="com.netease.mail.yanxuan.change.dal.entity.ChangeConfig">
@@ -76,6 +76,22 @@
       </if>
     </where>
   </select>
+
+
+  <select id="queryInfoPo" resultMap="BaseResultPoMap" >
+    select <include refid="Base_Column_List" />
+    from TB_YX_QC_CHANGE_CONFIG
+    <where>
+      1=1
+      <if test="id != null">
+        and id = #{id}
+      </if>
+    </where>
+  </select>
+
+
+
+
   <!--此查询暂时不需要。。。-->
 <!--  <select id="queryChangeDepartment" resultType="com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo" parameterType="java.lang.Long">-->
 <!--    select-->