Merge remote-tracking branch 'origin/saas' into saas

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.SysManual;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * (SysManual)表数据库访问层
@@ -16,5 +17,8 @@ public interface SysManualDao extends BaseMapper<SysManual> {
 
     int insertBatch(@Param("entities") List<SysManual> entities);
 
+    int findRecordCount(Map<String, Object> params);
+
+    List<SysManual> queryRecord(Map<String, Object> params);
 }
 

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

@@ -9,6 +9,7 @@ import java.util.Date;
 import java.util.List;
 
 public class MusicGroupPaymentBaseCalender {
+	private Long calenderId;
 
 	@ApiModelProperty(value = "乐团编号", required = true)
 	private String musicGroupId;
@@ -50,6 +51,14 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "进行中加学员拓展信息", required = false)
 	private CalenderAddStudent calenderAddStudent;
 
+	public Long getCalenderId() {
+		return calenderId;
+	}
+
+	public void setCalenderId(Long calenderId) {
+		this.calenderId = calenderId;
+	}
+
 	public CalenderAddStudent getCalenderAddStudent() {
 		return calenderAddStudent;
 	}

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

@@ -55,6 +55,17 @@ public class SysManual implements Serializable {
     @ApiModelProperty(value = "操作人")
     private Integer operatorId;
 
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    @ApiModelProperty(value = "操作人名称")
+    private String operatorName;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {

mec-biz/src/main/java/com/ym/mec/biz/dal/page/TeacherQueryInfo.java

@@ -1,9 +1,8 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.List;
+import com.ym.mec.common.page.QueryInfo;
 
 public class TeacherQueryInfo extends QueryInfo {
 
@@ -22,9 +21,6 @@ public class TeacherQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "账号状态")
     private String lockFlag;
 
-    @ApiModelProperty(value = "1内2外")
-    private Integer tenantId;
-    
     @ApiModelProperty(value = "是否支持额外陪练课授课")
     private Boolean isSupportExtraPracticeLesson;
 
@@ -39,14 +35,6 @@ public class TeacherQueryInfo extends QueryInfo {
         this.isSettlementSalary = isSettlementSalary;
     }
 
-    public Integer getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Integer tenantId) {
-        this.tenantId = tenantId;
-    }
-
     public Integer getSubjectId() {
         return subjectId;
     }

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

@@ -183,4 +183,13 @@ public interface MusicGroupPaymentCalenderService extends BaseService<Long, Musi
 	List<MusicGroupPaymentCalender> findByBatchNo(String batchNo);
 
 	PageInfo<MusicGroupPaymentCalenderResultDto> queryCalenderPage(MusicGroupPaymentCalenderQueryInfo queryInfo);
+
+	/**
+	* @description: 新版修改缴费项目，先删除原有的缴费项目，再重新生成
+	 * @param musicGroupPaymentBaseCalender
+	* @return java.lang.String
+	* @author zx
+	* @date 2021/12/27 20:43
+	*/
+    String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender);
 }

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

@@ -401,6 +401,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			musicGroupPaymentCalender.setCreateTime(date);
 			musicGroupPaymentCalender.setUpdateTime(date);
 			musicGroupPaymentCalender.setStatus(status);
+			musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
 			//缴费截止日期默认三天后
 			if (musicGroupPaymentCalender.getDeadlinePaymentDate() == null && payUserType == PayUserType.STUDENT) {
@@ -608,6 +609,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalender.setCurrentTotalAmount(currentTotalAmount);
 		musicGroupPaymentCalender.setOriginalTotalAmount(originalTotalAmount);
 		musicGroupPaymentCalender.setStatus(status);
+		musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
 		if (musicGroupPaymentCalender.getStatus() != AUDITING) {
 			if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
@@ -1648,7 +1650,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			pageInfo.setTotal(count);
 			params.put("offset", pageInfo.getOffset());
 			dataList = musicGroupPaymentCalenderDao.queryCalenderPage(params);
-			List<Integer> organIdList = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toList());
+			Set<Integer> organIdList = dataList.stream().map(e -> e.getOrganId()).collect(Collectors.toSet());
 			Map<Integer, String> organNameMap = getMap("organization", "id_", "name_", organIdList, Integer.class, String.class);
 			List<Integer> operatorIds = dataList.stream().map(e -> e.getOperator()).collect(Collectors.toList());
 			operatorIds.removeAll(Collections.singleton(null));
@@ -1665,7 +1667,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		return pageInfo;
 	}
 
