管乐迷需求集合

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

@@ -3,7 +3,9 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import com.ym.mec.common.entity.BaseEntity;
 
+import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -14,7 +16,8 @@ import static com.ym.mec.biz.dal.enums.PeriodEnum.MONTH;
 /**
  * 对应数据库表(vip_group_activity):
  */
-public class VipGroupActivity extends BaseEntity {
+@Data
+public class VipGroupActivity{
 
 	@ApiModelProperty(value = "活动编号")
 	private Integer id;
@@ -49,6 +52,9 @@ public class VipGroupActivity extends BaseEntity {
 	@ApiModelProperty(value = "适用分部")
 	private String organId;
 
+	@ApiModelProperty(value = "适用分部")
+	private String organName;
+
 	@ApiModelProperty(value = "可排课开始时间")
 	private java.util.Date coursesStartTime;
 
@@ -174,435 +180,5 @@ public class VipGroupActivity extends BaseEntity {
 	@ApiModelProperty(value = "单价")
 	private BigDecimal singlePrice;
 
-	public String getActivityTypeEnum() {
-		return activityTypeEnum;
-	}
-
-	public void setActivityTypeEnum(String activityTypeEnum) {
-		this.activityTypeEnum = activityTypeEnum;
-	}
-
-	public BigDecimal getSinglePrice() {
-		return singlePrice;
-	}
-
-	public void setSinglePrice(BigDecimal singlePrice) {
-		this.singlePrice = singlePrice;
-	}
-
-	public Integer getGiveCouponId() {
-		return giveCouponId;
-	}
-
-	public void setGiveCouponId(Integer giveCouponId) {
-		this.giveCouponId = giveCouponId;
-	}
-
-	public Integer getGiveCouponNum() {
-		return giveCouponNum;
-	}
-
-	public void setGiveCouponNum(Integer giveCouponNum) {
-		this.giveCouponNum = giveCouponNum;
-	}
-
-	public BigDecimal getOriginalPrice() {
-		return originalPrice;
-	}
-
-	public void setOriginalPrice(BigDecimal originalPrice) {
-		this.originalPrice = originalPrice;
-	}
-
-	public Integer getActivityChannel() {
-		return activityChannel;
-	}
-
-	public void setActivityChannel(Integer activityChannel) {
-		this.activityChannel = activityChannel;
-	}
-
-	public Integer getCode() {
-		return code;
-	}
-
-	public void setCode(Integer code) {
-		this.code = code;
-	}
-
-	public Integer getGivePrizeNum() {
-		return givePrizeNum;
-	}
-
-	public void setGivePrizeNum(Integer givePrizeNum) {
-		this.givePrizeNum = givePrizeNum;
-	}
-
-	public Integer getGiveAllowOnlineToOffline() {
-		return giveAllowOnlineToOffline;
-	}
-
-	public void setGiveAllowOnlineToOffline(Integer giveAllowOnlineToOffline) {
-		this.giveAllowOnlineToOffline = giveAllowOnlineToOffline;
-	}
-
-	public BigDecimal getMarketPrice() {
-		return marketPrice;
-	}
-
-	public void setMarketPrice(BigDecimal marketPrice) {
-		this.marketPrice = marketPrice;
-	}
-
-	public Integer getGiveCategoryNum() {
-		return giveCategoryNum;
-	}
-
-	public void setGiveCategoryNum(Integer giveCategoryNum) {
-		this.giveCategoryNum = giveCategoryNum;
-	}
-
-	public Integer getVipGroupCategoryNum() {
-		return vipGroupCategoryNum;
-	}
-
-	public void setVipGroupCategoryNum(Integer vipGroupCategoryNum) {
-		this.vipGroupCategoryNum = vipGroupCategoryNum;
-	}
-
-	public String getGiveCategoryName() {
-		return giveCategoryName;
-	}
-
-	public void setGiveCategoryName(String giveCategoryName) {
-		this.giveCategoryName = giveCategoryName;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Integer getActivityType() {
-		return activityType;
-	}
-
-	public void setActivityType(Integer activityType) {
-		this.activityType = activityType;
-	}
-
-	public Integer getSingleCourseTime() {
-		return singleCourseTime;
-	}
-
-	public void setSingleCourseTime(Integer singleCourseTime) {
-		this.singleCourseTime = singleCourseTime;
-	}
-
-	public Integer getGiveSingleCourseTime() {
-		return giveSingleCourseTime;
-	}
-
-	public void setGiveSingleCourseTime(Integer giveSingleCourseTime) {
-		this.giveSingleCourseTime = giveSingleCourseTime;
-	}
-
-	public String getDescription() {
-		return description;
-	}
-
-	public void setDescription(String description) {
-		this.description = description;
-	}
-
-	public String getVipGroupCategoryIdList() {
-		return vipGroupCategoryIdList;
-	}
-
-	public void setVipGroupCategoryIdList(String vipGroupCategoryIdList) {
-		this.vipGroupCategoryIdList = vipGroupCategoryIdList;
-	}
-
-	public Date getStartTime() {
-		return startTime;
-	}
-
-	public void setStartTime(Date startTime) {
-		this.startTime = startTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getOrganId() {
-		return organId;
-	}
-
-	public void setOrganId(String organId) {
-		this.organId = organId;
-	}
-
-	public Date getCoursesStartTime() {
-		return coursesStartTime;
-	}
-
-	public void setCoursesStartTime(Date coursesStartTime) {
-		this.coursesStartTime = coursesStartTime;
-	}
-
-	public Date getCoursesEndTime() {
-		return coursesEndTime;
-	}
-
-	public void setCoursesEndTime(Date coursesEndTime) {
-		this.coursesEndTime = coursesEndTime;
-	}
-
-	public BigDecimal getDiscount() {
-		return discount;
-	}
-
-	public void setDiscount(BigDecimal discount) {
-		this.discount = discount;
-	}
-
-	public Integer getFullMinusCourseTimes() {
-		return fullMinusCourseTimes;
-	}
-
-	public void setFullMinusCourseTimes(Integer fullMinusCourseTimes) {
-		this.fullMinusCourseTimes = fullMinusCourseTimes;
-	}
-
-	public String getGiveCourseType() {
-		return giveCourseType;
-	}
-
-	public void setGiveCourseType(String giveCourseType) {
-		this.giveCourseType = giveCourseType;
-	}
-
-	public String getCourseType() {
-		return courseType;
-	}
-
-	public void setCourseType(String courseType) {
-		this.courseType = courseType;
-	}
-
-	public String getGiveCategoryId() {
-		return giveCategoryId;
-	}
-
-	public void setGiveCategoryId(String giveCategoryId) {
-		this.giveCategoryId = giveCategoryId;
-	}
-
-	public Integer getGiveCourseNum() {
-		return giveCourseNum;
-	}
-
-	public void setGiveCourseNum(Integer giveCourseNum) {
-		this.giveCourseNum = giveCourseNum;
-	}
-
-	public Integer getMemberRankId() {
-		return memberRankId;
-	}
-
-	public void setMemberRankId(Integer memberRankId) {
-		this.memberRankId = memberRankId;
-	}
-
-	public Integer getMemberTime() {
-		return memberTime;
-	}
-
-	public void setMemberTime(Integer memberTime) {
-		this.memberTime = memberTime;
-	}
-
-	public Integer getGiveMemberRankId() {
-		return giveMemberRankId;
-	}
-
-	public void setGiveMemberRankId(Integer giveMemberRankId) {
-		this.giveMemberRankId = giveMemberRankId;
-	}
-
-	public Integer getGiveMemberTime() {
-		return giveMemberTime;
-	}
-
-	public void setGiveMemberTime(Integer giveMemberTime) {
-		this.giveMemberTime = giveMemberTime;
-	}
-
-	public boolean isPayToBalance() {
-		return isPayToBalance;
-	}
-
-	public void setPayToBalance(boolean payToBalance) {
-		isPayToBalance = payToBalance;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public String getSalarySettlementJson() {
-		return salarySettlementJson;
-	}
-
-	public void setSalarySettlementJson(String salarySettlementJson) {
-		this.salarySettlementJson = salarySettlementJson;
-	}
-
-	public String getVipGroupCategoryNames() {
-		return vipGroupCategoryNames;
-	}
-
-	public void setVipGroupCategoryNames(String vipGroupCategoryNames) {
-		this.vipGroupCategoryNames = vipGroupCategoryNames;
-	}
-
-	public Boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(Boolean delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public Integer getOnlineClassJoinGradientRewards() {
-		return onlineClassJoinGradientRewards;
-	}
-
-	public void setOnlineClassJoinGradientRewards(Integer onlineClassJoinGradientRewards) {
-		this.onlineClassJoinGradientRewards = onlineClassJoinGradientRewards;
-	}
-
-	public Integer getOfflineClassJoinGradientRewards() {
-		return offlineClassJoinGradientRewards;
-	}
-
-	public void setOfflineClassJoinGradientRewards(Integer offlineClassJoinGradientRewards) {
-		this.offlineClassJoinGradientRewards = offlineClassJoinGradientRewards;
-	}
-
-	public Integer getMinCourseNum() {
-		return minCourseNum;
-	}
-
-	public void setMinCourseNum(Integer minCourseNum) {
-		this.minCourseNum = minCourseNum;
-	}
-
-	public Integer getMaxCourseNum() {
-		return maxCourseNum;
-	}
-
-	public void setMaxCourseNum(Integer maxCourseNum) {
-		this.maxCourseNum = maxCourseNum;
-	}
-
-	public Integer getStudentMaxUsedTimes() {
-		return studentMaxUsedTimes;
-	}
-
-	public void setStudentMaxUsedTimes(Integer studentMaxUsedTimes) {
-		this.studentMaxUsedTimes = studentMaxUsedTimes;
-	}
-
-	public String getApplyToStudentType() {
-		return applyToStudentType;
-	}
-
-	public void setApplyToStudentType(String applyToStudentType) {
-		this.applyToStudentType = applyToStudentType;
-	}
-
-	public Integer getAllowOnlineToOffline() {
-		return allowOnlineToOffline;
-	}
-
-	public void setAllowOnlineToOffline(Integer allowOnlineToOffline) {
-		this.allowOnlineToOffline = allowOnlineToOffline;
-	}
-
-	public Integer getTeachMode() {
-		return teachMode;
-	}
-
-	public void setTeachMode(Integer teachMode) {
-		this.teachMode = teachMode;
-	}
-
-	public Integer getGiveTeachMode() {
-		return giveTeachMode;
-	}
-
-	public void setGiveTeachMode(Integer giveTeachMode) {
-		this.giveTeachMode = giveTeachMode;
-	}
-
-	public PeriodEnum getPeriodEnum() {
-		return periodEnum;
-	}
-
-	public void setPeriodEnum(PeriodEnum periodEnum) {
-		this.periodEnum = periodEnum;
-	}
-
-	public PeriodEnum getGivePeriodEnum() {
-		return givePeriodEnum;
-	}
-
-	public void setGivePeriodEnum(PeriodEnum givePeriodEnum) {
-		this.givePeriodEnum = givePeriodEnum;
-	}
+	private Integer tenantId = TenantContextHolder.getTenantId();
 }

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

@@ -15,6 +15,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 public interface VipGroupActivityService extends BaseService<Integer, VipGroupActivity> {
+    PageInfo<VipGroupActivity> queryPage(VipGroupActivityQueryInfo queryInfo);
 
     VipGroupActivityDao getDao();
 

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

@@ -23,7 +23,6 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.string.MessageFormatter;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -124,6 +123,47 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
         return vipGroupActivityDao;
     }
 
+	@Override
+	public PageInfo<VipGroupActivity> queryPage(VipGroupActivityQueryInfo queryInfo){
+		PageInfo<VipGroupActivity> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<VipGroupActivity> dataList = null;
+		int count = this.findCount(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = this.getDAO().queryPage(params);
+			String organIds = dataList.stream().map(e -> e.getOrganId()).filter(e -> StringUtils.isNotEmpty(e)).collect(Collectors.joining(","));
+			Set<Integer> organIdList = Arrays.stream(organIds.split(",")).map(e -> Integer.parseInt(e)).collect(Collectors.toSet());
+			Map<Integer, String> organNameMap = new HashMap<>();
+			if(!CollectionUtils.isEmpty(organIdList)){
+				organNameMap = this.getMap("organization", "id_", "name_", organIdList, queryInfo.getTenantId(), Integer.class, String.class);
+			}
+			for (VipGroupActivity activity : dataList) {
+				if(StringUtils.isNotEmpty(activity.getOrganId())){
+					StringBuffer sb = new StringBuffer();
+					for (String organId : activity.getOrganId().split(",")) {
+						String s = organNameMap.get(Integer.parseInt(organId));
+						if(StringUtils.isNotEmpty(s)){
+							if(sb.length() > 0){
+								sb.append(",");
+							}
+							sb.append(s);
+						}
+					}
+					activity.setOrganName(sb.toString());
+				}
+			}
+		}
+		if (count == 0) {
+			dataList = new ArrayList<>();
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+	}
+
     @Override
 	public VipGroupActivityAddDto addVipGroupActivity(VipGroupActivityAddDto vipGroupActivityAddDto) {
 
@@ -183,6 +223,7 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 			throw new BizException("活动不存在!");
 		}
 		if("PROGRESS".equals(oldVipGroupActivity.getStatus())){
+			oldVipGroupActivity.setOrganId(vipGroupActivityAddDto.getOrganId());
 			oldVipGroupActivity.setCoursesStartTime(vipGroupActivityAddDto.getCoursesStartTime());
 			oldVipGroupActivity.setCoursesEndTime(vipGroupActivityAddDto.getCoursesEndTime());
 			oldVipGroupActivity.setStartTime(vipGroupActivityAddDto.getStartTime());

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

@@ -16,6 +16,7 @@ import com.ym.mec.biz.service.StudentManageService;
 import com.ym.mec.biz.service.SysEmployeePositionService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.tenant.TenantContextHolder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -63,7 +64,7 @@ public class EmployeeController extends BaseController {
     @ApiOperation(value = "根据部门获取下面的员工")
     @GetMapping("/queryEmployByOrganId")
     @PreAuthorize("@pcs.hasPermissions('employee/queryEmployByOrganId')")
-    public Object queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws Exception {
+    public HttpResponseResult<PageInfo> queryEmployByOrganId(EmployeeQueryInfo queryInfo) throws Exception {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(employeeService.queryEmployByOrganId(queryInfo));
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.biz.service.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
@@ -35,21 +36,18 @@ public class EmployeeInfoController extends BaseController {
     private EmployeeVisitService employeeVisitService;
 
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
 
 
     @ApiOperation(value = "新增员工信息")
     @PostMapping("/insert")
     @PreAuthorize("@pcs.hasPermissions('employeeInfo/insert')")
     public Object insert(@RequestBody EmployeeInfo employeeInfo) {
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
+        Integer userId = sysUserService.getUserId();
         EmployeeInfo info = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
 		if(info != null){
 		    if(employeeInfo.getCover()){
-                employeeInfo.setOperatorId(sysUser.getId());
+                employeeInfo.setOperatorId(userId);
                 employeeInfo.setId(info.getId());
                 Date date = new Date();
                 employeeInfo.setUpdateTime(date);
@@ -60,7 +58,7 @@ public class EmployeeInfoController extends BaseController {
                 return failed(HttpStatus.PARTIAL_CONTENT,"该手机号已在系统中，是否更新原有数据");
             }
         }
-		employeeInfo.setOperatorId(sysUser.getId());
+		employeeInfo.setOperatorId(userId);
     	Date date = new Date();
     	employeeInfo.setUpdateTime(date);
     	employeeInfo.setCreateTime(date);
@@ -72,15 +70,11 @@ public class EmployeeInfoController extends BaseController {
     @PostMapping("/update")
     @PreAuthorize("@pcs.hasPermissions('employeeInfo/update')")
     public Object update(@RequestBody EmployeeInfo employeeInfo) {
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
         EmployeeInfo info = employeeInfoService.findByPhone(employeeInfo.getMobileNo());
 		if(info != null && !info.getId().equals(employeeInfo.getId())){
             return failed("该手机号已存在");
         }
-		employeeInfo.setOperatorId(sysUser.getId());
+		employeeInfo.setOperatorId(sysUserService.getUserId());
     	Date date = new Date();
     	employeeInfo.setUpdateTime(date);
     	employeeInfoService.update(employeeInfo);
@@ -105,11 +99,7 @@ public class EmployeeInfoController extends BaseController {
     @PostMapping("/insertVisit")
     @PreAuthorize("@pcs.hasPermissions('employeeInfo/insertVisit')")
     public Object insertVisit(@RequestBody EmployeeVisit employeeVisit) {
-    	SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (sysUser == null) {
-			return failed("用户信息获取失败");
-		}
-		employeeVisit.setOperatorId(sysUser.getId());
+		employeeVisit.setOperatorId(sysUserService.getUserId());
     	Date date = new Date();
     	employeeVisit.setCreateTime(date);
     	employeeVisitService.insert(employeeVisit);

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

@@ -16,6 +16,7 @@ import com.ym.mec.biz.service.VipGroupActivityService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
@@ -114,7 +115,7 @@ public class VipGroupActivityController extends BaseController {
     @ApiOperation(value = "分页查询活动方案")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('vipGroupActivity/queryPage')")
-    public Object queryPage(VipGroupActivityQueryInfo queryInfo){
+    public HttpResponseResult<PageInfo<VipGroupActivity>> queryPage(VipGroupActivityQueryInfo queryInfo){
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         Integer applyToStudentType = queryInfo.getApplyToStudentType();
         if(applyToStudentType != null){