Merge branch 'zx_saas_delTenant_0319' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/TenantApplyController.java

@@ -66,4 +66,17 @@ public class TenantApplyController extends BaseController {
 		return succeed();
 	}
 
+	@ApiOperation("删除")
+	@GetMapping(value = "/delete/{id}")
+	@PreAuthorize("@pcs.hasPermissions('tenantApply/delete')")
+	public Object delete(Long id) {
+		TenantApply tenantApply = tenantApplyService.get(id);
+		if (tenantApply == null) {
+			return failed("数据不存在");
+		}
+		tenantApply.setDelFlag(true);
+		tenantApplyService.update(tenantApply);
+		return succeed();
+	}
+
 }

mec-application/src/main/java/com/ym/mec/web/controller/TenantInfoController.java

@@ -67,6 +67,14 @@ public class TenantInfoController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("删除机构信息")
+    @GetMapping(value = "/delete/{id}")
+    @PreAuthorize("@pcs.hasPermissions('tenantInfo/delete')")
+    public Object deleteTenantInfo(@ApiParam(value = "机构ID", required = true) @PathVariable("id") Integer id) {
+        tenantInfoService.deleteTenantInfo(id);
+        return succeed();
+    }
+
     @ApiOperation("修改机构启用停用状态")
     @GetMapping(value = "/opsState/{id}")
     @PreAuthorize("@pcs.hasPermissions('tenantInfo/opsState')")

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

@@ -1,8 +1,8 @@
 package com.ym.mec.web.controller;
 
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 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;
@@ -11,10 +11,7 @@ import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -35,8 +32,8 @@ public class TenantPreJoinController extends BaseController {
      */
     @Resource
     private TenantPreJoinService tenantPreJoinService;
-    @Resource
-    private SysUserFeignService sysUserFeignService;
+//    @Resource
+//    private SysUserFeignService sysUserFeignService;
 
     @ApiOperation("分页查询")
     @PostMapping("/queryPage")
@@ -58,5 +55,17 @@ public class TenantPreJoinController extends BaseController {
         return succeed();
     }
 
+    @ApiOperation("删除")
+    @GetMapping("/delete/{id}")
+    public HttpResponseResult delete(@PathVariable("id") Integer id) {
+        TenantPreJoin byId = tenantPreJoinService.getById(id);
+        if (byId == null) {
+            return failed("数据不存在");
+        }
+        byId.setDelFlag(true);
+        tenantPreJoinService.updateById(byId);
+        return succeed();
+    }
+
 }
 

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

@@ -1,10 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
  * 对应数据库表(tenant_apply):
  */
