diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/TpHelper.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/TpHelper.java
index d8e5ab2f4..b5d080279 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/utils/TpHelper.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/TpHelper.java
@@ -28,7 +28,7 @@ public class TpHelper {
     }
 
     private static String generateCode() {
-        return LocalDateTime.now().format(dtf) + (int) (Math.random() * 900) + 100;
+        return LocalDateTime.now().format(dtf) + ((int) (Math.random() * 900) + 100);
     }
 
 
diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpRuleDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpRuleDAO.java
index b84d59fde..8c9c16cd0 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpRuleDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/tp/TpRuleDAO.java
@@ -58,7 +58,7 @@ public class TpRuleDAO {
         return tpRuleMapper.selectByPrimaryKey(id);
     }
 
-    public List<TpRuleDO> getList(TpRuleQueryRequest request) {
+    public List<TpRuleDO> getEffectiveList(TpRuleQueryRequest request) {
         Example example = new Example(TpRuleDO.class);
         Example.Criteria criteria = example.createCriteria();
         if (StringUtils.isNotBlank(request.getProblemClassification())) {
@@ -68,11 +68,15 @@ public class TpRuleDAO {
             criteria.andEqualTo("projectCategory", request.getProjectCategory());
         }
         if (StringUtils.isNotBlank(request.getProjectName())) {
-            criteria.andLike("projectName", request.getProjectName());
+            criteria.andLike("projectName", "%" + request.getProjectName() + "%");
         }
         if (Objects.nonNull(request.getStatus())) {
             criteria.andEqualTo("status", request.getStatus());
         }
+        if (Objects.nonNull(request.getType())) {
+            criteria.andEqualTo("type", request.getType());
+        }
+        criteria.andEqualTo("deleted", 0);
         example.setOrderByClause("create_time DESC");
         return tpRuleMapper.selectByExample(example);
     }
diff --git a/coolstore-partner-dao/src/main/resources/dict/SysDictColumnMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
similarity index 100%
rename from coolstore-partner-dao/src/main/resources/dict/SysDictColumnMapper.xml
rename to coolstore-partner-dao/src/main/resources/mapper/dict/SysDictColumnMapper.xml
diff --git a/coolstore-partner-dao/src/main/resources/dict/SysDictGroupMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/dict/SysDictGroupMapper.xml
similarity index 100%
rename from coolstore-partner-dao/src/main/resources/dict/SysDictGroupMapper.xml
rename to coolstore-partner-dao/src/main/resources/mapper/dict/SysDictGroupMapper.xml
diff --git a/coolstore-partner-dao/src/main/resources/dict/SysDictTableMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/dict/SysDictTableMapper.xml
similarity index 100%
rename from coolstore-partner-dao/src/main/resources/dict/SysDictTableMapper.xml
rename to coolstore-partner-dao/src/main/resources/mapper/dict/SysDictTableMapper.xml
diff --git a/coolstore-partner-dao/src/main/resources/mapper/tp/TpRuleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/tp/TpRuleMapper.xml
index b5138c50e..47692828c 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/tp/TpRuleMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/tp/TpRuleMapper.xml
@@ -14,7 +14,7 @@
     <result column="warning_limit" jdbcType="INTEGER" property="warningLimit" />
     <result column="point" jdbcType="DECIMAL" property="point" />
     <result column="amount" jdbcType="DECIMAL" property="amount" />
-    <result column="review_deadline" jdbcType="INTEGER" property="reviewDeadline" />
+    <result column="appeal_deadline" jdbcType="INTEGER" property="appealDeadline" />
     <result column="status" jdbcType="BIT" property="status" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="is_full" jdbcType="BIT" property="isFull" />
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpRuleDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpRuleDO.java
index 7d0c211a6..828907322 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpRuleDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/tp/TpRuleDO.java
@@ -75,8 +75,8 @@ public class TpRuleDO {
     /**
      * 复议申请时效
      */
-    @Column(name = "review_deadline")
-    private Integer reviewDeadline;
+    @Column(name = "appeal_deadline")
+    private Integer appealDeadline;
 
     /**
      * 启用状态，0未启用 1启用
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpPenaltyRuleUpdateRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpPenaltyRuleUpdateRequest.java
index 6864820aa..4156d59ed 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpPenaltyRuleUpdateRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpPenaltyRuleUpdateRequest.java
@@ -50,7 +50,7 @@ public class TpPenaltyRuleUpdateRequest {
 
     @ApiModelProperty("复议申请时效")
     @NotNull(message = "复议申请时效不能为空", groups = {InsertGroup.class, UpdateGroup.class})
-    private Integer reviewDeadline;
+    private Integer appealDeadline;
 
     @ApiModelProperty("启用状态，0未启用 1启用")
     @NotNull(message = "启用状态不能为空", groups = {InsertGroup.class, UpdateGroup.class})
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpRuleQueryRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpRuleQueryRequest.java
index 8d9547b21..80787bd47 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpRuleQueryRequest.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/request/tp/TpRuleQueryRequest.java
@@ -25,4 +25,7 @@ public class TpRuleQueryRequest extends PageBasicInfo {
 
     @ApiModelProperty("启用状态，0未启用 1启用")
     private Integer status;
+    
+    @ApiModelProperty(value = "规则类型，0扣分 1加分", hidden = true)
+    private Integer type;
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java
index 72173af2b..4d955d746 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleDetailVO.java
@@ -49,7 +49,7 @@ public class TpPenaltyRuleDetailVO {
     private BigDecimal amount;
 
     @ApiModelProperty("复议申请时效")
-    private Integer reviewDeadline;
+    private Integer appealDeadline;
 
     @ApiModelProperty("启用状态，0未启用 1启用")
     private Integer status;
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java
index 8f9c946d0..2b0c22079 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/tp/TpPenaltyRuleListVO.java
@@ -1,5 +1,6 @@
 package com.cool.store.vo.tp;
 
+import com.cool.store.annotation.DictField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -24,9 +25,17 @@ public class TpPenaltyRuleListVO {
     @ApiModelProperty("问题分类")
     private String problemClassification;
 
+    @ApiModelProperty("问题分类名称")
+    @DictField
+    private String problemClassificationName;
+
     @ApiModelProperty("项目大类")
     private String projectCategory;
 
+    @ApiModelProperty("项目大类名称")
+    @DictField
+    private String projectCategoryName;
+
     @ApiModelProperty("惩处项目名称")
     private String projectName;
 
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/tp/impl/TpRuleServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/tp/impl/TpRuleServiceImpl.java
index de4c60ab0..60bba6d25 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/tp/impl/TpRuleServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/tp/impl/TpRuleServiceImpl.java
@@ -62,7 +62,7 @@ public class TpRuleServiceImpl implements TpRuleService {
     @Override
     public PageInfo<TpPenaltyRuleListVO> penaltyRulePage(TpRuleQueryRequest request) {
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<TpRuleDO> list = tpRuleDAO.getList(request);
+        List<TpRuleDO> list = tpRuleDAO.getEffectiveList(request);
         PageInfo<TpRuleDO> page = new PageInfo<>(list);
         PageInfo<TpPenaltyRuleListVO> newPage = BeanUtil.toPage(page, TpPenaltyRuleListVO.class);
         dictService.fillDictField(newPage.getList());
@@ -97,7 +97,7 @@ public class TpRuleServiceImpl implements TpRuleService {
     @Override
     public PageInfo<TpRewardRuleDetailVO> rewardRulePage(TpRuleQueryRequest request) {
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
-        List<TpRuleDO> list = tpRuleDAO.getList(request);
+        List<TpRuleDO> list = tpRuleDAO.getEffectiveList(request);
         PageInfo<TpRuleDO> page = new PageInfo<>(list);
         PageInfo<TpRewardRuleDetailVO> newPage = BeanUtil.toPage(page, TpRewardRuleDetailVO.class);
         dictService.fillDictField(newPage.getList());
diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java
index 6741acbaa..5137f8596 100644
--- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java
+++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/TpRuleController.java
@@ -58,6 +58,7 @@ public class TpRuleController {
     @ApiOperation("惩处规则分页查询")
     @GetMapping("/penaltyPage")
     public ResponseResult<PageInfo<TpPenaltyRuleListVO>> penaltyRulePage(TpRuleQueryRequest request) {
+        request.setType(0);
         return ResponseResult.success(tpRuleService.penaltyRulePage(request));
     }
 
@@ -83,6 +84,7 @@ public class TpRuleController {
     @ApiOperation("加分规则分页查询")
     @GetMapping("/rewardPage")
     public ResponseResult<PageInfo<TpRewardRuleDetailVO>> rewardRulePage(TpRuleQueryRequest request) {
+        request.setType(1);
         return ResponseResult.success(tpRuleService.rewardRulePage(request));
     }