Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

zhongzheng-admin/src/main/java/com/zhongzheng/controller/base/ConsoleController.java

@@ -72,4 +72,11 @@ public class ConsoleController extends BaseController {
         Map<String,Object> numMap = iConsoleService.getMockData(bo);
         return AjaxResult.success(numMap);
     }
+
+    @ApiOperation("控制台填写资料审核数据")
+    @GetMapping("/profileData")
+    public AjaxResult<Map<String,Object>> profileData(ConsoleQueryBo bo) {
+        Map<String,Object> numMap = iConsoleService.getProfileData(bo);
+        return AjaxResult.success(numMap);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/mapper/UserProfileMapper.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.base.mapper;
 
 import com.zhongzheng.common.annotation.DataScope;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
 import com.zhongzheng.modules.base.domain.UserProfile;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -27,4 +28,5 @@ public interface UserProfileMapper extends BaseMapper<UserProfile> {
 
     Long selectGrade(@Param("userId") Long userId,@Param("goodsId") Long goodsId);
 
+    Integer getProfileStatusNum(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IConsoleService.java

@@ -22,4 +22,6 @@ public interface IConsoleService {
     Map<String, Object> getTestData(ConsoleQueryBo bo);
 
     Map<String, Object> getMockData(ConsoleQueryBo bo);
+
+    Map<String, Object> getProfileData(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/IUserProfileService.java

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.base.service;
 
 import com.zhongzheng.common.core.domain.model.LoginUser;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.domain.UserProfile;
 import com.zhongzheng.modules.base.vo.UserProfileExportGaiVo;
 import com.zhongzheng.modules.base.vo.UserProfileExportVo;
@@ -72,4 +73,6 @@ public interface IUserProfileService extends IService<UserProfile> {
 	Map<String,Object> export(UserProfileQueryBo bo);
 
 	Map<String,Object> exportPo(UserProfileQueryBo bo);
+
+	Integer getProfileStatusNum(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ConsoleServiceImpl.java

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IConsoleService;
+import com.zhongzheng.modules.base.service.IUserProfileService;
 import com.zhongzheng.modules.grade.service.IClassGradeService;
+import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.ClassGradeVo;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderListVo;
@@ -42,6 +44,12 @@ public class ConsoleServiceImpl implements IConsoleService {
     @Autowired
     private IUserMockRecordService iUserMockRecordService;
 
+    @Autowired
+    private IUserProfileService iUserProfileService;
+
+    @Autowired
+    private IClassGradeUserService iClassGradeUserService;
+
     @Override
     public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
         Integer allNum = iOrderService.getConsoleStudentNum(bo); //总人数
@@ -369,6 +377,22 @@ public class ConsoleServiceImpl implements IConsoleService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> getProfileData(ConsoleQueryBo bo) {
+        Map<String, Object> map = new HashMap<>();
+        bo.setPeriodStatus(2);
+        Integer pendingTrialNum = iUserProfileService.getProfileStatusNum(bo);
+        bo.setPeriodStatus(3);
+        Integer unPassNum = iUserProfileService.getProfileStatusNum(bo);
+        bo.setPeriodStatus(1);
+        Integer passNum = iUserProfileService.getProfileStatusNum(bo);
+
+        map.put("pendingTrialNum", pendingTrialNum);
+        map.put("unPassNum", unPassNum);
+        map.put("passNum", passNum);
+        return map;
+    }
+
     private void countNum(Map<String, Object> map,String tag,List<OrderListVo> allList){
         Integer allNum = allList.size();
         map.put(tag+"Num",allNum);

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/UserProfileServiceImpl.java

@@ -25,7 +25,7 @@ import com.zhongzheng.common.utils.file.FileUtils;
 import com.zhongzheng.modules.alioss.bo.OssRequest;
 import com.zhongzheng.modules.alioss.service.impl.OssServiceImpl;
 import com.zhongzheng.modules.alisms.service.IAliSmsService;
-import com.zhongzheng.modules.base.bo.UserProfileFit;
+import com.zhongzheng.modules.base.bo.*;
 import com.zhongzheng.modules.base.vo.JsonBean;
 import com.zhongzheng.modules.base.vo.UserProfileExportGaiVo;
 import com.zhongzheng.modules.base.vo.UserProfileExportVo;
@@ -54,9 +54,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.base.bo.UserProfileAddBo;
-import com.zhongzheng.modules.base.bo.UserProfileQueryBo;
-import com.zhongzheng.modules.base.bo.UserProfileEditBo;
 import com.zhongzheng.modules.base.domain.UserProfile;
 import com.zhongzheng.modules.base.mapper.UserProfileMapper;
 import com.zhongzheng.modules.base.vo.UserProfileVo;
@@ -870,6 +867,11 @@ public class UserProfileServiceImpl extends ServiceImpl<UserProfileMapper, UserP
         return rs;
     }
 
+    @Override
+    public Integer getProfileStatusNum(ConsoleQueryBo bo) {
+        return baseMapper.getProfileStatusNum(bo);
+    }
+
     /**
      * url读取image转换为Base64字符串
      *

zhongzheng-system/src/main/resources/mapper/modules/base/UserProfileMapper.xml

@@ -235,4 +235,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ORDER BY cgu.create_time desc
             LIMIT 1
     </select>
+    <select id="getProfileStatusNum" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultType="java.lang.Integer">
+        SELECT COUNT(up.id)
+        FROM
+             user_profile up
+        LEFT JOIN goods g ON up.goods_id = g.goods_id
+        WHERE 1=1
+        <if test="periodStatus != null">
+            and up.`status` = #{periodStatus}
+        </if>
+        <if test="businessId != null and businessId != ''">
+            and g.business_id = #{businessId}
+        </if>
+    </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/mock/MockMajorSubjectTimeMapper.xml

@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectName" column="project_name"/>
         <result property="subjectId" column="subject_id"/>
         <result property="subjectName" column="subject_name"/>
+        <result property="businessId" column="business_id"/>
+        <result property="businessName" column="business_name"/>
         <result property="timeLimit" column="time_limit"/>
         <result property="firstHandTime" column="first_hand_time"/>
     </resultMap>
@@ -68,7 +70,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ma.apply_id,
             ma.apply_name,
             ma.project_id,
-            cpt.project_name
+            cpt.project_name,
+            ma.business_id,
+            cb.business_name,
+            ma.time_limit
         FROM
             mock_major_subject_time mmst
         LEFT JOIN mock_major_subject mms ON mmst.mock_major_subject_id = mms.mock_major_subject_id
@@ -77,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN major m ON mm.major_id = m.id
         LEFT JOIN mock_apply ma ON mm.apply_id = ma.apply_id
         LEFT JOIN course_project_type cpt ON ma.project_id = cpt.id
+        LEFT JOIN course_business cb ON ma.business_id = cb.id
         WHERE
         mmst.id = #{eachExamId}
     </select>