+@Data
 public class TenantApply {
 
 	/**  */
@@ -41,116 +44,14 @@ public class TenantApply {
      */
     private String callBackPeople;
 
+	@ApiModelProperty(value = "删除标记")
+	private Boolean delFlag;
     /**
      * 推荐人/非必填
      */
     private String recommender;
 
 	private String smsCode;
-	
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setCity(String city){
-		this.city = city;
-	}
-	
-	public String getCity(){
-		return this.city;
-	}
-			
-	public void setLinkman(String linkman){
-		this.linkman = linkman;
-	}
-	
-	public String getLinkman(){
-		return this.linkman;
-	}
-			
-	public void setMobileNo(String mobileNo){
-		this.mobileNo = mobileNo;
-	}
-	
-	public String getMobileNo(){
-		return this.mobileNo;
-	}
-			
-	public Integer getStudentNumLevel() {
-		return studentNumLevel;
-	}
-
-	public void setStudentNumLevel(Integer studentNumLevel) {
-		this.studentNumLevel = studentNumLevel;
-	}
-
-	public String getNameOfReferrer() {
-		return nameOfReferrer;
-	}
-
-	public void setNameOfReferrer(String nameOfReferrer) {
-		this.nameOfReferrer = nameOfReferrer;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setCallBackTime(java.util.Date callBackTime){
-		this.callBackTime = callBackTime;
-	}
-	
-	public java.util.Date getCallBackTime(){
-		return this.callBackTime;
-	}
-			
-	public void setCallBackLog(String callBackLog){
-		this.callBackLog = callBackLog;
-	}
-	
-	public String getCallBackLog(){
-		return this.callBackLog;
-	}
-			
-	public String getSmsCode() {
-		return smsCode;
-	}
-
-	public void setSmsCode(String smsCode) {
-		this.smsCode = smsCode;
-	}
-
-    public String getCallBackPeople() {
-        return callBackPeople;
-    }
-
-    public void setCallBackPeople(String callBackPeople) {
-        this.callBackPeople = callBackPeople;
-    }
-
-    public String getRecommender() {
-        return recommender;
-    }
-
-    public void setRecommender(String recommender) {
-        this.recommender = recommender;
-    }
 
     @Override
 	public String toString() {

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

@@ -81,6 +81,10 @@ public class TenantInfo implements Serializable {
     @ApiModelProperty(value = "状态0 草稿 1启动 2停用")
     private Integer state;
 
+    @TableField("del_flag_")
+    @ApiModelProperty(value = "删除标记")
+    private Boolean delFlag;
+
     @TableField("user_id_")
     @ApiModelProperty(value = "管理员账号id")
     private Integer userId;
@@ -107,6 +111,14 @@ public class TenantInfo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
     public Integer getId() {
         return id;
     }

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

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -17,6 +17,7 @@ import java.util.Date;
  * @author hgw
  * @since 2022-02-10 13:53:58
  */
+@Data
 @ApiModel(value = "tenant_pre_join-机构入驻表(预加入)")
 public class TenantPreJoin implements Serializable {
     @TableId(value = "id_", type = IdType.AUTO)
@@ -115,6 +116,10 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "是否已创建为机构 0未创建 1已创建")
     private Integer state;
 
+    @TableField("del_flag_")
+    @ApiModelProperty(value = "删除标记")
+    private Boolean delFlag;
+
     @TableField("created_time_")
     @ApiModelProperty(value = "创建时间")
     private Date createdTime;
@@ -135,239 +140,5 @@ public class TenantPreJoin implements Serializable {
     @ApiModelProperty(value = "学员数量")
     private Integer studentNum;
 
-    public Integer getCurrentHasSchoolNum() {
-        return currentHasSchoolNum;
-    }
-
-    public void setCurrentHasSchoolNum(Integer currentHasSchoolNum) {
-        this.currentHasSchoolNum = currentHasSchoolNum;
-    }
-
-    public Integer getStudentNum() {
-        return studentNum;
-    }
-
-    public void setStudentNum(Integer studentNum) {
-        this.studentNum = studentNum;
-    }
-
-    public Integer getRecommender() {
-        return recommender;
-    }
-
-    public void setRecommender(Integer recommender) {
-        this.recommender = recommender;
-    }
-
-    private static final long serialVersionUID = 1L;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getTsignName() {
-        return tsignName;
-    }
-
-    public void setTsignName(String tsignName) {
-        this.tsignName = tsignName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getAreaId() {
-        return areaId;
-    }
-
-    public void setAreaId(Integer areaId) {
-        this.areaId = areaId;
-    }
-
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getCustomerServicePhone() {
-        return customerServicePhone;
-    }
-
-    public void setCustomerServicePhone(String customerServicePhone) {
-        this.customerServicePhone = customerServicePhone;
-    }
-
-    public String getTsignCode() {
-        return tsignCode;
-    }
-
-    public void setTsignCode(String tsignCode) {
-        this.tsignCode = tsignCode;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getEnterpriseLiableName() {
-        return enterpriseLiableName;
-    }
-
-    public void setEnterpriseLiableName(String enterpriseLiableName) {
-        this.enterpriseLiableName = enterpriseLiableName;
-    }
-
-    public String getEnterpriseLiablePhone() {
-        return enterpriseLiablePhone;
-    }
-
-    public void setEnterpriseLiablePhone(String enterpriseLiablePhone) {
-        this.enterpriseLiablePhone = enterpriseLiablePhone;
-    }
-
-    public String getLegalPersonIdFrontPic() {
-        return legalPersonIdFrontPic;
-    }
-
-    public void setLegalPersonIdFrontPic(String legalPersonIdFrontPic) {
-        this.legalPersonIdFrontPic = legalPersonIdFrontPic;
-    }
-
-    public String getLegalPersonIdReversePic() {
-        return legalPersonIdReversePic;
-    }
-
-    public void setLegalPersonIdReversePic(String legalPersonIdReversePic) {
-        this.legalPersonIdReversePic = legalPersonIdReversePic;
-    }
-
-    public String getContacts() {
-        return contacts;
-    }
-
-    public void setContacts(String contacts) {
-        this.contacts = contacts;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getTsignPic() {
-        return tsignPic;
-    }
-
-    public void setTsignPic(String tsignPic) {
-        this.tsignPic = tsignPic;
-    }
-
-    public String getTaxRegisterPic() {
-        return taxRegisterPic;
-    }
-
-    public void setTaxRegisterPic(String taxRegisterPic) {
-        this.taxRegisterPic = taxRegisterPic;
-    }
-
-    public String getCompanyAccountInfoPic() {
-        return companyAccountInfoPic;
-    }
-
-    public void setCompanyAccountInfoPic(String companyAccountInfoPic) {
-        this.companyAccountInfoPic = companyAccountInfoPic;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getCorporateChops() {
-        return corporateChops;
-    }
-
-    public void setCorporateChops(String corporateChops) {
-        this.corporateChops = corporateChops;
-    }
-
-    public String getCorporateFinanceChops() {
-        return corporateFinanceChops;
-    }
-
-    public void setCorporateFinanceChops(String corporateFinanceChops) {
-        this.corporateFinanceChops = corporateFinanceChops;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getCreatedTime() {
-        return createdTime;
-    }
-
-    public void setCreatedTime(Date createdTime) {
-        this.createdTime = createdTime;
-    }
-
-    public Integer getProvinceId() {
-        return provinceId;
-    }
-
-    public void setProvinceId(Integer provinceId) {
-        this.provinceId = provinceId;
-    }
-
-    public String getProvinceName() {
-        return provinceName;
-    }
-
-    public void setProvinceName(String provinceName) {
-        this.provinceName = provinceName;
-    }
-
 }
 

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

@@ -71,4 +71,6 @@ public interface TenantInfoService extends IService<TenantInfo> {
     void updatePhone(String newPhone, String oldPhone);
 
     void checkTenantState();
+
+    void deleteTenantInfo(Integer id);
 }

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

@@ -1251,6 +1251,15 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         });
     }
 
+    @Override
+    public void deleteTenantInfo(Integer id) {
+        TenantInfo tenantInfo = baseMapper.selectById(id);
+        if (tenantInfo == null) {
+            throw new BizException("未查询到机构信息");
+        }
+        tenantInfo.setState(3);
+    }
+
     private void checkAndSend(int i) {
         Date now = LocalDate.now().toDate();
         Date expiryDate = DateUtils.addDays(now, i);

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

@@ -9,6 +9,7 @@
 		<result column="city_" property="city" />
 		<result column="linkman_" property="linkman" />
 		<result column="mobile_no_" property="mobileNo" />
+		<result column="del_flag_" property="delFlag" />
 		<result column="name_of_referrer_" property="nameOfReferrer" />
 		<result column="student_num_level_" property="studentNumLevel" />
 		<result column="create_time_" property="createTime" />
@@ -26,8 +27,7 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="TenantApply">
-		SELECT * FROM tenant_apply ORDER
-		BY id_
+		SELECT * FROM tenant_apply where del_flag_ = 0 ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->
@@ -80,6 +80,9 @@
             <if test="recommender != null">
                 recommender_ = #{recommender},
             </if>
+			<if test="delFlag != null">
+				del_flag_ = #{delFlag},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -91,6 +94,7 @@
 
 	<sql id="queryPageCondition">
 		<where>
+			del_flag_ = 0
 			<if test="name != null and name != ''">
 				AND name_ LIKE CONCAT('%', #{name}, '%')
 			</if>

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

@@ -19,6 +19,7 @@
         <result column="data_source_" jdbcType="VARCHAR" property="dataSource"/>
         <result column="pay_state_" jdbcType="INTEGER" property="payState"/>
         <result column="state_" jdbcType="INTEGER" property="state"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="user_id_" jdbcType="INTEGER" property="userId"/>
         <result column="recommender_" jdbcType="INTEGER" property="recommender"/>
         <result column="created_by_" jdbcType="INTEGER" property="createdBy"/>
@@ -110,6 +111,7 @@
         group by tenant_id_
         ) as st on a.id_ = st.tenant_id_
         <where>
+            a.`del_flag_` = 0
             <if test="param.search != null ">
                 AND (
                 a.`id_` LIKE CONCAT('%', #{param.search},'%')

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

@@ -25,6 +25,7 @@
         <result column="corporate_chops_" jdbcType="VARCHAR" property="corporateChops"/>
         <result column="corporate_finance_chops_" jdbcType="VARCHAR" property="corporateFinanceChops"/>
         <result column="state_" jdbcType="INTEGER" property="state"/>
+        <result column="del_flag_" property="delFlag"/>
         <result column="created_time_" jdbcType="TIMESTAMP" property="createdTime"/>
         <result column="province_id_" jdbcType="INTEGER" property="provinceId"/>
         <result column="province_name_" jdbcType="VARCHAR" property="provinceName"/>
@@ -96,6 +97,7 @@
         FROM tenant_pre_join as a
         left join sys_user as b on a.recommender_ = b.id_
         <where>
+            a.del_flag_ = 0
             <if test="param.recommender != null">
                 AND a.recommender_ = #{param.recommender}
             </if>