成绩发布代码更新

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/controller/ScoreController.java

@@ -7,7 +7,10 @@ import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.business.service.ScoreService;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
+import com.usoftchina.smartschool.school.po.Notify;
+import com.usoftchina.smartschool.school.po.ScoreForm;
 import com.usoftchina.smartschool.school.po.ScoreImport;
+import com.usoftchina.smartschool.school.po.ScoreImportList;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,10 +27,15 @@ public class ScoreController {
 
     @GetMapping("/list")
     public Result getList(@PageDefault PageRequest page, ListReqDTO listReqDTO) {
-        PageInfo<ScoreImport> record = scoreService.getListData(page, listReqDTO);
+        PageInfo<ScoreImportList> record = scoreService.getListData(page, listReqDTO);
         return Result.success(record);
     }
 
+    @GetMapping("/read/{id}")
+    public Result getFormdata(@PathVariable("id") Long id) {
+        ScoreForm formdata = scoreService.getFormdata(id);
+        return Result.success(formdata);
+    }
 
     @PostMapping("/delete/{id}")
     public Result delete(@PathVariable("id") Long id) {

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/ScoreService.java

@@ -4,16 +4,14 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.smartschool.page.PageRequest;
 import com.usoftchina.smartschool.school.dto.BatchDealBaseDTO;
 import com.usoftchina.smartschool.school.dto.ListReqDTO;
-import com.usoftchina.smartschool.school.po.ScoreImport;
-import com.usoftchina.smartschool.school.po.StuScore;
-import com.usoftchina.smartschool.school.po.StuScoreDO;
+import com.usoftchina.smartschool.school.po.*;
 
 /**
  * @author: guq
  * @create: 2019-02-25 08:55
  **/
 public interface ScoreService {
-    PageInfo<ScoreImport> getListData(PageRequest page, ListReqDTO listReqDTO);
+    PageInfo<ScoreImportList> getListData(PageRequest page, ListReqDTO listReqDTO);
 
     void delete(Long id);
 
@@ -22,4 +20,6 @@ public interface ScoreService {
     void saveToFormal(Integer id, boolean update);
 
     void publish(Long id);
+
+    ScoreForm getFormdata(Long id);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/business/service/impl/ScoreServiceImpl.java

@@ -48,16 +48,28 @@ public class ScoreServiceImpl implements ScoreService{
     private SysStudentMapper sysStudentMapper;
 
     @Override
-    public PageInfo<ScoreImport> getListData(PageRequest page, ListReqDTO listReqDTO) {
+    public PageInfo<ScoreImportList> getListData(PageRequest page, ListReqDTO listReqDTO) {
         PageHelper.startPage(page.getNumber(), page.getSize());
+        //取数据
+        List<ScoreImportList> data = getListByMode(listReqDTO);
+        PageInfo<ScoreImportList> list = new PageInfo<ScoreImportList>(data);
+        return list;
+    }
+
+    private List<ScoreImportList> getListByMode(ListReqDTO req) {
+        List<ScoreImportList> list = null;
         Long schoolId = BaseContextHolder.getSchoolId();
-        //condition语句
-        String condition = listReqDTO.getFinalCondition();
-        if(condition == null){
-            condition = "1=1";
+        String con = req.getFinalCondition();
+        if (null == con) {
+            con = "1=1";
+        }
+
+        if (null == req || StringUtils.isEmpty(req.getMode()) || "MAIN".equals(req.getMode())) {
+            list = scoreMapper.selectMainByConditon(con, schoolId);
+            //list = saleListMapper.selectSaleByCondition(con, companyId);
+        } else {
+            list = scoreMapper.selectDetailByCondition(con, schoolId);
         }
-        List<ScoreImport> data = scoreMapper.selectByConditon(condition, schoolId);
-        PageInfo<ScoreImport> list = new PageInfo<ScoreImport>(data);
         return list;
     }
 
@@ -196,4 +208,17 @@ public class ScoreServiceImpl implements ScoreService{
         //更新已转标志
         scoreMapper.updateTurnPublish(id);
     }
+
+    @Override
+    public ScoreForm getFormdata(Long id) {
+        if (null == id || "0".equals(id)) {
+            throw new BizException(BizExceptionCode.USELESS_DATA);
+        }
+        ScoreImport main = scoreMapper.selectByPrimaryKey(id);
+        List<ScoreImportdetail> detail = scoreMapper.selectDetail(id);
+        ScoreForm form = new ScoreForm();
+        form.setMain(main);
+        form.setItems(detail);
+        return form;
+    }
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/mapper/ScoreMapper.java

@@ -1,9 +1,6 @@
 package com.usoftchina.smartschool.school.mapper;
 
-import com.usoftchina.smartschool.school.po.ScoreImport;
-import com.usoftchina.smartschool.school.po.ScoreImportdetail;
-import com.usoftchina.smartschool.school.po.StuScore;
-import com.usoftchina.smartschool.school.po.StuScoreDO;
+import com.usoftchina.smartschool.school.po.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -36,4 +33,8 @@ public interface ScoreMapper {
     void batchInsert(List<StuScore> appScores);
 
     void updateTurnPublish(Long id);
+
+    List<ScoreImportList> selectMainByConditon(@Param("con") String con, @Param("school_id") Long schoolId);
+
+    List<ScoreImportList> selectDetailByCondition(@Param("con") String con, @Param("school_id") Long schoolId);
 }

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/ScoreForm.java

@@ -0,0 +1,16 @@
+package com.usoftchina.smartschool.school.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author: guq
+ * @create: 2019-03-05 11:15
+ **/
+@Data
+public class ScoreForm implements Serializable{
+    private ScoreImport main;
+    private List<ScoreImportdetail> items;
+}

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/po/ScoreImportList.java

@@ -0,0 +1,56 @@
+package com.usoftchina.smartschool.school.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author: guq
+ * @create: 2019-03-05 10:58
+ **/
+@Data
+public class ScoreImportList implements Serializable{
+
+    private Long si_id;
+
+    private Date si_date;
+
+    private String si_creator;
+
+    private Long si_creatorid;
+
+    private String si_examtitle;
+
+    private String si_examscope;
+
+    private String si_term;
+
+    private String si_class;
+
+    private Long si_classid;
+
+    private String si_grade;
+
+    private Long si_gradeid;
+
+    private Long school_id;
+
+    private Date si_examdate;
+
+    private Integer si_publish;
+
+    private Long sd_id;
+
+    private Long sd_siid;
+
+    private Long sd_stuid;
+
+    private String sd_stu;
+
+    private Double sd_score;
+
+    private String sd_subject;
+
+    private String sd_remark;
+}

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

@@ -166,7 +166,7 @@
   </update>
 
   <select id="selectByConditon" resultMap="BaseResultMap">
-    select * from stu_score <where>
+    select * from score_import <where>
       <if test="con != null">
         ${con}
       </if>
@@ -174,7 +174,7 @@
         and  school_id = #{school_id}
       </if>
     </where>
-    order by score_id DESC
+    order by si_id DESC
   </select>
 
   <select id="selectByCode" resultType="com.usoftchina.smartschool.school.po.ScoreImport">
@@ -358,4 +358,55 @@
   <update id="updateTurnPublish" parameterType="long">
     update score_import set si_publish=1 where si_id=#{id}
   </update>
+
+
+
+  <resultMap id="listMap" type="com.usoftchina.smartschool.school.po.ScoreImportList" >
+    <id column="si_id" property="si_id" jdbcType="BIGINT" />
+    <result column="si_date" property="si_date" jdbcType="TIMESTAMP" />
+    <result column="si_creator" property="si_creator" jdbcType="VARCHAR" />
+    <result column="si_creatorid" property="si_creatorid" jdbcType="BIGINT" />
+    <result column="si_examtitle" property="si_examtitle" jdbcType="VARCHAR" />
+    <result column="si_examscope" property="si_examscope" jdbcType="VARCHAR" />
+    <result column="si_term" property="si_term" jdbcType="VARCHAR" />
+    <result column="si_class" property="si_class" jdbcType="VARCHAR" />
+    <result column="si_classid" property="si_classid" jdbcType="BIGINT" />
+    <result column="si_grade" property="si_grade" jdbcType="VARCHAR" />
+    <result column="si_gradeid" property="si_gradeid" jdbcType="BIGINT" />
+    <result column="school_id" property="school_id" jdbcType="BIGINT" />
+    <result column="si_examdate" property="si_examdate" jdbcType="TIMESTAMP" />
+    <result column="si_publish" property="si_publish" jdbcType="INTEGER" />
+    <result column="sd_id" property="sd_id" jdbcType="BIGINT" />
+    <result column="sd_siid" property="sd_siid" jdbcType="BIGINT" />
+    <result column="sd_stuid" property="sd_stuid" jdbcType="BIGINT" />
+    <result column="sd_stu" property="sd_stu" jdbcType="VARCHAR" />
+    <result column="sd_score" property="sd_score" jdbcType="INTEGER" />
+    <result column="sd_subject" property="sd_subject" jdbcType="VARCHAR" />
+    <result column="sd_remark" property="sd_remark" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="selectMainByConditon" resultMap="listMap">
+    select * from score_import <where>
+    <if test="con != null">
+      ${con}
+    </if>
+    <if test="school_id != null">
+      and  school_id = #{school_id}
+    </if>
+  </where>
+    order by si_id DESC
+  </select>
+
+  <select id="selectDetailByCondition" resultMap="listMap">
+    select * from score_import left join score_importdetail on si_id=sd_siid <where>
+    <if test="con != null">
+      ${con}
+    </if>
+    <if test="school_id != null">
+      and  score_import.school_id = #{school_id}
+    </if>
+  </where>
+    order by si_id DESC
+  </select>
+
 </mapper>