FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop_master' into 'FOTON'

Browse Source 
Develop master

See merge request LiuChao/foton-slrs-system-rest!312
This commit is contained in:
王夏晖
2021-12-22 16:54:11 +08:00
parent a79b7cbb2f b0b6a6f391
commit 8d52744eb7
10 changed files with 85 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sapMeetInfo/controller/SapMeetingController.java
+6
View File
@@ -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);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+5 -13
View File
@@ -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/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
-21
View File
@@ -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);
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarStandFileEOController.java
+2
View File
@@ -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
+2
View File
@@ -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
+3
View File
@@ -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
+2
View File
@@ -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
+5
View File
@@ -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);
adc-da-slrs/src/main/resources/mybatis/mapper/sarStandUnqualified/SarStandUnqualifiedMapper.xml
+10 -12
View File
@@ -61,30 +61,28 @@
c.*
FROM
(
SELECT b.*,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM (
SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* FROM
sar_stand_unqualified,(SELECT @i:=0)j
SELECT (@i:=@i+1) as rows,sar_stand_unqualified.* ,sar_standards_info.STAND_TYPE as standType , ts_user.UNAME as dutyEngineerName , ts_institution.name as responsibleUnit FROM
(sar_stand_unqualified,(SELECT @i:=0)j)
left join sar_standards_info on sar_stand_unqualified.STAND_ID = sar_standards_info.id
left join ts_user on ts_user.USID = sar_stand_unqualified.DUTY_ENGINEER
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
WHERE
close_state = 1
sar_stand_unqualified.close_state = 1
<if test="sar.standId != null and sar.standId != '' ">
and STAND_ID = #{standId}
and sar_stand_unqualified.STAND_ID = #{standId}
</if>
<if test="sar.productName != null and sar.productName != '' ">
and PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
and sar_stand_unqualified.PRODUCT_NAME like concat(concat('%',#{sar.productName}),'%')
</if>
<if test="sar.responsibleUnit != null and sar.responsibleUnit != '' ">
and RESPONSIBLE_UNIT = #{sar.responsibleUnit}
and ts_institution.name like concat('%',#{sar.responsibleUnit},'%')
</if>
<if test="sar.standSerialNumber != null and sar.standSerialNumber != '' ">
and (REPLACE(STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
and (REPLACE(sar_stand_unqualified.STAND_SERIAL_NUMBER,' ','') like concat(concat('%',REPLACE(#{sar.standSerialNumber},' ','')),'%')
or sar_stand_unqualified.STAND_NAME like concat(concat('%',#{sar.standSerialNumber}),'%'))
</if>
order by sar_stand_unqualified.STAND_ID ,sar_stand_unqualified.ITEMS_NUM asc
limit #{start},#{end}
)b
left join sar_standards_info on b.STAND_ID = sar_standards_info.id
left join ts_user on ts_user.USID = b.DUTY_ENGINEER
left join ts_institution on ts_institution.id=ts_user.INSTITUTION_ID
)c
ORDER BY c.STAND_ID, CONVERT(SUBSTRING(c.ITEMS_NUM,1,(SELECT LOCATE('.',CONCAT(c.ITEMS_NUM,'.')))),SIGNED) ,c.rows
</select>
adc-da-slrs/src/main/resources/mybatis/mapper/standardSplit/SarStandFileEOMapper.xml
+50
View File
@@ -312,6 +312,56 @@
) tmp_tb limit ${pager.startIndex-1},${pageSize}) a
</select>
<select id="getStandFileListByPageCount" parameterType="com.adc.da.base.page.BasePage"
resultType="java.lang.Integer">
select count(*) from
(select tmp_tb.* from
(
SELECT
SAR_STAND_FILE.id AS resId,
SAR_STAND_FILE.stand_id,
SAR_STAND_FILE.STAND_FILE_CLASSIFY,
SAR_STAND_FILE.file_name,
(
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) ) AS standNumber,
SAR_STANDARDS_INFO.stand_name as standName,
SAR_STAND_FILE.att_id AS attId1,
SAR_STANDARDS_INFO.STAND_TYPE as sarType
FROM
SAR_STAND_FILE
RIGHT JOIN SAR_STANDARDS_INFO ON ( SAR_STAND_FILE.STAND_ID = SAR_STANDARDS_INFO.ID AND SAR_STANDARDS_INFO.VALID_FLAG = 0 )
where SAR_STANDARDS_INFO.VALID_FLAG =0 and SAR_STAND_FILE.VALID_FLAG =0
<if test="fileSuffixList != null">
and SAR_STAND_FILE.file_suffix in
<foreach collection="fileSuffixList" index="index" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="standNumber != null">
and
if(
SAR_STANDARDS_INFO.STAND_YEAR='',
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number),
CONCAT(SAR_STANDARDS_INFO.stand_sort,' ',SAR_STANDARDS_INFO.stand_number,'-',SAR_STANDARDS_INFO.stand_year)
) like concat(concat('%',#{standNumber}),'%')
</if>
<if test="standName != null">
and SAR_STANDARDS_INFO.stand_name like concat(concat ('%',#{standName}),'%')
</if>
<if test="standFileClassify != null">
and SAR_STAND_FILE.STAND_FILE_CLASSIFY = #{standFileClassify}
</if>
<if test="fileType != null">
and SAR_STANDARDS_INFO.STAND_TYPE = #{fileType}
</if>
order by SAR_STAND_FILE.modify_time desc,SAR_STAND_FILE.id
) tmp_tb ) a
</select>
<select id="queryStandFileListByCount" resultType="java.lang.Integer" parameterType="com.adc.da.base.page.BasePage">
select count(1) from (
SELECT