Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -5,6 +5,8 @@ import com.ym.mec.biz.dal.entity.SysTenantAccountDetail.TransType;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Date;
+
 public class TenantAccountDetailQueryInfo extends QueryInfo {
 
 	@ApiModelProperty(value = "类型",required = false)
@@ -15,10 +17,10 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 	private Integer userId;
 
 	@ApiModelProperty(value = "开始时间",required = false)
-	private String startTime;
+	private Date startTime;
 
 	@ApiModelProperty(value = "结束时间",required = false)
-	private String endTime;
+	private Date endTime;
 
 	public TransType getTransType() {
 		return transType;
@@ -44,19 +46,19 @@ public class TenantAccountDetailQueryInfo extends QueryInfo {
 		this.userId = userId;
 	}
 
-	public String getStartTime() {
+	public Date getStartTime() {
 		return startTime;
 	}
 
-	public void setStartTime(String startTime) {
+	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
 	}
 
-	public String getEndTime() {
+	public Date getEndTime() {
 		return endTime;
 	}
 
-	public void setEndTime(String endTime) {
+	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
 	}
 }

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

@@ -17,6 +17,7 @@ import com.ym.mec.im.ImFeignService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -169,7 +170,7 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public CourseScheduleReview addPracticeGroupReview(CourseScheduleReview courseScheduleReview) {
         Integer courseScheduleId = courseScheduleReview.getCourseScheduleId();
         if (courseScheduleId == null || courseScheduleId <= 0) {
@@ -207,16 +208,22 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
             if (StringUtils.isNotBlank(courseScheduleReview.getHomeWork()) && Objects.isNull(existHomework)) {
                 //新增课堂作业
                 CourseHomework courseHomework = new CourseHomework();
-                courseHomework.setContent(courseScheduleReview.getHomeWork());
-                courseHomework.setCourseScheduleId(courseSchedule.getId());
-                courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
-                courseHomework.setGroupType(courseSchedule.getGroupType());
-                courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
-                courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
                 List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseSchedule.getId());
 
-                courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
-                courseHomeworkService.insert(courseHomework);
+                if(Objects.nonNull(existHomework)){
+                    existHomework.setContent(courseScheduleReview.getHomeWork());
+                    existHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                    courseHomeworkService.insert(existHomework);
+                }else{
+                    courseHomework.setContent(courseScheduleReview.getHomeWork());
+                    courseHomework.setCourseScheduleId(courseSchedule.getId());
+                    courseHomework.setMusicGroupId(courseSchedule.getMusicGroupId());
+                    courseHomework.setGroupType(courseSchedule.getGroupType());
+                    courseHomework.setClassGroupId(courseSchedule.getClassGroupId());
+                    courseHomework.setExpiryDate(DateUtil.addDays(date, 7));
+                    courseHomework.setExpectNum(CollectionUtils.isEmpty(courseScheduleStudentPayments) ? 0 : courseScheduleStudentPayments.size());
+                    courseHomeworkService.insert(courseHomework);
+                }
 
                 if (!CollectionUtils.isEmpty(courseScheduleStudentPayments)) {
 //                    List<StudentCourseHomework> studentCourseHomeworks = new ArrayList<>();
@@ -224,15 +231,19 @@ public class CourseReviewServiceImpl extends BaseServiceImpl<Integer, CourseSche
                     String dateStr = DateUtil.dateToString(DateUtil.addDays(date, 1), "MM月dd日");
                     for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
                         StudentCourseHomework studentCourseHomework = new StudentCourseHomework();
-                        studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
-                        studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
-                        studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
-                        studentCourseHomework.setCreateTime(date);
-                        studentCourseHomework.setUpdateTime(date);
-                        studentCourseHomework.setStatus(YesOrNoEnum.NO);
-                        studentCourseHomework.setIsView(YesOrNoEnum.NO);
-                        studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
-                        studentCourseHomeworkDao.insert(studentCourseHomework);
+                        if(Objects.isNull(existHomework)){
+                            studentCourseHomework.setCourseHomeworkId(courseHomework.getId());
+                            studentCourseHomework.setUserId(courseScheduleStudentPayment.getUserId());
+                            studentCourseHomework.setCourseScheduleId(courseSchedule.getId());
+                            studentCourseHomework.setCreateTime(date);
+                            studentCourseHomework.setUpdateTime(date);
+                            studentCourseHomework.setStatus(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsView(YesOrNoEnum.NO);
+                            studentCourseHomework.setIsReplied(YesOrNoEnum.NO);
+                            studentCourseHomeworkDao.insert(studentCourseHomework);
+                        }else{
+                            studentCourseHomework = studentCourseHomeworkDao.findByStudentAndCourseHomewok(existHomework.getId(), courseScheduleStudentPayment.getUserId());
+                        }
 
                         Map<Integer, String> userMap = new HashMap<>();
                         userMap.put(courseScheduleStudentPayment.getUserId(), courseScheduleStudentPayment.getUserId().toString());

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

@@ -35,7 +35,8 @@
 				and create_time_ >= #{startTime}
 			</if>
 			<if test="endTime != null">
-				<![CDATA[and create_time_ <= #{startTime}]]></if>
+				<![CDATA[and create_time_ <= #{endTime}]]>
+			</if>
 		</where>
 	</sql>
 

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

@@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-
 @RequestMapping("sysTenantAccount")
 @Api(tags = "后台租客账户管理")
 @RestController
@@ -37,7 +35,7 @@ public class SysTenantAccountController extends BaseController {
     @GetMapping("/get")
     @PreAuthorize("@pcs.hasPermissions('sysTenantAccount/get')")
     public Object get(Integer teacherId) {
-        if (teacherId == null || teacherId <=0) {
+        if (teacherId == null || teacherId <= 0) {
             return failed("用户id必须大于0");
         }