fengji #2193

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

@@ -36,4 +36,6 @@ public interface OrganizationCourseUnitPriceSettingsDao extends BaseDAO<Integer,
 	 * @return
 	 */
     List<Map<String, Integer>> queryMapByOrganIdAndChargeTypeId(@Param("chargeTypeId") Integer chargeTypeId, @Param("organId") Integer organId);
+
+    List<OrganizationCourseUnitPriceSettings> querySingle(@Param("organId")Integer organId, @Param("courseType") String courseType, @Param("tenantId") Integer tenantId);
 }

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

@@ -23,4 +23,6 @@ public interface OrganizationCourseUnitPriceSettingsService extends BaseService<
 	 * @return
 	 */
 	OrganizationCourseUnitPriceSettings queryByOrganIdAndCourseTypeAndChargeType(Integer organId, CourseScheduleType courseType, Integer chargeTypeId);
+
+	List<OrganizationCourseUnitPriceSettings> querySingle(Integer organId, String courseType, Integer tenantId);
 }

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

@@ -33,5 +33,10 @@ public class OrganizationCourseUnitPriceSettingsServiceImpl extends BaseServiceI
 	public OrganizationCourseUnitPriceSettings queryByOrganIdAndCourseTypeAndChargeType(Integer organId, CourseScheduleType courseType, Integer chargeTypeId) {
 		return organizationCourseUnitPriceSettingsDao.queryByOrganIdAndCourseTypeAndChargeType(organId, courseType, chargeTypeId);
 	}
-	
+
+	@Override
+	public List<OrganizationCourseUnitPriceSettings> querySingle(Integer organId, String courseType, Integer tenantId) {
+		return organizationCourseUnitPriceSettingsDao.querySingle(organId, courseType, tenantId);
+	}
+
 }

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

@@ -124,4 +124,10 @@
 		WHERE organ_id_ = #{organId} AND charge_type_id_ = #{chargeTypeId}
 		GROUP BY course_type_
 	</select>
+	<select id="querySingle" resultType="com.ym.mec.biz.dal.entity.OrganizationCourseUnitPriceSettings">
+		select * from organization_course_unit_price_settings where organ_id_ = #{organId} and course_type_ = #{courseType}
+		<if test="tenantId != -1">
+			and tenant_id_ = #{tenantId}
+		</if>
+	</select>
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.ym.mec.web.controller;
 
+import com.ym.mec.common.tenant.TenantContextHolder;
 import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -38,10 +39,22 @@ public class OrganizationCourseUnitPriceSettingsController extends BaseControlle
 		return succeed(organizationCourseUnitPriceSettingsService.queryPage(queryInfo));
 	}
 
+	@ApiOperation(value = "查询单个")
+	@GetMapping(value = "/querySingle/{organId}/{courseType}")
+	// @PreAuthorize("@pcs.hasPermissions('organizationCourseUnitPriceSettings/querySingle')")
+	public Object querySingle(@PathVariable("organId")Integer organId,
+							  @PathVariable("courseType")String courseType) {
+		Integer tenantId = TenantContextHolder.getTenantId();
+		return organizationCourseUnitPriceSettingsService.querySingle(organId, courseType, tenantId);
+	}
+
 	@ApiOperation(value = "新增对象")
 	@PostMapping(value = "/insert", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 	@PreAuthorize("@pcs.hasPermissions('organizationCourseUnitPriceSettings/insert')")
 	public Object insert(@RequestBody List<OrganizationCourseUnitPriceSettings> organizationCourseUnitPriceSettingsList) {
+		if (organizationCourseUnitPriceSettingsList.size() == 0) {
+			return failed("OrganizationCourseUnitPriceSettings 参数不能为空");
+		}
 		for (OrganizationCourseUnitPriceSettings organizationCourseUnitPriceSettings : organizationCourseUnitPriceSettingsList) {
 			OrganizationCourseUnitPriceSettings originalObj = organizationCourseUnitPriceSettingsService.queryByOrganIdAndCourseTypeAndChargeType(
 					organizationCourseUnitPriceSettings.getOrganId(), organizationCourseUnitPriceSettings.getCourseType(),