Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_0303

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TenantPreJoinDao.java

@@ -1,10 +1,13 @@
 package com.ym.mec.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 机构入驻表(预加入)(TenantPreJoin)表数据库访问层
@@ -16,5 +19,6 @@ public interface TenantPreJoinDao extends BaseMapper<TenantPreJoin> {
 
     int insertBatch(@Param("entities") List<TenantPreJoin> entities);
 
+    <T> IPage<T> queryPage(Page<T> page, @Param("param") Map<String, Object> param);
 }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/TenantPreJoinDto.java

@@ -2,10 +2,7 @@ package com.ym.mec.biz.dal.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import javax.validation.constraints.*;
 import java.io.Serializable;
 
 /**
@@ -20,6 +17,10 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "公司全称")
     private String tsignName;
 
+    @NotNull(message = "推荐人不能为空")
+    @ApiModelProperty(value = "推荐人")
+    private Integer recommender;
+
     @NotBlank(message = "公司简称不能为空")
     @ApiModelProperty(value = "机构名称/公司简称")
     private String name;
@@ -102,6 +103,14 @@ public class TenantPreJoinDto implements Serializable {
     @ApiModelProperty(value = "企业财务公章图片地址")
     private String corporateFinanceChops;
 
+    public Integer getRecommender() {
+        return recommender;
+    }
+
+    public void setRecommender(Integer recommender) {
+        this.recommender = recommender;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TenantPreJoin.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -22,6 +23,10 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "主键")
     private Integer id;
 
+    @TableField("recommender_")
+    @ApiModelProperty(value = "推荐人")
+    private Integer recommender;
+
     @TableField("tsign_name_")
     @ApiModelProperty(value = "公司全称")
     private String tsignName;
@@ -122,6 +127,14 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "省份名称")
     private String provinceName;
 
+    public Integer getRecommender() {
+        return recommender;
+    }
+
+    public void setRecommender(Integer recommender) {
+        this.recommender = recommender;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {

mec-biz/src/main/java/com/ym/mec/biz/dal/vo/TenantPreJoinVo.java

@@ -0,0 +1,18 @@
+package com.ym.mec.biz.dal.vo;
+
+import com.ym.mec.biz.dal.entity.TenantPreJoin;
+import io.swagger.annotations.ApiModelProperty;
+
+public class TenantPreJoinVo extends TenantPreJoin {
+
+    @ApiModelProperty(value = "推荐人姓名")
+    private String recommenderName;
+
+    public String getRecommenderName() {
+        return recommenderName;
+    }
+
+    public void setRecommenderName(String recommenderName) {
+        this.recommenderName = recommenderName;
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/service/TenantPreJoinService.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.biz.dal.dto.TenantPreJoinDto;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
+import com.ym.mec.biz.dal.vo.TenantPreJoinVo;
 import com.ym.mec.common.page.PageInfo;
 
 import java.util.Map;
@@ -15,7 +16,7 @@ import java.util.Map;
  */
 public interface TenantPreJoinService extends IService<TenantPreJoin> {
 
-    PageInfo<TenantPreJoin> queryPage(Map<String, Object> param);
+    PageInfo<TenantPreJoinVo> queryPage(Map<String, Object> param);
 
     int insert(TenantPreJoinDto obj);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -156,10 +156,10 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
      * @param userId       用户id
      */
     private void addUserTenant(List<Integer> tenantIds, Integer userTenantId, Integer userId) {
-        if (CollectionUtils.isEmpty(tenantIds)) {
-            throw new BizException("平台账号必须指定一个机构");
-        }
         if (Objects.nonNull(userTenantId) && userTenantId == -1) {
+            if (CollectionUtils.isEmpty(tenantIds)) {
+                throw new BizException("平台账号必须指定一个机构！");
+            }
             Date now = new Date();
             tenantIds.forEach(t -> {
                 SysUserTenant userTenant = new SysUserTenant();

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -1389,7 +1389,7 @@ public class ExportServiceImpl implements ExportService {
         if (count > 50000) {
             return BaseController.failed("数据集太大，不能导出.最大数据集不能超过50000");
         }
-        queryInfo.setRoutingOrganId(null);
+//        queryInfo.setRoutingOrganId(null);
         ManagerDownload managerDownload = saveManagerDownload(ExportTypeEnum.ROUTE_ORDER,sysUser.getId());
         ExecutorService executor = Executors.newCachedThreadPool();
         CompletableFuture.runAsync(()->{
@@ -2348,29 +2348,6 @@ public class ExportServiceImpl implements ExportService {
 
         HSSFWorkbook workbook = null;
         try {
-        	/*if(isPlatformUser){
-                String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额",
-                        "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课",
-                        "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "汇付手续费", "平台手续费", "到账时间",
-                        "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
-                String[] body = {"id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount"
-                        , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",
-                        "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee",
-                        "rechargeFee", "otherFee", "transferFee", "platformFee", "payTime", "musicGroupId",
-                        "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"};
-                workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
-        	}else{
-                String[] header = {"序号", "学生编号", "学生姓名", "交易流水号", "订单编号", "收款渠道", "收款账户", "订单金额", "应付金额",
-                        "现金支付", "余额支付", "分润账户", "分润金额", "分配余额", "优惠金额", "乐团课", "VIP课", "网管课", "乐理课",
-                        "考级", "维修费用", "乐保费用", "团练宝", "押金", "乐器", "教辅费用", "上门费", "账户充值", "其它", "平台手续费", "到账时间",
-                        "关联乐团ID/VIP课ID", "课程形态", "零星收款类别", "专业", "分部", "教学点", "合作单位", "乐团主管", "备注"};
-                String[] body = {"id", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount"
-                        , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee",
-                        "musicGroupCourseFee", "vipCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee",
-                        "rechargeFee", "otherFee", "platformFee", "payTime", "musicGroupId",
-                        "groupType.desc", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"};
-                workbook = POIUtil.exportExcel(header, body, studentPaymentOrderExportDtos);
-        	}*/
             Map<String, String> headMap = getExportMap(new ExportDto(ExportEnum.ROUTE_ORDER_LIST1, headColumns));
             String[] header = headMap.keySet().toArray(new String[headMap.keySet().size()]);
             String[] body = headMap.values().toArray(new String[headMap.keySet().size()]);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TenantPreJoinServiceImpl.java

@@ -8,6 +8,7 @@ import com.ym.mec.biz.dal.dto.TenantPreJoinDto;
 import com.ym.mec.biz.dal.entity.SysArea;
 import com.ym.mec.biz.dal.entity.SysUserTsign;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
+import com.ym.mec.biz.dal.vo.TenantPreJoinVo;
 import com.ym.mec.biz.service.SysUserTsignService;
 import com.ym.mec.biz.service.TenantPreJoinService;
 import com.ym.mec.common.exception.BizException;
@@ -50,23 +51,10 @@ public class TenantPreJoinServiceImpl extends ServiceImpl<TenantPreJoinDao, Tena
      * @param param 条件
      */
     @Override
-    public PageInfo<TenantPreJoin> queryPage(Map<String, Object> param) {
-        Page<TenantPreJoin> pageInfo = PageUtil.getPageInfo(param);
-        //模糊搜索的字段
-        Object search = param.get("search");
-        //分页查询
-        IPage<TenantPreJoin> page = this.page(pageInfo,
-                new WrapperUtil<TenantPreJoin>()
-                        .hasEq("state_", param.get("state"))
-                        .hasGe("created_time_", param.get("startTime"))
-                        .hasLe("created_time_", param.get("endTime"))
-                        .queryWrapper()
-                        .and(Objects.nonNull(search),
-                                o -> o.eq("tsign_name_", search)
-                                        .or().eq("enterprise_liable_name_", search)
-                                        .or().eq("contacts_", search)
-                        ));
-        return PageUtil.pageInfo(page);
+    public PageInfo<TenantPreJoinVo> queryPage(Map<String, Object> param) {
+        Page<TenantPreJoinVo> pageInfo = PageUtil.getPageInfo(param);
+        pageInfo.setDesc("a.created_time_");
+        return PageUtil.pageInfo(baseMapper.queryPage(pageInfo, param));
     }
 
     @Override

mec-biz/src/main/resources/config/mybatis/TenantPreJoinMapper.xml

@@ -55,4 +55,56 @@
             #{entity.provinceName})
         </foreach>
     </insert>
+
+    <resultMap id="TenantPreJoinVo" type="com.ym.mec.biz.dal.vo.TenantPreJoinVo" extends="BaseResultMap">
+        <result property="recommenderName" column="real_name_"/>
+    </resultMap>
+    <select id="queryPage" parameterType="map" resultMap="TenantPreJoinVo">
+        SELECT a.id_,
+        a.tsign_name_,
+        a.name_,
+        a.area_id_,
+        a.area_name_,
+        a.email_,
+        a.customer_service_phone_,
+        a.tsign_code_,
+        a.address_,
+        a.remark_,
+        a.enterprise_liable_name_,
+        a.enterprise_liable_phone_,
+        a.legal_person_id_front_pic_,
+        a.legal_person_id_reverse_pic_,
+        a.contacts_,
+        a.phone_,
+        a.tsign_pic_,
+        a.tax_register_pic_,
+        a.company_account_info_pic_,
+        a.logo_,
+        a.corporate_chops_,
+        a.corporate_finance_chops_,
+        a.state_,
+        a.created_time_,
+        a.province_id_,
+        a.province_name_,
+        a.recommender_,
+        b.real_name_
+        FROM tenant_pre_join as a
+        left join sys_user as b on a.recommender_ = b.id_
+        <where>
+            <if test="param.state != null">
+                and state_ = #{param.state}
+            </if>
+            <if test="param.startTime != null">
+                AND created_time_ <![CDATA[ >= ]]> #{param.startTime}
+            </if>
+            <if test="param.endTime != null">
+                AND created_time_ <![CDATA[ <= ]]> #{param.endTime}
+            </if>
+            <if test="param.search != null ">
+                AND (tsign_name_ LIKE CONCAT('%', #{param.search},'%')
+                OR enterprise_liable_name_ LIKE CONCAT('%', #{param.search},'%')
+                OR contacts_ LIKE CONCAT('%', #{param.search},'%'))
+            </if>
+        </where>
+    </select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentRouteOrderController.java

@@ -63,7 +63,7 @@ public class StudentPaymentRouteOrderController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('routeOrder/finance')")
     public HttpResponseResult<PageInfo<StudentPaymentRouteOrderDto>> queryOrderPage(StudentPaymentOrderQueryInfo queryInfo) {
     	if(StringUtils.isBlank(queryInfo.getRoutingOrganId())){
-    		queryInfo.setRoutingOrganId(organizationService.getEmployeeOrgan(null));
+    		queryInfo.setRoutingOrganId(organizationService.getEmployeeOrgan(queryInfo.getRoutingOrganId()));
     	}
         if (StringUtils.isNotBlank(queryInfo.getSearch())) {
             List<BasicUserDto> users = studentPaymentOrderDao.getUsers(queryInfo.getSearch());

mec-web/src/main/java/com/ym/mec/web/controller/TenantPreJoinController.java

@@ -3,6 +3,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.TenantPreJoinDto;
 import com.ym.mec.biz.dal.entity.TenantPreJoin;
+import com.ym.mec.biz.dal.vo.TenantPreJoinVo;
 import com.ym.mec.biz.service.TenantPreJoinService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -38,7 +39,7 @@ public class TenantPreJoinController extends BaseController {
     @ApiOperation("分页查询")
     @PostMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('tenantPreJoin/queryPage')")
-    public HttpResponseResult<PageInfo<TenantPreJoin>> queryPage(@RequestBody Map<String, Object> param) {
+    public HttpResponseResult<PageInfo<TenantPreJoinVo>> queryPage(@RequestBody Map<String, Object> param) {
         return succeed(tenantPreJoinService.queryPage(param));
     }