团练宝审核

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

@@ -17,7 +17,7 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 
 	/**  */
 	private Long id;
-	
+
 	/** 会员名称 */
 	private String name;
 	
@@ -25,13 +25,13 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 	private String remark;
 	
 	/** 会员数量 */
-	private BigDecimal memberNum = BigDecimal.ZERO;
+	private BigDecimal memberNum;
 
 	/** 云教练描述 */
 	private String memberIntro;
 	
 	/** 缴费项目总人数 */
-	private Integer userNum = 0;
+	private Integer userNum;
 	
 	/** 已缴费人数 */
 	private Integer paymentUserNum = 0;
@@ -64,6 +64,8 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 
 	private Integer organId;
 
+	private String organName;
+
 	private List<Integer> userIds;
 
 	@ApiModelProperty(value = "审核备注", required = false)
@@ -100,6 +102,14 @@ public class CloudCoachPaymentProgram extends BaseEntity {
 		}
 	}
 
+	public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
 	public Integer getAudit() {
 		return audit;
 	}

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.page;
 import com.ym.mec.common.page.QueryInfo;
 
 public class CloudCoachPaymentProgramQueryInfo extends QueryInfo {
+    private String organId;
 
     private String period;
 
@@ -12,6 +13,14 @@ public class CloudCoachPaymentProgramQueryInfo extends QueryInfo {
 
     private String status;
 
+    public String getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(String organId) {
+        this.organId = organId;
+    }
+
     public String getStatus() {
         return status;
     }

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

@@ -90,14 +90,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
     @Autowired
     private SysMessageService sysMessageService;
     @Autowired
-    private SysConfigDao sysConfigDao;
-    @Autowired
     private SysTenantConfigService sysTenantConfigService;
     @Autowired
     private SchoolDao schoolDao;
     @Autowired
-    private SysConfigService sysConfigService;
-    @Autowired
     private TeacherAttendanceDao teacherAttendanceDao;
     @Autowired
     private StudentDao studentDao;

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

@@ -25,6 +25,8 @@
 		<result column="audit_" property="audit" />
 		<result column="audit_name_" property="auditName" />
 		<result column="audit_time_" property="auditTime" />
+		<result column="organ_id_" property="organId" />
+		<result column="organ_name_" property="organName" />
 		<result column="status_" property="status" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
@@ -42,10 +44,10 @@
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CloudCoachPaymentProgram" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO cloud_coach_payment_program (name_,remark_,member_num_,user_num_,
 		payment_user_num_,period_,member_rank_setting_id_,actual_amount_,original_amount_,
-		operator_,create_time_,update_time_,tenant_id_,memo_,status_)
+		operator_,create_time_,update_time_,tenant_id_,memo_,status_,organ_id_)
 		VALUES(#{name},#{remark},#{memberNum},#{userNum},#{paymentUserNum},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
 		#{memberRankSettingId},#{actualAmount},#{originalAmount},#{operator},
-		NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler})
+		NOW(),NOW(),#{tenantId},#{memo},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{organId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -57,6 +59,9 @@
 		<if test="memo != null">
 			memo_ = #{memo},
 		</if>
+		<if test="organId != null">
+			organ_id_ = #{organId},
+		</if>
 		<if test="audit != null">
 			audit_ = #{audit},
 		</if>
@@ -109,6 +114,9 @@
 
 	<sql id="queryPageSql">
 		<where>
+			<if test="organId != null and organId != ''">
+				AND FIND_IN_SET(ccpp.organ_id_,#{organId})
+			</if>
 			<if test="tenantId != null">
 				AND ccpp.tenant_id_ = #{tenantId}
 			</if>
@@ -129,7 +137,9 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="CloudCoachPaymentProgram" parameterType="map">
-		SELECT ccpp.*,su.real_name_ operator_name_,su1.real_name_ audit_name_ FROM cloud_coach_payment_program ccpp
+		SELECT ccpp.*,su.real_name_ operator_name_,su1.real_name_ audit_name_,o.name_ organ_name_
+		FROM cloud_coach_payment_program ccpp
+		LEFT JOIN organization o ON o.id_ = ccpp.organ_id_
 		LEFT JOIN sys_user su ON su.id_ = ccpp.operator_
 		LEFT JOIN sys_user su1 ON su1.id_ = ccpp.audit_
 		<include refid="queryPageSql"/>
@@ -140,6 +150,7 @@
 	<!-- 查询当前表的总记录数 -->
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(DISTINCT ccpp.id_) FROM cloud_coach_payment_program ccpp
+		LEFT JOIN organization o ON o.id_ = ccpp.organ_id_
 		<include refid="queryPageSql"/>
 	</select>
 	<select id="getLock" resultMap="CloudCoachPaymentProgram">

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

@@ -5,6 +5,7 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.CloudCoachPaymentProgram;
 import com.ym.mec.biz.dal.page.CloudCoachPaymentProgramQueryInfo;
 import com.ym.mec.biz.service.CloudCoachPaymentProgramService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,8 @@ public class CloudCoachPaymentProgramController extends BaseController {
     private CloudCoachPaymentProgramService cloudCoachPaymentProgramService;
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "新增")
     @PostMapping("/add")
@@ -52,6 +55,7 @@ public class CloudCoachPaymentProgramController extends BaseController {
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('cloudCoachPaymentProgram/queryPage')")
     public Object queryPage(CloudCoachPaymentProgramQueryInfo queryInfo){
+        queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         return succeed(cloudCoachPaymentProgramService.queryPage(queryInfo));
     }
 }