课表BUG修改

applications/school/school-dto/src/main/java/com/usoftchina/smartschool/school/dto/CurriculumDTO.java

@@ -54,6 +54,18 @@ public class CurriculumDTO implements Serializable {
      * 年级
      */
     private String gradeId;
+    /**
+     * 学校
+     */
+    private Long schoolId;
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
 
     public String getGradeId() {
         return gradeId;

applications/school/school-dto/src/main/java/com/usoftchina/smartschool/school/dto/CurriculumDetailDTO.java

@@ -22,8 +22,8 @@ public class CurriculumDetailDTO implements Serializable {
     private String endTime;
     private int status;
     private String remarks;
-    private int clazzId;
-    private int schoolId;
+    private Long clazzId;
+    private Long schoolId;
     private Long mId;
 
     public Long getmId() {
@@ -130,19 +130,19 @@ public class CurriculumDetailDTO implements Serializable {
         this.remarks = remarks;
     }
 
-    public int getClazzId() {
+    public Long getClazzId() {
         return clazzId;
     }
 
-    public void setClazzId(int clazzId) {
+    public void setClazzId(Long clazzId) {
         this.clazzId = clazzId;
     }
 
-    public int getSchoolId() {
+    public Long getSchoolId() {
         return schoolId;
     }
 
-    public void setSchoolId(int schoolId) {
+    public void setSchoolId(Long schoolId) {
         this.schoolId = schoolId;
     }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/CurriculumServiceImpl.java

@@ -67,12 +67,12 @@ public class CurriculumServiceImpl implements CurriculumService {
         CurriculumFormDTO curriculumFormDTO = new CurriculumFormDTO();
         curriculumFormDTO.setMain(curriculumMapper.selectMain(id));
         List<CurriculumDetailDTO> curriculumDetailDTOList = curriculumMapper.selectItems(id);
-        List<SubjectDO> subjectDOList = curriculumMapper.selectSubject(BaseContextHolder.getSchoolId());
+        /*List<SubjectDO> subjectDOList = curriculumMapper.selectSubject(BaseContextHolder.getSchoolId());
         for (SubjectDO subjectDO : subjectDOList){
             for (CurriculumDetailDTO curriculumDetailDTO : curriculumDetailDTOList){
                 convertToChinese(curriculumDetailDTO, subjectDO);
             }
-        }
+        }*/
         curriculumFormDTO.setItems(curriculumDetailDTOList);
         return curriculumFormDTO;
     }
@@ -130,20 +130,19 @@ public class CurriculumServiceImpl implements CurriculumService {
     }
 
     @Override
+    @Transactional
     public DocBaseDTO save(CurriculumFormDTO curriculumFormDTO) {
         if (ObjectUtils.isEmpty(curriculumFormDTO)) {
             throw new BizException(BizExceptionCode.EMPTY_DATA);
         }
         CurriculumDTO main = curriculumFormDTO.getMain();
         List<CurriculumDetailDTO> items = curriculumFormDTO.getItems();
+        Long schoolId = BaseContextHolder.getSchoolId();
         //查询课表科目信息
-        List<SubjectDO> subjectDOList = curriculumMapper.selectSubject(BaseContextHolder.getSchoolId());
-        if (null != main.getId() && 0 != main.getId()){
-            Long gradeId = sysGradeMapper.selectByName(main.getGradeId(), BaseContextHolder.getSchoolId()).getGrade_id();
-            Long clazzId = sysClazzMapper.selectByName(main.getClazzId(), gradeId).getClazz_id();
+        //List<SubjectDO> subjectDOList = curriculumMapper.selectSubject(BaseContextHolder.getSchoolId());
+         if (null == main.getId() || 0 == main.getId()){
             main.setCreateTime(new Date());
-            main.setClazzId(String.valueOf(clazzId));
-            main.setGradeId(String.valueOf(gradeId));
+            main.setSchoolId(BaseContextHolder.getSchoolId());
             main.setCreatorName(BaseContextHolder.getUserName());
             //保存主表
             curriculumMapper.insertSelective(main);
@@ -151,12 +150,12 @@ public class CurriculumServiceImpl implements CurriculumService {
             //保存明细表
             if (!CollectionUtils.isEmpty(items)) {
                 //修改明细数据为科目对应的ID
-                for (SubjectDO subjectDO : subjectDOList) {
-                    for (CurriculumDetailDTO curriculumDetailDTO : items) {
-                        curriculumDetailDTO.setmId(mId);
-                        convertToId(curriculumDetailDTO, subjectDO);
-                    }
-                }
+                items.forEach(curriculumDetailDTO -> {
+                    curriculumDetailDTO.setmId(mId);
+                    curriculumDetailDTO.setSchoolId(schoolId);
+                    curriculumDetailDTO.setClazzId(Long.parseLong(main.getClazzId()));
+                    curriculumDetailDTO.setStatus(Integer.parseInt(main.getStatus()));
+                });
                 curriculumMapper.insertDetailSelective(items);
                 messageLogService.save(new DocBaseDTO(mId, CODE, NAME));
             }
@@ -167,13 +166,12 @@ public class CurriculumServiceImpl implements CurriculumService {
                 List<CurriculumDetailDTO> insertList = new ArrayList<CurriculumDetailDTO>();
                 List<CurriculumDetailDTO> updateList = new ArrayList<CurriculumDetailDTO>();
                 for (CurriculumDetailDTO curriculumDetailDTO : items){
-                    for (SubjectDO subjectDO : subjectDOList) {
-                        convertToId(curriculumDetailDTO, subjectDO);
-                        if (curriculumDetailDTO.getId() != null && 0 != curriculumDetailDTO.getId()) {
-                            updateList.add(curriculumDetailDTO);
-                        } else {
-                            insertList.add(curriculumDetailDTO);
-                        }
+                    curriculumDetailDTO.setClazzId(Long.parseLong(main.getClazzId()));
+                    curriculumDetailDTO.setSchoolId(schoolId);
+                    if (curriculumDetailDTO.getId() != null && 0 != curriculumDetailDTO.getId()) {
+                        updateList.add(curriculumDetailDTO);
+                    } else {
+                        insertList.add(curriculumDetailDTO);
                     }
                 }
                 if (insertList.size() > 0) {
@@ -244,8 +242,8 @@ public class CurriculumServiceImpl implements CurriculumService {
                             curriculumDetailDTOList.forEach(curriculumDetailDTO -> {
                                 curriculumDetailDTO.setmId(mainId);
                                 curriculumDetailDTO.setStatus(1);
-                                curriculumDetailDTO.setSchoolId(schoolId.intValue());
-                                curriculumDetailDTO.setClazzId(clazzId.intValue());
+                                curriculumDetailDTO.setSchoolId(schoolId);
+                                curriculumDetailDTO.setClazzId(clazzId);
                                 convertToId(curriculumDetailDTO, subjectDO);
                             });
                         }

applications/school/school-server/src/main/resources/mapper/CurriculumMapper.xml

@@ -106,6 +106,15 @@
       <if test="createTime != null">
         createTime,
       </if>
+      <if test="clazzId != null">
+        clazz_id,
+      </if>
+      <if test="gradeId != null">
+        grade_id,
+      </if>
+      <if test="schoolId != null">
+        school_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="code != null">
@@ -132,6 +141,15 @@
       <if test="createTime != null">
         #{createTime, jdbcType=TIMESTAMP},
       </if>
+      <if test="clazzId != null">
+        #{clazzId, jdbcType=VARCHAR},
+      </if>
+      <if test="gradeId != null">
+        #{gradeId, jdbcType=VARCHAR},
+      </if>
+      <if test="schoolId != null">
+        #{schoolId, jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
 
@@ -143,10 +161,10 @@
     ) values
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       (
-        #{lessons, jdbcType=INTEGER},#{mon,jdbcType=INTEGER},#{tues,jdbcType=INTEGER},#{wed,jdbcType=INTEGER},
-        #{thur,jdbcType=INTEGER},#{fri,jdbcType=INTEGER},#{sat,jdbcType=INTEGER},#{startTime,jdbcType=TIME},
-        #{endTime,jdbcType=TIME},#{status,jdbcType=INTEGER},#{remarks,jdbcType=VARCHAR},#{clazzId,jdbcType=INTEGER},
-        #{schoolId,jdbcType=INTEGER},#{mId,jdbcType=INTEGER},
+        #{item.lessons, jdbcType=INTEGER},#{item.mon,jdbcType=INTEGER},#{item.tues,jdbcType=INTEGER},#{item.wed,jdbcType=INTEGER},
+        #{item.thur,jdbcType=INTEGER},#{item.fri,jdbcType=INTEGER},#{item.sat,jdbcType=INTEGER},#{item.startTime,jdbcType=TIME},
+        #{item.endTime,jdbcType=TIME},#{item.status,jdbcType=INTEGER},#{item.remarks,jdbcType=VARCHAR},#{item.clazzId,jdbcType=INTEGER},
+        #{item.schoolId,jdbcType=INTEGER},#{item.mId,jdbcType=INTEGER}
       )
     </foreach>
   </insert>
@@ -154,22 +172,22 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.smartschool.school.dto.CurriculumDTO" >
     update clazz_main_curriculum
     <set >
-      <if test="mcur_code != null" >
+      <if test="code != null" >
         mcur_code = #{code,jdbcType=VARCHAR},
       </if>
-      <if test="mcur_term_name != null" >
+      <if test="termName != null" >
         mcur_term_name = #{termName,jdbcType=VARCHAR},
       </if>
-      <if test="mcur_name != null" >
+      <if test="name != null" >
         mcur_name = #{name,jdbcType=VARCHAR},
       </if>
-      <if test="mcur_term_start != null" >
-        mcur_term_start = #{termStart,jdbcType=TIMESTAMP},
+      <if test="termStart != null" >
+        mcur_term_start = #{termStart,jdbcType=VARCHAR},
       </if>
-      <if test="mcur_term_end != null" >
-        mcur_term_end = #{termEnd,jdbcType=TIMESTAMP},
+      <if test="termEnd != null" >
+        mcur_term_end = #{termEnd,jdbcType=VARCHAR},
       </if>
-      <if test="mcur_weeknum != null" >
+      <if test="weekNum != null" >
         mcur_weeknum = #{weekNum,jdbcType=INTEGER},
       </if>
       <if test="creatorName != null" >
@@ -181,6 +199,9 @@
       <if test="clazzId != null" >
         clazz_id = #{clazzId,jdbcType=INTEGER},
       </if>
+      <if test="gradeId != null" >
+        grade_id = #{gradeId,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -189,8 +210,8 @@
     <foreach collection="list" item="item" index="index" separator=";">
       update clazz_curriculum
       <set>
-        <if test="item.lessons != null and lessons != 0">
-          cur_lessons = #{item.lession, jdbcType=INTEGER},
+        <if test="item.lessons != null and item.lessons != 0">
+          cur_lessons = #{item.lessons, jdbcType=INTEGER},
         </if>
         <if test="item.mon != null">
           cur_mon = #{item.mon, jdbcType=VARCHAR},
@@ -214,10 +235,10 @@
           cur_start_time = #{item.startTime, jdbcType=VARCHAR},
         </if>
         <if test="item.endTime != null">
-          cur_end_time = #{item.endTime, jdbcType=TIME},
+          cur_end_time = #{item.endTime, jdbcType=VARCHAR},
         </if>
         <if test="item.status != null">
-          cur_status = #{item.status, jdbcType=TIME},
+          cur_status = #{item.status, jdbcType=INTEGER},
         </if>
         <if test="item.remarks != null">
           cur_remarks = #{item.remarks, jdbcType=VARCHAR},