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

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

Browse Source
This commit is contained in:
super_liu
2021-08-09 17:32:22 +08:00
parent 9c32571868 d7ed47a58f
commit faac8f3683
13 changed files with 541 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java
+12 -4
View File
@@ -5,9 +5,7 @@ import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto;
import com.adc.da.slrs.sarStandItems.entity.FindStandDto;
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,7 +13,6 @@ import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
@@ -55,6 +52,17 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
}
}
@ApiOperation(value = "分解单查询")
@GetMapping("/querySarItemAndInterpretation")
public ResponseMessage querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
List<SarItemVO> sarItemVOS = ServiceImpl.querySarItemAndInterpretation(page);
return Result.success("200",sarItemVOS);
}
@ApiOperation(value = "分解单查询(带时间)")
@GetMapping("/findAllItemsTimes")
public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+3 -3
View File
@@ -1,8 +1,6 @@
package com.adc.da.slrs.sarStandItems.dao;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
import com.adc.da.slrs.sarStandItems.entity.*;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.sys.common.SelectionResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -24,6 +22,8 @@ import java.util.Set;
@Mapper
public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page);
List<SarStandItems> querySarStandItemsList(SarStandItemsEOPage page);
int querySarStandItemsListCount(SarStandItemsEOPage page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/FindSarItemsPageReqDTO.java
+36
View File
@@ -0,0 +1,36 @@
package com.adc.da.slrs.sarStandItems.entity;
import com.adc.da.base.page.BasePage;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class FindSarItemsPageReqDTO {
private static final long serialVersionUID = 1L;
private Integer page = 1;
private Integer pageSize = 20;
@ApiModelProperty(value = "标准id")
private String standId;
@ApiModelProperty(value = "条款名称")
private String itemsName;
@ApiModelProperty(value = "新车型实施日期")
@DateTimeFormat(pattern = "yyy-MM-dd")
private Date XCXSSRQ;
@ApiModelProperty(value = "在产车实施日期")
@DateTimeFormat(pattern = "yyy-MM-dd")
private Date ZCCSSRQ;
@ApiModelProperty(value = "文件类型")
private String fileType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
+67
View File
@@ -0,0 +1,67 @@
package com.adc.da.slrs.sarStandItems.entity;
import com.adc.da.base.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
@ApiModel(value="标准分解单显示对象", description="")
public class SarItemVO extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
private String id;
@ApiModelProperty(value = "标准ID")
private String standId;
@ApiModelProperty(value = "条款号")
private String itemsNum;
@ApiModelProperty(value = "条款名称")
private String itemsName;
@ApiModelProperty(value = "条款内容")
private String itemsTitle;
@ApiModelProperty(value = "解读内容--条款要求")
private String termsConditions;
@ApiModelProperty(value = "新车实施日期")
@DateTimeFormat
private Date XCXSSRQ;
@ApiModelProperty(value = "在产车实施日期")
@DateTimeFormat
private Date ZCCSSRQ;
@ApiModelProperty(value = "适用车型")
private String applyArctic;
@ApiModelProperty(value = "责任部门")
private String responsibleUnit;
@ApiModelProperty(value = "责任工程师")
private String dutyEngineer;
@ApiModelProperty(value = "相对于上一版本变化点")
private String comparedWithPrevious;
@ApiModelProperty(value = "合规性分析")
private String complianceState;
@ApiModelProperty(value = "符合性要求-符合性状态")
private String complianceRequire;
@ApiModelProperty(value = "文件类型")
private String fileType;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+5
View File
@@ -189,4 +189,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
public List<SarStandItemsDto> findAllItems(String type,String[] ids){
return dao.selectAllItemsByIds(type,ids);
}
public List<SarItemVO> querySarItemAndInterpretation(FindSarItemsPageReqDTO page){
return dao.querySarItemAndInterpretation(page);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java
+3
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao;
import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary;
import com.adc.da.slrs.sarStandProjectLibrary.entity.StandProjectRelationDto;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
@@ -19,4 +20,6 @@ public interface SarStandProjectLibraryDao extends BaseMapper<SarStandProjectLib
List<SarStandProjectLibrary> queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize);
void deleteByIds(@Param("ids") List<StandProjectRelationDto> ids);
void batchInsert(@Param("list") List<StandProjectRelationDto> list);
List<SarStandProjectLibrary> selectPages(@Param("page")Integer page, @Param("size")Integer size,@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
Integer selectCount(@Param("qu") SarStandProjectLibrary sar,@Param("flag")int flag);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java
+2
View File
@@ -27,6 +27,8 @@ public class StandAttrInfoDto {
private String standSort;
//标准年份
private String standYear;
//标准类型
private String standType;
//中文名称
@ExcelProperty("中文名称")
private String standName;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+14 -35
View File
@@ -64,21 +64,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
} catch (ParseException e) {
e.printStackTrace();
}
QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
wrapper.inSql("id", "select project_id from sar_stand_project_relation")
.like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor())
.like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber())
.like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName())
.like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup())
.like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification())
.like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus())
.like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode())
.like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel())
.like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager())
.like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine())
.ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate())
.le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
int flag=2;
return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
}
@Override
public IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize,
@@ -106,21 +93,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
} catch (ParseException e) {
e.printStackTrace();
}
QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
wrapper.notInSql("id", "select project_id from sar_stand_project_relation")
.like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor())
.like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber())
.like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName())
.like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup())
.like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification())
.like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus())
.like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode())
.like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel())
.like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager())
.like(StringUtils.isNotEmpty(sar.getProductLine()),"product_line",sar.getProductLine())
.ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate())
.le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate());
return getSarStandProjectLibraryIPage(current, pageSize, wrapper);
int flag=1;
return getSarStandProjectLibraryIPage(current, pageSize, sar,flag);
}
@Override
public List<SarStandProjectLibrary> queryById(String id) {
@@ -158,7 +132,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
@Override
public IPage<StandAttrInfoDto> queryStandInfo(int current, int pageSize, String standId) {
QueryWrapper<SarStandardsInfo> wrapper1 = new QueryWrapper<>();
wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME");
wrapper1.select("ID","STAND_NUMBER","STAND_SORT","STAND_YEAR","STAND_NAME","STAND_EN_NAME","STAND_TYPE");
wrapper1.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_standards_info.ID WHERE r.project_id ='"+ standId+"'");
Page<SarStandardsInfo> page1 = new Page<>(current, pageSize);
IPage<SarStandardsInfo> userIPage1 = SarStandardsInfoDao.selectPage(page1, wrapper1);
@@ -181,6 +155,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setStandSort(s.getStandSort());
p.setStandYear(s.getStandYear());
p.setStandName(s.getStandName());
p.setStandType(s.getStandType());
p.setStandEnName(s.getStandEnName());
for (SarStandAttrInfo a:list2){
if(s.getId().equals(a.getStandId())){
@@ -282,11 +257,15 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
return list;
}
private IPage<SarStandProjectLibrary> getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper<SarStandProjectLibrary> wrapper) {
private IPage<SarStandProjectLibrary> getSarStandProjectLibraryIPage(int current, int pageSize,SarStandProjectLibrary wrapper,int flag) {
Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
System.out.println("总条数"+userIPage.getTotal());
System.out.println("总页数"+userIPage.getPages());
IPage<SarStandProjectLibrary> userIPage = new Page<>();
List<SarStandProjectLibrary> sarStandProjectLibraries=sarStandProjectLibraryDao.selectPages(current,pageSize,wrapper,flag);
Integer count = sarStandProjectLibraryDao.selectCount(wrapper,flag);
userIPage.setCurrent(current);
userIPage.setSize(pageSize);
userIPage.setRecords(sarStandProjectLibraries);
userIPage.setTotal(count);
return userIPage;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/controller/SarStandardComplianceAssessResultController.java
+1
View File
@@ -83,6 +83,7 @@ public class SarStandardComplianceAssessResultController {
queryWrapper.like("STAND_NUMBER",eo.getStandNumber().trim());
}
IPage<SarInterpretationNationalStandard> page = iSarInterpretationNationalStandardService.page(iPage, queryWrapper);
while(page.getRecords().remove(null));
return Result.success(page);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardComplianceAssessResult/entity/SarInterpretationNationalStandard.java
+4
View File
@@ -5,11 +5,13 @@ import java.time.LocalDateTime;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -84,6 +86,8 @@ public class SarInterpretationNationalStandard extends BaseEntity {
@ApiModelProperty(value = "评估时间")
@TableField("INTERPRETATION_TIME")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
private Date interpretationTime;
@TableField("ID")