参数查询补充 以及分页总页数BUG修改

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

@@ -22,7 +22,7 @@ public interface AdminChangeConfigService {
      * @param id  模板id
      * @return
      */
-    AjaxResult queryDetail(Long id);
+    AjaxResult queryDetail(Long id,Long sonChangeClassId);
 
     /**
      * 新增更改类型配置模板

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

@@ -11,6 +11,8 @@ public interface ChangeConfigService {
 
     ChangeConfig queryChangeConfig(Long id);
 
+    ChangeConfig queryChangeConfig(Long id,Long sonChangeClassId);
+
     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/AdminChangeConfigServiceImpl.java

@@ -59,6 +59,8 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
 
     private static final String CHANGE_CONFIG = "changeConfig:";
 
+    Logger logger = LoggerFactory.getLogger(AdminChangeConfigServiceImpl.class);
+
     @Override
     public AjaxResult queryChanges(Integer pageNum, Integer pageSize, ChangeConfigQueryReq req) {
         ChangeConfigArrayVO vo = new ChangeConfigArrayVO();
@@ -66,24 +68,25 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         PageHelper.startPage(pageNum,pageSize);
         List<ChangeConfigPo> changeConfigPos = mapper.selectChangeConfigPo(req);
         PageInfo<ChangeConfigPo> pageInfo = new PageInfo<>(changeConfigPos);
-        PageVO pageVO = buildPageVo(changeConfigPos.size(), pageSize, pageNum);
+        Long total = pageInfo.getTotal();
+        PageVO pageVO = buildPageVo(total.intValue(), pageSize, pageNum);
         vo.setChangeConfigs(pageInfo.getList());
         vo.setPageVo(pageVO);
         return AjaxResult.success(vo);
     }
 
     @Override
-    public AjaxResult queryDetail(Long id) {
-        if (id == null){
-            return AjaxResult.of(ResponseCodeEnum.PARAM_ERROR);
-        }
+    public AjaxResult queryDetail(Long id,Long sonChangeClassId) {
+        String changeConfigVO;
         //尝试从reids里面 获取 如果获取到了直接返回
-        String changeConfigVO = getValue().get(id.toString());
-        if (changeConfigVO != null){
+        if (id != null) {
+            changeConfigVO = getValue().get(id.toString());
+            if (changeConfigVO != null) {
                 return AjaxResult.success(JSONObject.parseObject(changeConfigVO, ChangeConfigVO.class));
             }
+        }
         //从数据库中取出数据
-        ChangeConfig changeConfig = changeConfigService.queryChangeConfig(id);
+        ChangeConfig changeConfig = changeConfigService.queryChangeConfig(id,sonChangeClassId);
         if (changeConfig == null){
             return AjaxResult.of(ResponseCodeEnum.NO_FOUND);
         }
@@ -91,7 +94,7 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         if (changeTypes == null || changeTypes.size() != 2){
             return AjaxResult.of(ResponseCodeEnum.NO_FOUND);
         }
-        List<ChangeExecConfig> changeExecConfigs = execConfigService.queryChangeExecConfig(id);
+        List<ChangeExecConfig> changeExecConfigs = execConfigService.queryChangeExecConfig(changeConfig.getId());
         if (changeExecConfigs == null || changeExecConfigs.size() == 0){
             return AjaxResult.of(ResponseCodeEnum.NO_FOUND);
         }
@@ -101,7 +104,7 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
         getValue().set(CHANGE_CONFIG+id,changeConfigVO,1, TimeUnit.DAYS);
         return AjaxResult.success(JSONObject.parseObject(changeConfigVO, ChangeConfigVO.class));
     }
-    Logger logger = LoggerFactory.getLogger(AdminChangeConfigServiceImpl.class);
+
     @Override
     @Transactional
     public AjaxResult createChange(ChangeConfigReq changeConfigReq) {

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

@@ -21,6 +21,11 @@ public class ChangeConfigServiceImpl implements ChangeConfigService {
     }
 
     @Override
+    public ChangeConfig queryChangeConfig(Long id, Long sonChangeClassId) {
+        return mapper.queryInfo(id, sonChangeClassId);
+    }
+
+    @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

@@ -26,6 +26,8 @@ public interface ChangeConfigMapper extends tk.mybatis.mapper.common.Mapper<Chan
     @Select("select * from TB_YX_QC_CHANGE_CONFIG where id = #{id}")
     ChangeConfig queryById(@Param("id") Long id);
 
+    ChangeConfig queryInfo(@Param("id") Long id,@Param("sonChangeClassId") Long sonChangeClassId);
+
     @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

@@ -63,6 +63,19 @@
   <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>
+
+  <select id="queryInfo" resultType="com.netease.mail.yanxuan.change.dal.entity.ChangeConfig">
+    select * from TB_YX_QC_CHANGE_CONFIG
+    <where>
+      1=1
+      <if test="id != null">
+        and id = #{id}
+      </if>
+      <if test="sonChangeClassId != null ">
+        and son_change_class_id = #{sonChangeClassId}
+      </if>
+    </where>
+  </select>
   <!--此查询暂时不需要。。。-->
 <!--  <select id="queryChangeDepartment" resultType="com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeExecConfigPo" parameterType="java.lang.Long">-->
 <!--    select-->

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

@@ -64,8 +64,9 @@ public class ChangeConfigController {
      */
     @GetMapping("/detail")
     public AjaxResult queryDetail(
-            @RequestParam(name = "id") Long id){
-        return service.queryDetail(id);
+            @RequestParam(name = "id",required = false) Long id,
+            @RequestParam(name = "sonChangeClassId",required = false) Long sonChangeClassId){
+        return service.queryDetail(id,sonChangeClassId);
     }
 
     /**