川音需求版本1

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/InspectorApi.java

@@ -34,6 +34,9 @@ public class InspectorApi {
     @Autowired
     private InspectTaskRepo inspectTaskRepo;
 
+    @Autowired
+    private InspectRangeRepo inspectRangeRepo;
+
 
     @GetMapping
     public List<MarkUser> list(@RequestParam Long workId) {
@@ -44,6 +47,13 @@ public class InspectorApi {
     @PostMapping
     public void create(@RequestBody MarkUser inspectUser) {
 
+        Long workId = inspectUser.getWorkId();
+
+        InspectRange inspectRange = inspectRangeRepo.findByWorkIdAndActive(workId, true);
+        if (inspectRange != null) {
+            throw new RuntimeException("评卷工作已启动，不能再新建复评专家了！");
+        }
+
         MarkUser inspector = markUserRepo.findByLoginName(inspectUser.getLoginName());
         if (inspector != null) {
             throw new RuntimeException("该登录名已经存在");

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/dto/ScoreDTO.java

@@ -7,17 +7,21 @@ import cn.com.qmth.stmms.ms.commons.utils.excel.ExcelProperty;
  */
 public class ScoreDTO {
 
-    @ExcelProperty(name = "准考证号",index = 0,type = 1)
+    @ExcelProperty(name = "准考证号", index = 0, type = 1)
     private String examNumber;
-    @ExcelProperty(name = "姓名",index = 1,type = 1)
+    @ExcelProperty(name = "姓名", index = 1, type = 1)
     private String studentName;
-    @ExcelProperty(name = "考区",width = 80,index = 2,type = 1)
+    @ExcelProperty(name = "考区", width = 80, index = 2, type = 1)
     private String areaName;
-    @ExcelProperty(name = "速写",index = 3,type = 1)
+
+    @ExcelProperty(name = "生源地", index = 3, type = 1)
+    private String sourceName;
+
+    @ExcelProperty(name = "速写", index = 4, type = 1)
     private String sx;
-    @ExcelProperty(name = "色彩",index = 4,type = 1)
+    @ExcelProperty(name = "色彩", index = 5, type = 1)
     private String sc;
-    @ExcelProperty(name = "素描",index = 5,type = 1)
+    @ExcelProperty(name = "素描", index = 6, type = 1)
     private String sm;
     private String scoreList;
 
@@ -76,4 +80,12 @@ public class ScoreDTO {
     public void setScoreList(String scoreList) {
         this.scoreList = scoreList;
     }
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
 }

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/ScoreExporter.java

@@ -28,25 +28,27 @@ public class ScoreExporter {
     private ExamQuestionRepo examQuestionRepo;
 
     @RequestMapping(method = RequestMethod.GET)
-    public void export(@RequestParam Long workId, HttpServletResponse response){
+    public void export(@RequestParam Long workId, HttpServletResponse response) {
         List<ScoreDTO> scoreDTOs = new ArrayList<>();
         List<Object[]> objects = paperRepo.findScores(workId);
         objects.forEach(o -> {
             Long questionId = Long.valueOf(o[2].toString());
+            String sourceName = o[3].toString();
             String areaName = examQuestionRepo.findOne(questionId).getAreaName();
             ScoreDTO scoreDTO = new ScoreDTO();
             scoreDTO.setExamNumber(o[0].toString());
             scoreDTO.setStudentName(o[1].toString());
-            String scoreList = String.valueOf(o[3]);
-            if(scoreList != null && scoreList.split(",").length == 3){
+            String scoreList = String.valueOf(o[4]);
+            if (scoreList != null && scoreList.split(",").length == 3) {
                 scoreDTO.setSc(scoreList.split(",")[0]);
                 scoreDTO.setSm(scoreList.split(",")[1]);
                 scoreDTO.setSx(scoreList.split(",")[2]);
             }
             scoreDTO.setAreaName(areaName);
+            scoreDTO.setSourceName(sourceName);
             scoreDTOs.add(scoreDTO);
         });
         String fileName = "成绩总表";
-        ExportUtils.exportEXCEL(fileName,ScoreDTO.class,scoreDTOs,response);
+        ExportUtils.exportEXCEL(fileName, ScoreDTO.class, scoreDTOs, response);
     }
 }

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/repository/PaperRepo.java

@@ -123,7 +123,7 @@ public interface PaperRepo extends JpaRepository<Paper, Long>, JpaSpecificationE
     List<Paper> findByScoreRange(Double highScore, Double lowScore);
 
     //@Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id,GROUP_CONCAT(score  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name`", nativeQuery = true)
-    @Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id,GROUP_CONCAT(if(isnull(p.inspect_score),p.score,p.inspect_score)  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name`", nativeQuery = true)
+    @Query(value = "SELECT p.`exam_number`,p.`student_name`,p.question_id, p.source_name, GROUP_CONCAT(if(isnull(p.inspect_score),p.score,p.inspect_score)  ORDER BY p.`subject`) FROM paper p WHERE p.`work_id` = ? GROUP BY p.exam_number,p.`student_name` , p.source_name", nativeQuery = true)
     List<Object[]> findScores(Long workId);
 
     List<Paper> findByWorkId(Long workId);

stmms-ms-main/src/main/resources/application-qmth.properties

@@ -0,0 +1,52 @@
+spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username=root
+spring.datasource.password=root
+
+#spring.datasource.url=jdbc:mysql://192.168.1.74:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=root
+
+
+spring.datasource.validation-query=SELECT 1 FROM DUAL
+spring.datasource.test-on-borrow=true
+
+#redis
+#spring.redis.host=192.168.199.102
+#spring.redis.port=32768
+server.port=9000
+server.compression.enabled=true
+server.compression.mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,application/javascript
+
+
+logging.file=./logs/sys.log
+logging.level.org.springframework=ERROR
+logging.level.org.hibernate=ERROR
+
+spring.jpa.show-sql=true
+spring.jpa.hibernate.ddl-auto=update
+
+
+spring.http.multipart.max-file-size=10Mb
+
+app.config.deviation=2
+app.admin.loginName=admin-cy
+app.admin.password=123456
+
+sys.config.imageDir=E:\\stmms-ms\\static\\images
+sys.config.thumbDir=E:\\stmms-ms\\static\\thumbs
+#sys.config.imageDir=.\\static\\images
+#sys.config.thumbDir=.\\static\\thumbs
+sys.config.compression.percent=60
+#sys.config.imageServer.port=3000
+sys.config.imageServer.port=9000
+sys.config.imageServer.ip=192.168.1.72
+
+
+#袁攀配置
+web.upload-path=E:\\stmms-ms\\static\\
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
+
+app.snapshot.fdsql=E:\\stmms-ms\\dumps\\stmms-ms-2-fendang.sql
+app.snapshot.dfsql=E:\\stmms-ms\\dumps\\stmms-ms-2-dafen.sql
+app.snapshot.fpsql=E:\\stmms-ms\\dumps\\stmms-ms-2-fuping.sql