Browse Source

添加待办条数

Wei Ruifeng 4 years ago
parent
commit
683d5a83eb

+ 6 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/controller/LiftCaseController.java

@@ -195,4 +195,10 @@ public class LiftCaseController extends BaseController<LiftCaseEntity, LiftCaseQ
     public RestResponse undealedCase(Long userId) {
         return liftCaseService.getUndealedCaseNum(userId);
     }
+    
+    @GetMapping("/getTodeal")
+    @ApiOperation(value = "web/首页/待办")
+    public RestResponse getTodeal() {
+        return liftCaseService.getTodeal();
+    }
 }

+ 6 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/LiftCaseMapper.java

@@ -258,4 +258,10 @@ public interface LiftCaseMapper extends BaseMapper<LiftCaseEntity> {
      * @return
      */
     int getUndealedCaseNum(Long userId);
+    
+    /**
+     * 待办订单
+     */
+    @Select("SELECT count(id) FROM lift_case WHERE (((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND (charger_id!=-2) AND accept_status=0) OR (((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND is_platform_specified=1 AND accept_status=0)")
+    int getTodealCount();
 }

+ 2 - 27
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/LiftCaseMapper.xml

@@ -705,32 +705,7 @@
     LEFT JOIN user_info as customer ON t.customer_service_id = customer.user_id
     LEFT JOIN lift_brand as brand ON brand.id = t.brand_id
     left join question_bank que on que.lift_case_id = t.id
