履职内容库定义代码优化

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/AppRuleController.java

@@ -5,9 +5,9 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.annotation.RequiresPermissions;
-import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 import io.swagger.annotations.ApiOperation;
@@ -34,8 +34,8 @@ public class AppRuleController  extends BaseController {
     @ApiOperation(value = "查询规范列表")
     @GetMapping("page")
     @RequiresPermissions("resumption:rule")
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        final TableDataInfo appRulePage = appRuleService.getAppRulePage(appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        final TableDataInfo appRulePage = appRuleService.getAppRulePage(query);
         return appRulePage;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppRule.java

@@ -28,15 +28,15 @@ public class AppRule extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    @ApiModelProperty(value = "规范类型id")
+    @ApiModelProperty(value = "履职内容库类型id")
     @TableField("type")
     private String type;
 
-    @ApiModelProperty(value = "规范名称")
+    @ApiModelProperty(value = "履职内容库名称")
     @TableField("name")
     private String name;
 
-    @ApiModelProperty(value = "受检机构类型")
+    @ApiModelProperty(value = "履职机构类型")
     @TableField("org_type")
     private String orgType;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/dto/appRule/AppRulePageDto.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.resumption.dto.appRule;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.xunmei.common.core.web.domain.PageDto;
+import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
+import io.swagger.annotations.ApiModelProperty;
+
+public class AppRulePageDto extends PageDto<AppRulePageVo> {
+    @ApiModelProperty(value = "履职内容库名称")
+    private String name;
+
+    @ApiModelProperty(value = "履职内容库类型id")
+    private String type;
+
+    @ApiModelProperty(value = "履职机构类型")
+    private String orgType;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "是否下穿查询")
+    private Boolean checkSub = false;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/mapper/AppRuleMapper.java

@@ -3,6 +3,7 @@ package com.xunmei.core.resumption.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.core.resumption.domain.AppRule;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.dto.appRuleItem.AppRulePointSelectPageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleGroupVo;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
@@ -26,7 +27,7 @@ import java.util.List;
 @Repository
 public interface AppRuleMapper extends BaseMapper<AppRule> {
 
-    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRule appRule);
+    Page<AppRulePageVo> selectPageByCondition(@Param("page") Page<AppRulePageVo> page, @Param("appRule") AppRulePageDto appRule);
 
     List<AppRuleGroupVo> getRuleGroupList();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/IAppRuleService.java

@@ -7,6 +7,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.vo.appRule.AppRuleInfoVo;
 import com.xunmei.core.resumption.vo.appRule.AppRulePageVo;
 
@@ -22,7 +23,7 @@ import java.util.List;
  */
 public interface IAppRuleService extends IService<AppRule> {
 
-    TableDataInfo getAppRulePage(AppRule appRule);
+    TableDataInfo getAppRulePage(AppRulePageDto query);
 
     List<AppRulePageVo> getAllAppRule();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppRuleServiceImpl.java

@@ -9,6 +9,7 @@ import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.resumption.domain.AppRule;
 import com.xunmei.core.resumption.dto.appRule.AppRuleListForOrgDto;
+import com.xunmei.core.resumption.dto.appRule.AppRulePageDto;
 import com.xunmei.core.resumption.mapper.AppRuleMapper;
 import com.xunmei.core.resumption.dto.appRule.AppRuleEditDto;
 import com.xunmei.core.resumption.service.IAppRuleService;
@@ -44,9 +45,9 @@ public class AppRuleServiceImpl extends ServiceImpl<AppRuleMapper, AppRule> impl
     RemoteOrgService remoteOrgService;
 
     @Override
-    public TableDataInfo getAppRulePage(AppRule appRule) {
-        Page<AppRulePageVo> page = appRule.<AppRulePageVo>getPage();
-        page = appRuleMapper.selectPageByCondition(page, appRule);
+    public TableDataInfo getAppRulePage(AppRulePageDto query) {
+        Page<AppRulePageVo> page = query.getPageDto();
+        page = appRuleMapper.selectPageByCondition(page, query);
 
         return TableDataInfo.success(page);
     }

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -38,6 +38,7 @@
         <if test="request.startTime!=null and request.endTime!=null">
             and a.status_update_time >= #{request.startTime} and  a.status_update_time&lt;=#{request.endTime}
         </if>
+        order by id desc
     </select>
 <!--    <select id="pageLog" resultType="com.xunmei.core.resumption.vo.protection.ProtectionLogPageVo">-->
 <!--        select a.id, a.name as name,a.status as status,a.status_update_time,a.status_updator_name-->