责任部门导出和日历修改 bug修复

adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java

@@ -66,4 +66,10 @@ public class SapMeetingController extends BaseController<SapMeeting> {
     public int addMeeting(@RequestBody SapMeeting sapMeeting){
         return sapMeetingService.addMeeting(sapMeeting);
     }
+
+    @ApiOperation(value = "修改会议")
+    @PostMapping("/updateMeeting")
+    public boolean updateMeeting(@RequestBody SapMeeting sapMeeting){
+        return sapMeetingService.updateById(sapMeeting);
+    }
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java

@@ -419,13 +419,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
             p.setEndTimes(s.getEndTimes());
             for (SarStandAttrInfo a:list2){
                 if(s.getId().equals(a.getStandId())){
-//                    p.setCYCVPPSBM(a.getCycvppsbm());
-//                    p.setCYCVPPSCN(a.getCycvppscn());
                     p.setSSRQ(a.getSsrq());
                     p.setXCXSSRQ(a.getXcxssrq());
                     p.setZCCSSRQ(a.getZccssrq());
-//                    p.setKCCVPPSBM(a.getKccvppsbm());
-//                    p.setKCCVPPSCN(a.getKccvppscn());
                     p.setZRBM(a.getZrbm());
                 }
             }
@@ -480,7 +476,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         String idmis=String.join(",",ids);
         System.out.println(idmis);
         QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
-        wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME");
+        wrapper1.select("ID","STAND_NUMBER","STAND_NAME","STAND_EN_NAME","STAND_TYPE","STAND_YEAR","STAND_SORT");
         wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
         List<SarStandardsInfo> userList1 = SarStandardsInfoDao.selectList(wrapper1);
         QueryWrapper<SarStandAttrInfo> wrapper2 = new QueryWrapper<>();
@@ -516,24 +512,20 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         }
         for(SarStandardsInfo s:userList1){
             StandAttrInfoDto p =new StandAttrInfoDto();
-            p.setStandNumber(s.getStandNumber());
+            p.setStandNumber(s.getStandSort()+" "+s.getStandNumber()+"-"+s.getStandYear());
             p.setStandName(s.getStandName());
             p.setStandEnName(s.getStandEnName());
             for (SarStandAttrInfo a:userList2){
                 if(s.getId().equals(a.getStandId())){
-//                    p.setCYCVPPSBM(a.getCycvppsbm());
-//                    p.setCYCVPPSCN(a.getCycvppscn());
                     if (a.getSsrq()!=null){
-                        p.setSSRQ(a.getSsrq().substring(0,10));
+                        p.setSSRQ(a.getSsrq());
                     }
                     if (a.getXcxssrq()!=null){
-                        p.setXCXSSRQ(a.getXcxssrq().substring(0,10));
+                        p.setXCXSSRQ(a.getXcxssrq());
                     }
                     if (a.getZccssrq()!=null){
-                        p.setZCCSSRQ(a.getZccssrq().substring(0,10));
+                        p.setZCCSSRQ(a.getZccssrq());
                     }
-//                    p.setKCCVPPSBM(a.getKccvppsbm());
-//                    p.setKCCVPPSCN(a.getKccvppscn());
                     p.setZRBM(a.getZrbm());
                 }
             }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java

@@ -123,6 +123,8 @@ public class SarStandFileEOController extends BaseController<SarStandFileEO> {
             page.setFileSuffixList(suffix.split(","));
         }
         List<SarStandFileEO> rows = sarStandFileEOService.getStandFileListByPage(page);
+        Integer count = sarStandFileEOService.getStandFileListByPageCount(page);
+        page.getPager().setRowCount(count);
         for (SarStandFileEO one:rows) {
             one.setAttId(one.getAttId1());
         }

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarStandFileEODao.java

@@ -32,6 +32,8 @@ public interface SarStandFileEODao extends BaseMapper<SarStandFileEO> {
 
     List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
 
+    Integer getStandFileListByPageCount(SarStandFileEOPage stand);
+
     int queryStandFileListByCount(SarStandFileEOPage stand);
 
     List<SarStandFileEO> queryByPage(SarStandFileEOPage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/entity/SarStandFileEOPage.java

@@ -1,6 +1,7 @@
 package com.adc.da.slrs.standardSplit.entity;
 
 import com.adc.da.base.page.BasePage;
+import lombok.Data;
 
 /**
  * <b>功能：</b>SAR_STAND_FILE SarStandFileEOPage<br>
@@ -8,6 +9,7 @@ import com.adc.da.base.page.BasePage;
  * <b>日期：</b> 2018-09-03 <br>
  * <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
  */
+@Data
 public class SarStandFileEOPage extends BasePage {
 
     private String modifyTime;
@@ -36,6 +38,7 @@ public class SarStandFileEOPage extends BasePage {
     private String standName;
     private String fileType;
     private String standFileClassify;
+    private int rowCount;
 
     public String getModifyTime() {
         return this.modifyTime;

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarStandFileEOService.java

@@ -9,6 +9,8 @@ public interface SarStandFileEOService {
 
     List<SarStandFileEO> getStandFileListByPage(SarStandFileEOPage stand);
 
+    Integer getStandFileListByPageCount(SarStandFileEOPage stand);
+
     List<SarStandFileEO> queryByPage(SarStandFileEOPage page);
 
     List<SarStandFileEO> queryByList(SarStandFileEOPage page);

adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java

@@ -37,6 +37,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
         return sarStandFileEODao.getStandFileListByPage(stand);
     }
 
+    @Override
+    public Integer getStandFileListByPageCount(SarStandFileEOPage stand){
+        return sarStandFileEODao.getStandFileListByPageCount(stand);
+    }
+
     @Override
     public List<SarStandFileEO> queryByPage(SarStandFileEOPage page){
         return sarStandFileEODao.queryByPage(page);