-	where t.accept_status=0
-		<if test="query.expression != null" >
-            and t.expression like CONCAT("%",#{query.expression},"%")
-        </if>
-        <if test="query.originator != null" >
-            and ui.name like CONCAT("%",#{query.originator},"%")
-        </if>
-        <if test="query.chargeName != null" >
-            and ci.name like CONCAT("%",#{query.chargeName},"%")
-        </if>
-        <if test="query.brandName != null" >
-            and brand.name like CONCAT("%",#{query.brandName},"%")
-        </if>
-        <if test="query.statuz1 != null" >
-            and lift.statuz = #{query.statuz1}
-        </if>
-	union 
-	SELECT customer.`name` as customerName ,t.*,brand.`name` as brandName,
-    que.examine_flag examineFlag,que.not_examine_reason notExamineReason
-    from lift_case as t
-    LEFT JOIN user_info AS ui ON t.create_user_id = ui.user_id
-    LEFT JOIN user_info AS ci ON t.charger_id = ci.user_id
-    LEFT JOIN user_info as customer ON t.customer_service_id = customer.user_id
-    LEFT JOIN lift_brand as brand ON brand.id = t.brand_id
-    left join question_bank que on que.lift_case_id = t.id
-	where t.statuz=9
+	where t.accept_status=0 and t.statuz!=9
 		<if test="query.expression != null" >
             and t.expression like CONCAT("%",#{query.expression},"%")
         </if>
@@ -755,7 +730,7 @@
     LEFT JOIN user_info as customer ON t.customer_service_id = customer.user_id
     LEFT JOIN lift_brand as brand ON brand.id = t.brand_id
     left join question_bank que on que.lift_case_id = t.id
-	where t.statuz!=9 and t.accept_status!=0
+	where t.accept_status!=0 or t.statuz=9
 		<if test="query.expression != null" >
             and t.expression like CONCAT("%",#{query.expression},"%")
         </if>

+ 5 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/ILiftCaseService.java

@@ -138,4 +138,9 @@ public interface ILiftCaseService extends IService<LiftCaseEntity> {
      * @return
      */
     RestResponse getUndealedCaseNum(Long userId);
+    
+    /**
+     * 获取待办条数
+     */
+    RestResponse getTodeal();
 }

+ 28 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/service/impl/LiftCaseServiceImpl.java

@@ -29,9 +29,13 @@ import cn.com.ty.lift.ud.operation.mapper.entity.OtherSettingEntity;
 import cn.com.ty.lift.ud.operation.service.ICommissionSettingService;
 import cn.com.ty.lift.ud.payment.mapper.UserBillMapper;
 import cn.com.ty.lift.ud.payment.mapper.entity.UserBillEntity;
+import cn.com.ty.lift.ud.question.mapper.QuestionBankMapper;
 import cn.com.ty.lift.ud.question.mapper.entity.QuestionBankEntity;
 import cn.com.ty.lift.ud.question.service.IQuestionBankService;
+import cn.com.ty.lift.ud.recruitmentInfos.mapper.RecruitmentInfoMapper;
 import cn.com.ty.lift.ud.redis.RedisUtils;
+import cn.com.ty.lift.ud.schoolVideo.mapper.SchoolVideoMapper;
+import cn.com.ty.lift.ud.schoolVideo.mapper.SchoolVideoOperateMapper;
 import cn.com.ty.lift.ud.userAccount.mapper.UserAccountMapper;
 import cn.com.ty.lift.ud.userAccount.mapper.entity.UserAccount;
 import cn.com.ty.lift.ud.userAccount.service.IUserAccountService;
@@ -56,7 +60,9 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 import static org.springframework.boot.actuate.trace.http.Include.SESSION_ID;
@@ -122,6 +128,14 @@ public class LiftCaseServiceImpl extends ServiceImpl<LiftCaseMapper, LiftCaseEnt
     private ILiftCaseAppealService liftCaseAppealService;
     @Autowired
     private IQuestionBankService questionBankService;
+    
+    @Autowired
+	private SchoolVideoMapper schoolVideoMapper;
+    
+    private @Autowired RecruitmentInfoMapper recruitmentInfoMapper;
+    
+    @Autowired
+    private QuestionBankMapper questionBankMapper;
 
     @Override
     public RestResponse createLiftCase(LiftCaseReq req) {
@@ -1126,4 +1140,18 @@ public class LiftCaseServiceImpl extends ServiceImpl<LiftCaseMapper, LiftCaseEnt
         int undealedCaseNum = caseMapper.getUndealedCaseNum(userId);
         return RestResponse.success(undealedCaseNum);
     }
+
+	@Override
+	public RestResponse getTodeal() {
+		Map<String,Object> result = new HashMap<>();
+		int caseTodealCount = caseMapper.getTodealCount();
+		int videoTodealCount = schoolVideoMapper.getVideoTodealCount();
+		int recruitmentInfoTodealCount = recruitmentInfoMapper.getRecruitmentInfoTodealCount();
+		int questionTodealCount = questionBankMapper.getQuestionTodealCount();
+		result.put("caseTodealCount", caseTodealCount);
+		result.put("videoTodealCount", videoTodealCount);
+		result.put("recruitmentInfoTodealCount", recruitmentInfoTodealCount);
+		result.put("questionTodealCount", questionTodealCount);
+		return RestResponse.success(result);
+	}
 }

+ 4 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/question/mapper/QuestionBankMapper.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.math.BigDecimal;
@@ -147,4 +148,7 @@ public interface QuestionBankMapper extends BaseMapper<QuestionBankEntity> {
      * @return
      */
     int countAppByQuery(@Param("ew") Wrapper condition);
+    
+    @Select("select count(id) from question_bank where examine_flag=0")
+    int getQuestionTodealCount();
 }

+ 4 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/recruitmentInfos/mapper/RecruitmentInfoMapper.java

@@ -6,6 +6,7 @@ import java.util.List;
 import cn.com.ty.lift.ud.recruitmentInfos.controller.query.RecruitmentInfoQuery;
 import cn.com.ty.lift.ud.recruitmentInfos.mapper.entity.RecruitmentInfoEntity;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -43,4 +44,7 @@ public interface RecruitmentInfoMapper extends BaseMapper<RecruitmentInfoEntity>
     
     @Update(value = "update recruitment_info set browse_num= browse_num+1 where id = #{id}")
     void updateBrowseNum(@Param("id")Long id);
+    
+    @Select("select count(id) from recruitment_info where check_flag=2")
+    int getRecruitmentInfoTodealCount();
 }

+ 4 - 0
lift-ud-service/src/main/java/cn/com/ty/lift/ud/schoolVideo/mapper/SchoolVideoMapper.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -56,4 +57,7 @@ public interface SchoolVideoMapper extends BaseMapper<SchoolVideoEntity> {
      */
     @Update(value = "update school_video set pay_num = pay_num + 1  where id = #{id}")
     void updateReward(@Param("id") Long id);
+    
+    @Select("select count(id) from school_video where check_flag=2")
+    int getVideoTodealCount();
 }