审核提交

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantInfoController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper;
@@ -33,12 +34,13 @@ public class TenantInfoController extends BaseController {
 
     /**
      * 查询分页
+     *
      * @param query
      */
     @PostMapping("/page")
     @ApiOperation(value = "查询分页", notes = "TenantInfo")
-    @PreAuthorize("@pcs.hasPermissions('tenantInfo/page')")
-        public HttpResponseResult<PageInfo<TenantInfoWrapper.TenantInfo>> page(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/page')")
+    public HttpResponseResult<PageInfo<TenantInfoWrapper.TenantInfo>> page(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
 
         IPage<TenantInfoWrapper.TenantInfo> pages = tenantInfoService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
@@ -50,7 +52,7 @@ public class TenantInfoController extends BaseController {
     @PostMapping("/update")
     @ApiOperation(value = "修改", notes = "传入TenantInfo")
     @PreAuthorize("@pcs.hasPermissions('tenantInfo/update')")
-    public HttpResponseResult<Boolean> updateTenantInfo(@Valid @RequestBody  TenantInfo info) {
+    public HttpResponseResult<Boolean> updateTenantInfo(@Valid @RequestBody TenantInfo info) {
 
         return succeed(tenantInfoService.updateTenantInfo(info));
     }
@@ -73,11 +75,69 @@ public class TenantInfoController extends BaseController {
     @PostMapping("/state")
     @ApiOperation(value = "冻结", notes = "传入id和布尔类型")
     @PreAuthorize("@pcs.hasPermissions('tenantInfo/state')")
-    public HttpResponseResult<Boolean> state( @RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+    public HttpResponseResult<Boolean> state(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
         if (StringUtil.isEmpty(query.getId())) {
             return failed("参数不能为空");
         }
         return status(tenantInfoService.state(query));
     }
 
+
+    /**
+     * 机构入驻审核分页查询
+     */
+    @PostMapping("/applyPage")
+    @ApiOperation(value = "机构申请查询", notes = "机构申请查询")
+    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/applyPage')")
+    public HttpResponseResult<PageInfo<TenantInfoWrapper.TenantInfo>> applyPage(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+
+        IPage<TenantInfoWrapper.TenantInfo> pages = tenantInfoService.applyPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+
+    /**
+     * 机构入驻审核历史记录查询
+     */
+
+    @PostMapping("/historyPage")
+    @ApiOperation(value = "机构审核历史记录", notes = "机构审核历史记录")
+    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/historyPage')")
+    public HttpResponseResult<PageInfo<TenantInfoWrapper.TenantInfo>> historyPage(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+
+        IPage<TenantInfoWrapper.TenantInfo> pages = tenantInfoService.historyPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+
+    /**
+     * 机构入驻审核本次提交查询
+     */
+    @PostMapping("/queryNow")
+    @ApiOperation(value = "机构审核本次提交", notes = "机构审核本次提交")
+    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/now')")
+    public HttpResponseResult<TenantInfoWrapper.TenantInfo> queryNow(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+
+        TenantInfoWrapper.TenantInfo tenantInfo = tenantInfoService.queryNow(query);
+        return succeed(tenantInfo);
+    }
+
+    /**
+     * 机构入驻审核功能
+     */
+    @PostMapping("/entry")
+    @ApiOperation(value = "机构审核功能", notes = "机构审核功能")
+    //@PreAuthorize("@pcs.hasPermissions('tenantInfo/now')")
+    public HttpResponseResult<Boolean> entry(@RequestBody TenantInfoWrapper.TenantInfoQuery query) {
+
+
+        return succeed(tenantInfoService.entry(query));
+    }
+
+
+
 }
+
+
+
+//sysUser     tenantStaff

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantInfoMapper.java

@@ -37,13 +37,25 @@ public interface TenantInfoMapper extends BaseMapper<TenantInfo> {
 	 * 冻结
 	 * @param id
 	 */
-	Boolean updateFlag(@Param("id") Integer id);
+	Boolean updateFlag(@Param("id") long id);
 
-	Boolean updateMethod(@Param("id") Integer id);
+	Boolean updateMethod(@Param("id") long id);
 
 	Boolean insertInfo(@Param("param") TenantInfo tenantInfo);
 
 	List<Integer> queryTeacherCounts(@Param("listId") List<Integer> listId);
 
 	List<Integer> queryStudentCounts(@Param("listId") List<Integer> listId);
+
+	List<TenantInfoWrapper.TenantInfo> selectApplyPage(@Param("page") IPage<TenantInfoWrapper.TenantInfo> page, @Param("param") TenantInfoWrapper.TenantInfoQuery query);
+
+	List<TenantInfoWrapper.TenantInfo> selectHistoryPage(@Param("page") IPage<TenantInfoWrapper.TenantInfo> page, @Param("id") long id);
+
+	TenantInfoWrapper.TenantInfo queryNow(@Param("param") TenantInfoWrapper.TenantInfoQuery query);
+
+	Boolean insertNow(@Param("info") TenantInfoWrapper.TenantInfo info);
+
+	Boolean updateStatusById(@Param("id") long id);
+
+	Boolean updateUnpassStatusById(@Param("id") long id);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantInfoService.java

@@ -53,5 +53,40 @@ public interface TenantInfoService extends IService<TenantInfo>  {
 
     HttpResponseResult<Boolean> submit(TenantInfoWrapper.TenantInfoQuery query);
 
+    /**
+     * 冻结
+     * @param query
+     * @return
+     */
     Boolean state(TenantInfoWrapper.TenantInfoQuery query);
+
+
+
+    /**
+     * 机构申请分页查询
+     * @param query
+     * @return
+     */
+    IPage<TenantInfoWrapper.TenantInfo> applyPage(IPage<TenantInfoWrapper.TenantInfo> page, TenantInfoWrapper.TenantInfoQuery query);
+
+    /**
+     * 机构入驻审核历史记录查询
+     * @param query
+     * @return
+     */
+    IPage<TenantInfoWrapper.TenantInfo> historyPage(IPage<TenantInfoWrapper.TenantInfo> page, TenantInfoWrapper.TenantInfoQuery query);
+
+    /**
+     * 机构入驻审核本次提交查询
+     * @param query
+     * @return
+     */
+    TenantInfoWrapper.TenantInfo queryNow(TenantInfoWrapper.TenantInfoQuery query);
+
+    /**
+     * 机构审核
+     * @param query
+     * @return
+     */
+    Boolean entry(TenantInfoWrapper.TenantInfoQuery query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantInfoServiceImpl.java

@@ -4,13 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.biz.dal.entity.SysArea;
-import com.yonge.cooleshow.biz.dal.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
-import com.yonge.cooleshow.biz.dal.entity.TenantStaff;
-import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
-import com.yonge.cooleshow.biz.dal.mapper.TenantInfoMapper;
-import com.yonge.cooleshow.biz.dal.mapper.TenantStaffMapper;
+import com.yonge.cooleshow.biz.dal.entity.*;
+import com.yonge.cooleshow.biz.dal.mapper.*;
 import com.yonge.cooleshow.biz.dal.service.SysAreaService;
 import com.yonge.cooleshow.biz.dal.service.SysConfigService;
 import com.yonge.cooleshow.biz.dal.service.TenantInfoService;
@@ -23,6 +18,7 @@ import com.yonge.toolset.base.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -61,6 +57,13 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
     @Autowired
     private TenantStaffMapper tenantStaffMapper;
 
+    @Autowired
+    TenantEntryRecordMapper tenantEntryRecordMapper;
+
+    @Autowired
+    TenantApplyRecordMapper tenantApplyRecordMapper;
+
+
 
     /**
      * 查询详情
@@ -270,6 +273,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
      */
     @Override
     public Boolean updateTenantInfo(TenantInfo info) {
+        //更新或创建sysUser
         SysUser sysUser = getOrCreateAccount(info);
 
         TenantInfo oldTenantInfo = this.getById(info.getId());
@@ -366,16 +370,63 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoMapper, TenantI
         if (pass == 1) {
             //查询本次提交记录，并插入审核表
             TenantInfoWrapper.TenantInfo info = queryNow(query);
-            tenantInfoMapper.insertNow(info);
+            TenantEntryRecord entryRecord = new TenantEntryRecord();
+            entryRecord.setId(info.getId());
+            entryRecord.setName(info.getName());
+            entryRecord.setLogo(info.getLogo());
+            entryRecord.setProvinceCode(info.getProvinceCode());
+            entryRecord.setCityCode(info.getCityCode());
+            entryRecord.setRegionCode(info.getRegionCode());
+            entryRecord.setUsername(info.getUserName());
+            entryRecord.setPhone(info.getPhone());
+            entryRecord.setStatus("PASS");
+            entryRecord.setVerifyUserId(info.getVerifyUserId());
+            entryRecord.setReason(info.getReason());
+            entryRecord.setCreateTime(info.getCreateTime());
+            tenantEntryRecordMapper.insert(entryRecord);
             //更改当前记录的审核状态
+            long id = info.getId();
+            tenantInfoMapper.updateStatusById(id);
 
             //机构账户新增逻辑
+            TenantInfo tenantInfo = new TenantInfo();
+            tenantInfo.setId(info.getId());
+            tenantInfo.setLogo(info.getLogo());
+            tenantInfo.setName(info.getName());
+            tenantInfo.setProvinceCode(info.getProvinceCode());
+            tenantInfo.setCityCode(info.getCityCode());
+            tenantInfo.setRegionCode(info.getRegionCode());
+            tenantInfo.setUsername(info.getUserName());
+            tenantInfo.setPhone(info.getPhone());
+            tenantInfo.setEnableFlag(true);
+            tenantInfo.setBriefIntroduction(info.getBriefIntroduction());
+            tenantInfo.setUpdateTime(info.getUpdateTime());
+            tenantInfo.setCreateTime(info.getCreateTime());
+            add(tenantInfo);
+
+
         } else {
             //查询本次提交记录，并插入审核表
+            TenantInfoWrapper.TenantInfo info = queryNow(query);
+            TenantEntryRecord entryRecord = new TenantEntryRecord();
+            entryRecord.setId(info.getId());
+            entryRecord.setName(info.getName());
+            entryRecord.setLogo(info.getLogo());
+            entryRecord.setProvinceCode(info.getProvinceCode());
+            entryRecord.setCityCode(info.getCityCode());
+            entryRecord.setRegionCode(info.getRegionCode());
+            entryRecord.setUsername(info.getUserName());
+            entryRecord.setPhone(info.getPhone());
+            entryRecord.setStatus("UNPASS");
+            entryRecord.setVerifyUserId(info.getVerifyUserId());
+            entryRecord.setReason(info.getReason());
+            entryRecord.setCreateTime(info.getCreateTime());
+            tenantEntryRecordMapper.insert(entryRecord);
             //更改当前记录的审核状态
-
+            long id = info.getId();
+            tenantInfoMapper.updateUnpassStatusById(id);
         }
-        return null;
+        return  true;
     }
 
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantInfoMapper.xml

@@ -26,6 +26,13 @@
         (name_,logo_,brief_Introduction_,province_code_,city_code_,region_code_,username_,phone_)
         values (#{param.name},#{param.logo},#{param.briefIntroduction},#{param.provinceCode},#{param.cityCode},#{param.regionCode},#{param.username},#{param.phone})
     </insert>
+
+    <insert id="insertNow">
+        insert into tenant_entry_record (id_,tenant_id_,
+        )
+        (id_,)
+    </insert>
+
     <update id="updateInfo">
         update tenant_info
         set
@@ -68,6 +75,17 @@
         where tenant_id_ = #{id}
     </update>
 
+    <update id="updateStatusById">
+      update  tenant_apply_record
+      set status_ = 'PASS'
+      where  id_ =#{id}
+    </update>
+    <update id="updateUnpassStatusById">
+        update  tenant_apply_record
+      set status_ = 'UNPASS'
+      where  id_ =#{id}
+    </update>
+
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
         SELECT
         <include refid="baseColumns"/>
@@ -92,11 +110,97 @@
         </where>
 
 	</select>
+
     <select id="queryTeacherCounts" resultType="java.lang.Integer">
         SELECT count(t.tenant_id_) FROM teacher t where t.tenant_id_ IN (<foreach collection="listId" separator="," item="Id">#{Id}</foreach>)
     </select>
+
     <select id="queryStudentCounts" resultType="java.lang.Integer">
         SELECT count(s.tenant_id_) FROM student s where s.tenant_id_ IN (<foreach collection="listId" separator="," item="Id">#{Id}</foreach>)
     </select>
 
+    <select id="selectApplyPage" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
+        SELECT
+        id_ as id,
+        name_ AS name,
+        logo_ AS logo,
+        brief_Introduction_ AS briefIntroduction,
+        username_ AS username,
+        phone_ AS phone,
+        province_code_ AS provinceCode,
+        city_code_ AS cityCode,
+        region_code_ AS regionCode,
+        status_ AS status
+        FROM tenant_apply_record t
+        where 1=1
+        <if test="param.keyword != null and param.keyword  != ''">
+            and (
+            t.name_ like concat('%',#{param.keyword},'%')
+            or t.username_ like concat('%',#{param.keyword},'%')
+            or t.phone_ like concat('%',#{param.keyword},'%')
+            )
+        </if>
+        <if test="param.provinceCode != null and param.provinceCode != ''
+               and param.cityCode != null and param.cityCode != ''
+               and param.regionCode != null and param.regionCode != ''">
+            and
+            t.province_code_ = #{param.provinceCode}
+            and
+            t.city_code_ = #{param.cityCode}
+            and
+            t.region_code_ = #{param.regionCode}
+        </if>
+    </select>
+
+    <select id="selectHistoryPage"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
+        select
+        id_ AS id,
+        tenant_apply_record_id_ AS tenantApplyRecordId,
+        name_ AS name,
+        logo_ as logo,
+        province_code_ AS provinceCode,
+        city_code_ AS cityCode,
+        region_code_ AS regionCode,
+        username_ AS username,
+        phone_ AS phone,
+        status_ AS status,
+        verify_user_id_ AS verifyUserId,
+        reason_ AS reason,
+        update_time_ AS updateTime,
+        create_time_ AS createTime
+        FROM
+        tenant_entry_record
+        WHERE
+        1=1
+        <if test="id != null">
+          and id_ = #{id}
+        </if>
+    </select>
+    <select id="queryNow" resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantInfoWrapper$TenantInfo">
+        select
+        id_ AS id,
+        tenant_id_ AS tenantId,
+        name_ AS name,
+        logo_ as logo,
+        province_code_ AS provinceCode,
+        city_code_ AS cityCode,
+        region_code_ AS regionCode,
+        username_ AS username,
+        phone_ AS phone,
+        status_ AS status,
+        verify_user_id_ AS verifyUserId,
+        reason_ AS reason,
+        update_time_ AS updateTime,
+        create_time_ AS createTime
+        from
+        tenant_apply_record
+        where
+        1=1
+        <if test="param.id != null">
+        and
+        id_ = #{param.id}
+        </if>
+    </select>
+
 </mapper>