fix:十二分制-奖惩规则

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);
     }

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" />