Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/controller/NewsController.java

@@ -184,7 +184,7 @@ public class NewsController {
                                 .selectAs(File::getFileUrl, NewsAppendixVo::getFileUrl))
         );
 
-        if (newsAppendixVoList.size() > 0) {
+        if (!newsAppendixVoList.isEmpty()) {
             newsVo.setAppendixList(newsAppendixVoList);
         }
 

src/main/java/com/xjrsoft/module/oa/dto/AddNewsDto.java

@@ -202,4 +202,7 @@ public class AddNewsDto {
     @TableField(exist = false)
     @EntityMapping(thisField = "id", joinField = "newsId")
     private List<AddNewsRelationDto> relationList;
+
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
 }

src/main/java/com/xjrsoft/module/oa/entity/News.java

@@ -132,4 +132,7 @@ public class News extends AuditEntity implements Serializable {
 
     @ApiModelProperty("创建人id")
     private Long createUserId;
+
+    @ApiModelProperty("办事指南显示范围")
+    private String guideShowRange;
 }

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -510,6 +510,10 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
         News news = BeanUtil.toBean(addNewsDto, News.class);
         news.setEnabledMark(EnabledMark.ENABLED.getCode());
+        if(news.getTypeId() != null && news.getTypeId() == 3){
+            news.setWfStatus(1);
+            news.setStatus(2);
+        }
 
         newsMapper.insert(news);
         //添加附件子表
@@ -525,7 +529,7 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
         //1=全校教职工,添加全校教职工到关系表
         addRelation(news, BeanUtil.toBean(addNewsDto, AddProclamationDto.class), 1);
         //添加新闻和公告的时候，如果状态是2，表示新闻和公告实时发布了，张贴开始时间就应该是发布时间需要发送消息
-        if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2) {
+        if (ObjectUtil.isNotNull(addNewsDto.getStatus()) && addNewsDto.getStatus() == 2 && addNewsDto.getTypeId() != 3) {
             SendMessage(news.getId());
         }
 

src/main/java/com/xjrsoft/module/student/service/impl/PbCseFeeobjupdateServiceImpl.java

@@ -117,13 +117,18 @@ public class PbCseFeeobjupdateServiceImpl extends MPJBaseServiceImpl<PbCseFeeobj
 
         List<ProfessionalHeadCoun> professionalHeadCountRes = new ArrayList<>();
         for (Map.Entry<String, Long> entry : professionalHeadCount.entrySet()) {
+
             professionalHeadCountRes.add(new ProfessionalHeadCoun() {{
                 setKey(entry.getKey());
                 setValue(entry.getValue());
+                Integer paymentCount = 0;
+                if(specnameCountMap.containsKey(entry.getKey())){
+                    paymentCount = specnameCountMap.get(entry.getKey());
+                }
                 if (pbCseSpecplanSumMap.get(entry.getKey()) != null) {
                     setPlannedNumber(pbCseSpecplanSumMap.get(entry.getKey()));
-                    setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - specnameCountMap.get(entry.getKey()));
-                    setPaymentCount(specnameCountMap.get(entry.getKey()));
+                    setRemainder(pbCseSpecplanSumMap.get(entry.getKey()) - paymentCount);
+                    setPaymentCount(paymentCount);
                 }
                 if (specnameCountMap.get(entry.getKey()) != null) {
                     setPaymentCount(specnameCountMap.get(entry.getKey()));

src/main/resources/sqlScript/今日安排视图.sql

@@ -31,9 +31,10 @@ INNER JOIN base_classroom t2 ON t1.site_id = t2.id
 WHERE t1.schedule_date = DATE_FORMAT(NOW(), '%Y-%m-%d')
 UNION ALL
 SELECT t1.id,CONCAT(t1.meeting_apply_date, ' ', t1.meeting_apply_s),CONCAT(t1.meeting_apply_date, ' ',t1.meeting_apply_e),NULL,
-IFNULL(CONCAT(t4.name,t3.name), t1.meeting_apply_url),t5.name,t1.meeting_apply_theme,8,t2.user_id FROM wf_meeting_apply t1
-INNER JOIN meeting_conferee t2 ON t2.wf_meeting_apply_id = t1.id
+IFNULL(CONCAT(t4.name,t3.name), t1.meeting_apply_url),t5.name,t1.meeting_apply_theme,8,
+(SELECT GROUP_CONCAT(user_id) FROM meeting_conferee WHERE wf_meeting_apply_id = t1.id) FROM wf_meeting_apply t1
 LEFT JOIN meeting_room t3 ON t1.meeting_room_id = t3.id
 LEFT JOIN base_office_build t4 ON t3.office_build_id = t4.id
 LEFT JOIN xjr_dictionary_detail t5 ON t1.meeting_apply_format = t5.code
-WHERE t1.meeting_apply_date = DATE_FORMAT(NOW(), '%Y-%m-%d');
+WHERE t1.meeting_apply_date = DATE_FORMAT(NOW(), '%Y-%m-%d');
+