Merge branch 'develop_master' into 'FOTON'

Develop master See merge request LiuChao/foton-slrs-system-rest!312
2021-12-22 16:54:11 +08:00
parent a79b7cbb2f b0b6a6f391
commit 8d52744eb7
10 changed files with 85 additions and 46 deletions
@@ -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( SapMeeting sapMeeting){
+        return sapMeetingService.updateById(sapMeeting);
+    }
 }
@@ -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());
                }
            }
@@ -56,7 +56,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
        List<SarStandardsInfo> list1 = userIPage1.getRecords();

        QueryWrapper<SarStandUnqualified> wrapper = new QueryWrapper<>();
-//        wrapper1.like("stand_number",null);
        wrapper.select("STAND_SERIAL_NUMBER");
        Page<SarStandUnqualified> page = new Page<>();
        IPage<SarStandUnqualified> userIPage = sarStandUnqualifiedDao.selectPage(page,wrapper);
@@ -68,26 +67,6 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
            }
        }

-//        QueryWrapper<SarStandUnqualified> sarStandUnqualifiedQueryWrapper=new QueryWrapper<>();
-//        if(sarStandUnqualifiedPage.getStandId()!=null){
-//            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId());
-//        }
-//        //仅查询未关闭的
-//        sarStandUnqualifiedQueryWrapper.eq("close_state",1);
-//        //根据 项目名称 进行查询
-//        if(sarStandUnqualifiedPage.getProductName()!=null){
-//            sarStandUnqualifiedQueryWrapper.like("product_name",sarStandUnqualifiedPage.getProductName());
-//        }
-//        //根据 责任部门 进行查询
-//        if(sarStandUnqualifiedPage.getResponsibleUnit()!=null){
-//            sarStandUnqualifiedQueryWrapper.eq("responsible_unit",sarStandUnqualifiedPage.getResponsibleUnit());
-//        }
-//        //根据 标准号/标准名称 进行查询
-//        if(sarStandUnqualifiedPage.getStandSerialNumber()!=null){
-////            sarStandUnqualifiedQueryWrapper.like("stand_serial_number",sarStandUnqualifiedPage.getStandSerialNumber()).or().like("stand_name",sarStandUnqualifiedPage.getStandName());
-//            sarStandUnqualifiedQueryWrapper.last(" and (stand_serial_number LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%'\n" +
-//                    "\t\tOR stand_name LIKE '%"+sarStandUnqualifiedPage.getStandSerialNumber()+"%')");
-//        }
        Page<SarStandUnqualified> standUnqualifiedPage=new Page<>();
        //判断前端是否提供页码和每页条数
        List<SarStandUnqualified> sarStandUnqualifieds=sarStandUnqualifiedDao.getSarStandUnqualifiedPage((sarStandUnqualifiedPage.getCurrent()-1)*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage.getCurrent()*sarStandUnqualifiedPage.getSize(),sarStandUnqualifiedPage);
@@ -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());
        }
@@ -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);
@@ -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;
@@ -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);
@@ -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);