-	@Override
+    @Override
+	@Transactional(rollbackFor = Exception.class)
+    public String merge1(MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+		del(musicGroupPaymentBaseCalender.getCalenderId());
+		return create1(musicGroupPaymentBaseCalender);
+    }
+
+    @Override
 	@Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
 	public boolean autoUpdateMusicGroupPaymentCalenderStatus() {
 		Date date = new Date();
@@ -1741,11 +1750,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		//缴费项目中没有学生即可删除缴费项目
 		List<MusicGroupPaymentCalenderDetail> musicGroupPaymentCalenderDetailList = musicGroupPaymentCalenderDetailDao.queryByCalenderId(id, null);
 		if (musicGroupPaymentCalenderDetailList != null && musicGroupPaymentCalenderDetailList.size() > 0) {
-			throw new BizException("缴费项目中已存在学员，不能删除");
+			throw new BizException("操作失败：缴费项目中已存在学员");
 		}
 		MusicGroupStudentClassAdjust byBatchNo = musicGroupStudentClassAdjustDao.findByBatchNo(calender.getBatchNo());
 		if(byBatchNo != null){
-			throw new BizException("删除失败,班级调整的缴费项目不允许删除");
+			throw new BizException("操作失败：班级调整的缴费项目不支持");
 		}
 
 		if (calender.getPaymentType() == PaymentType.MUSIC_APPLY) {
@@ -1753,7 +1762,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			List<StudentPaymentOrder> studentPaymentOrderList = studentPaymentOrderDao.queryByDealStatus(calender.getMusicGroupId(), OrderTypeEnum.APPLY,
 					DealStatusEnum.ING);
 			if (studentPaymentOrderList != null && studentPaymentOrderList.size() > 0) {
-				throw new BizException("存在缴费中的学生，不能删除");
+				throw new BizException("操作失败：存在缴费中的学生");
 			}
 		}
 		

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

@@ -4,19 +4,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.biz.dal.dao.SysManualDao;
+import com.ym.mec.biz.dal.entity.CloudTeacherStudent;
+import com.ym.mec.biz.dal.entity.SysConfig;
 import com.ym.mec.biz.dal.entity.SysManual;
 import com.ym.mec.biz.dal.page.SysManualQueryInfo;
 import com.ym.mec.biz.service.SysManualService;
+import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.PageUtil;
 import com.ym.mec.common.page.WrapperUtil;
+import com.ym.mec.util.collection.MapUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Date;
+import java.util.*;
 
 /**
  * (SysManual)表服务实现类
@@ -29,11 +33,26 @@ public class SysManualServiceImpl extends ServiceImpl<SysManualDao, SysManual> i
 
     private final static Logger logger = LoggerFactory.getLogger(SysManualServiceImpl.class);
 
+    @Autowired
+    private SysManualDao sysManualDao;
+
     public PageInfo<SysManual> query(SysManualQueryInfo queryInfo) {
-        QueryWrapper<SysManual> queryWrapper = new WrapperUtil<SysManual>().hasEq("menu_id_", queryInfo.getMenuId()).queryWrapper();
-        Page<SysManual> pageInfo = PageUtil.getPage(queryInfo.getPage(), queryInfo.getRows());
+        PageInfo<SysManual> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+        Map<String, Object> params = new HashMap<>();
+        MapUtil.populateMap(params, queryInfo);
+        List<SysManual> dataList = null;
+        int count = sysManualDao.findRecordCount(params);
+        if (count > 0) {
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = sysManualDao.queryRecord(params);
+        }
+        if (count == 0) {
+            dataList = new ArrayList<>();
+        }
+        pageInfo.setRows(dataList);
 
-        return PageUtil.pageInfo(this.page(pageInfo, queryWrapper));
+        return pageInfo;
     }
 
     public Boolean add(SysManual sysManual, Integer userId) {

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

@@ -87,10 +87,13 @@
 
   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
           parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderActivity">
-    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,original_amount_, create_time_, update_time_, tenant_id_)    values
+    insert into music_group_payment_calender_activity(activity_id_, calender_id_, optional_flag_, actual_amount_ ,
+    original_amount_, create_time_, update_time_, tenant_id_)
+    VALUE
     <foreach collection="calenderActivityList" item="entity" separator=",">
-#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
-      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})    </foreach>
+      (#{entity.activityId}, #{entity.calenderId}, #{entity.optionalFlag}, #{entity.actualAmount},
+      #{entity.originalAmount}, NOW(), NOW(),#{entity.tenantId})
+    </foreach>
   </insert>
   <delete id="delByCalenderId">
     DELETE FROM music_group_payment_calender_activity WHERE calender_id_ = #{calenderId}

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ym.mec.biz.dal.dao.SysManualDao">
+  <resultMap id="BaseResultMap" type="com.ym.mec.biz.dal.entity.SysManual">
+                       <id column="id_" jdbcType="INTEGER" property="id"/>
+                                  <result column="menu_id_" jdbcType="INTEGER" property="menuId"/>
+                                  <result column="name_" jdbcType="VARCHAR" property="name"/>
+                                  <result column="op_flow_" jdbcType="VARCHAR" property="opFlow"/>
+                                  <result column="fun_rule_" jdbcType="VARCHAR" property="funRule"/>
+                                  <result column="video_url_" jdbcType="VARCHAR" property="videoUrl"/>
+                                  <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
+                                  <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+                                  <result column="operator_id_" jdbcType="INTEGER" property="operatorId"/>
+                </resultMap>
+  
+  <sql id="Base_Column_List">    
+                                                id_, menu_id_, name_, op_flow_, fun_rule_, video_url_, create_time_, update_time_, operator_id_
+  </sql>
+  
+   <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ym.mec.biz.dal.entity.SysManual">
+       insert into sys_manual(menu_id_, name_, op_flow_, fun_rule_, video_url_, create_time_, update_time_, operator_id_)
+       values
+       <foreach collection="entities" item="entity" separator=",">
+       (#{entity.menuId}, #{entity.name}, #{entity.opFlow}, #{entity.funRule}, #{entity.videoUrl}, #{entity.createTime}, #{entity.updateTime}, #{entity.operatorId})
+       </foreach>
+   </insert>
+    <select id="findRecordCount" resultType="java.lang.Integer">
+        select count(1) from sys_manual sm
+        left join sys_user u on sm.operator_id_ = u.id_
+        <where>
+            1 = 1 AND
+            <if test="menuId != null and menuId != '' ">
+                menu_id_ = #{menuId}
+            </if>
+            <if test="search != null and search != '' ">
+                (name_ like concat('%', #{menuId} '%') )
+            </if>
+        </where>
+        <include refid="global.limit"/>
+    </select>
+
+    <select id="queryRecord" resultType="com.ym.mec.biz.dal.entity.SysManual">
+        select sm.*
+             , u.username_ as operatorName from sys_manual sm
+        left join sys_user u on sm.operator_id_ = u.id_
+        <where>
+            1 = 1 AND
+            <if test="menuId != null and menuId != '' ">
+                sm.menu_id_ = #{menuId}
+            </if>
+            <if test="search != null and search != '' ">
+                (name_ like concat('%', #{menuId} '%') )
+            </if>
+        </where>
+        <include refid="global.limit"/>
+    </select>
+
+</mapper>

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

@@ -41,7 +41,7 @@
     	INSERT INTO teacher_default_practice_group_salary
 		(id_,user_id_,minutes_,main_teacher_salary_,assistant_teacher_salary_,create_time_,update_time_,tenant_id_)
 		<foreach collection="list" item="item" separator=",">
-			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now(),#{tenantId})
+			VALUES(#{item.id},#{item.userId},#{item.minutes},#{item.mainTeacherSalary},#{item.assistantTeacherSalary},now(),now(),#{item.tenantId})
 		</foreach>
     </insert>
 

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

@@ -78,6 +78,16 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         return succeed(map);
     }
 
+    @ApiOperation(value = "修改乐团缴费日历")
+    @PostMapping(value = "/updateCalender", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/updateCalender')")
+    public Object updateCalender(@RequestBody MusicGroupPaymentBaseCalender musicGroupPaymentBaseCalender) {
+    	String batchNo = musicGroupPaymentCalenderService.merge1(musicGroupPaymentBaseCalender);
+        ModelMap map = new ModelMap(1);
+        map.put("musicGroupPaymentCalenderBatchNo", batchNo);
+        return succeed(map);
+    }
+
     @ApiOperation(value = "待审核的缴费项目撤回")
     @PostMapping(value = "/revoke")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalender/revoke')")