Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

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

@@ -109,19 +109,19 @@ public class CurriculumServiceImpl implements CurriculumService {
      * @param subjectDO
      */
     private void convertToId(CurriculumDetailDTO curriculumDetailDTO, SubjectDO subjectDO) {
-        if (curriculumDetailDTO.getMon().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getMon()) && curriculumDetailDTO.getMon().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setMon(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getTues().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getTues()) && curriculumDetailDTO.getTues().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setTues(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getThur().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getThur()) && curriculumDetailDTO.getThur().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setThur(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getWed().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getWed()) && curriculumDetailDTO.getWed().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setWed(subjectDO.getSubjectId().toString());
         }
-        if (curriculumDetailDTO.getFri().equals(subjectDO.getSubjectName())){
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getFri()) && curriculumDetailDTO.getFri().equals(subjectDO.getSubjectName())){
             curriculumDetailDTO.setFri(subjectDO.getSubjectId().toString());
         }
     }
@@ -284,19 +284,19 @@ public class CurriculumServiceImpl implements CurriculumService {
      * @param subNameList
      */
     private void checkExists(CurriculumDetailDTO curriculumDetailDTO, List<String> subNameList) {
-        if (!subNameList.contains(curriculumDetailDTO.getMon())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getMon()) && !subNameList.contains(curriculumDetailDTO.getMon())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getMon()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getTues())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getTues()) && !subNameList.contains(curriculumDetailDTO.getTues())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getTues()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getWed())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getWed()) && !subNameList.contains(curriculumDetailDTO.getWed())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getWed()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getThur())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getThur()) && !subNameList.contains(curriculumDetailDTO.getThur())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getThur()));
         }
-        if (!subNameList.contains(curriculumDetailDTO.getFri())) {
+        if (!StringUtils.isEmpty(curriculumDetailDTO.getFri()) && !subNameList.contains(curriculumDetailDTO.getFri())) {
             throw new BizException(BizExceptionCode.NOT_EXISTS_SUBJECT.getCode(), String.format(BizExceptionCode.NOT_EXISTS_SUBJECT.getMessage(), curriculumDetailDTO.getFri()));
         }
     }

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

@@ -288,7 +288,7 @@ public class ScoreServiceImpl implements ScoreService{
             msg.setKeyword3(main.getSi_examtitle());
             msg.setKeyword4(DateUtils.format(main.getSi_examdate(),"yyyy-MM-dd"));
             msg.setKeyword5(school.getSchool_name());
-            msg.setRemark(noticer.getSubject()+ "成绩为:" + new BigDecimal(noticer.getScore()).toPlainString());
+            msg.setRemark(noticer.getSubject()+ "成绩为:" + new BigDecimal(noticer.getScore()).setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString());
             msg.setTemplateId(template.getSt_templateid());
             msg.setTouser(noticer.getOpenid());
             msg.setAppId(school.getSchool_appid());

applications/school/school-server/src/main/resources/config/application-docker-prod.yml

@@ -14,7 +14,4 @@ spring:
     password: select123***
   redis:
     host: 10.10.100.173
-    port: 6379
-smartschool:
-  domain:
-    wechat: https://school-wechat.ubtob.com
+    port: 6379

base-servers/gateway-server/src/main/resources/application.yml

@@ -143,9 +143,17 @@ auth:
     - /api/school/wxSchool/user/sendCodeUpdate*
     - /api/school/wxSchool/meeting/getMeetingDetails*
     - /api/school/wxSchool/notify/getNotify*
+    - /api/school/wxSchool/oaApprove/oaDetails*
     - /api/school/wxSchool/stuScore/getScoreByStu*
     - /api/school/wxSchool/taskNotify/taskDetail*
-    - /api/school/wxSchool/outInRecord/inout/detail*
+    - /api/school/wxSchool/taskNotify/taskReply*
+    - /api/school/wxSchool/outInRecord/inout/detail/*
+    - /api/school/wxSchool/vote/voteDetailTeacher*
+    - /api/school/wxSchool/vote/voteActionTeacher*
+    - /api/school/wxSchool/vote/voteDetailStu*
+    - /api/school/wxSchool/vote/voteActionParent*
+    - /api/school/wxSchool/oaLeave/lvDetail**
+    - /api/school/wxSchool/oaLeave/lvReply**
     - /api/device/**
     - /api/file/download*
     - /api/school/excel/**