feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.43</version>
+	<version>1.0.44</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/mapper/TpLifeConsultantEvaluateMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TpLifeConsultantEvaluate;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,5 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TpLifeConsultantEvaluateMapper extends BaseMapper<TpLifeConsultantEvaluate> {
 
-    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, Integer orgId, String userId, String evaluateTime);
+    IPage<TpLifeConsultantEvaluate> getPageBy(IPage<TpLifeConsultantEvaluate> pg, @Param("orgId") Integer orgId, @Param("userId") String userId, @Param("evaluateTime") String evaluateTime);
 }

src/main/java/com/huiju/estateagents/controller/TpMessageEventController.java

@@ -61,6 +61,7 @@ public class TpMessageEventController extends BaseController {
 		    IPage<TpMessageEvent> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TpMessageEvent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE);
             queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
             queryWrapper.like(!StringUtils.isEmpty(evtType), "evtType", "%"+evtType+"%");
             queryWrapper.orderByAsc("evt_type");
@@ -124,7 +125,7 @@ public class TpMessageEventController extends BaseController {
                                              @ApiParam("更新内容") @RequestBody TpMessageEvent tpMessageEvent,
                                              HttpServletRequest request) throws Exception{
 
-        if (null == tpMessageEvent || tpMessageEvent.getStatus().equals(CommConstant.STATUS_DELETE)) {
+        if (null == tpMessageEvent) {
             return ResponseBean.error("数据不存在", ResponseBean.ERROR_UNAVAILABLE);
         }
 

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -1129,8 +1129,8 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         bill.setCreateDate(new Date());
         bill.setCreateUser(userId);
         bill.setOrgId(orgId);
-        bill.setPayTotalNum(ticket.getPrice());
-        bill.setUnpayedNum(ticket.getPrice());
+        bill.setPayTotalNum(1);
+        bill.setUnpayedNum(1);
         billMapper.insert(bill);
 
         // 新增缴费单

src/main/resources/mapper/TpLifeConsultantEvaluateMapper.xml

@@ -10,7 +10,9 @@
         WHERE
             t.org_id = #{orgId}
             AND t.user_id = #{userId}
+        <if test="null != evaluateTime and '' != evaluateTime">
             AND t.evaluate_time = #{evaluateTime}
+        </if>
         ORDER BY t.create_date DESC
     </select>
 </mapper>