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

update：增加意见详情查询字段

Browse Source 
add：分解单查询时间
This commit is contained in:
zzy
2021-07-15 16:41:37 +08:00
parent 2e0f6e7934
commit 369e1532bc
14 changed files with 273 additions and 101 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
+8
View File
@@ -4,6 +4,7 @@ package com.adc.da.slrs.sarStandItems.controller;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl;
import io.swagger.annotations.ApiOperation;
@@ -50,4 +51,11 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
}
}
@ApiOperation(value = "分解单查询(带时间)")
@GetMapping("/findAllItemsTimes")
public List<SarItemsTime> findAllItemsTimes(@RequestParam("type") String type,@RequestParam("ids") String ids){
List<SarItemsTime> sarItemsTimes = ServiceImpl.findItemsTime(type,ids);
return sarItemsTimes;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/dao/SarStandItemsDao.java
+5
View File
@@ -2,6 +2,7 @@ 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.page.SarStandItemsEOPage;
import com.adc.da.sys.common.SelectionResult;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -54,4 +55,8 @@ public interface SarStandItemsDao extends BaseMapper<SarStandItems> {
List<SelectionResult> selectAllItemsSvpps(SarStandItems sarStandItemsEO);
List<SarStandItemsDto> selectAllItemsByIds(@Param("type") String type,@Param("ids") String[] ids);
StandsTimeDto selectStandTime(String standId);
List<StandsTimeDto> selectStandTimeAll();
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemsTime.java
+58
View File
@@ -0,0 +1,58 @@
package com.adc.da.slrs.sarStandItems.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* //TODO 添加类、接口描述
*
* @author ZhangZhiYuan
* @date 2021-07-14
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SarItemsTime {
@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 responsibleUnit;
@ApiModelProperty(value = "新车型实施日期")
@TableField("XCXSSRQ")
private String XCXSSRQ;
@ApiModelProperty(value = "在产车实施日期")
@TableField("ZCCSSRQ")
private String ZCCSSRQ;
@ApiModelProperty(value = "SVPPS")
private String svpps;
@ApiModelProperty(value = "适用车型")
private String applyArctic;
@ApiModelProperty(value = "要求类型")
private String claimType;
@ApiModelProperty(value = "覆盖关系")
private String busStandCover;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/StandsTimeDto.java
+33
View File
@@ -0,0 +1,33 @@
package com.adc.da.slrs.sarStandItems.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* //TODO 添加类、接口描述
*
* @author ZhangZhiYuan
* @date 2021-07-14
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class StandsTimeDto {
@ApiModelProperty(value = "标准ID")
@TableField("STAND_ID")
private String standId;
@ApiModelProperty(value = "新车型实施日期")
@TableField("XCXSSRQ")
private String XCXSSRQ;
@ApiModelProperty(value = "在产车实施日期")
@TableField("ZCCSSRQ")
private String ZCCSSRQ;
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/ISarStandItemsService.java
+2 -1
View File
@@ -1,11 +1,11 @@
package com.adc.da.slrs.sarStandItems.service;
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.ArrayList;
import java.util.List;
/**
@@ -19,4 +19,5 @@ import java.util.List;
public interface ISarStandItemsService extends IService<SarStandItems> {
List<ActSarItemsEO> queryItemsByList(SarStandItemsEOPage page, String resType);
List<SarItemsTime> findItemsTime(String type,String ids);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
+82
View File
@@ -1,13 +1,17 @@
package com.adc.da.slrs.sarStandItems.service.impl;
import com.adc.da.http.Result;
import com.adc.da.slrs.sarStandItems.entity.SarItemsTime;
import com.adc.da.slrs.sarStandItems.entity.SarStandItems;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
import com.adc.da.slrs.sarStandItems.entity.SarStandItemsDto;
import com.adc.da.slrs.sarStandItems.entity.StandsTimeDto;
import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage;
import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService;
import com.adc.da.slrs.sarStandardsInfo.entity.ActSarItemsEO;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -58,6 +62,84 @@ public class SarStandItemsServiceImpl extends ServiceImpl<SarStandItemsDao, SarS
return actitemsEOList;
}
@Override
public List<SarItemsTime> findItemsTime(String type, String ids) {
StandsTimeDto standsTimeDto=new StandsTimeDto();
List<SarItemsTime> sarItemsTime = new ArrayList<>();
if (!StringUtils.isEmpty(ids) && ids.contains(",")){
String[] strings=new String[1];
String[] Sids=ids.split(",");
for (String id : Sids){
strings[0]=id;
List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,strings);
standsTimeDto=dao.selectStandTime(id);
for (SarStandItemsDto sarStandItemsDto:ItemDto){
SarItemsTime itemsTime = SarItemsTime.builder()
.id(sarStandItemsDto.getId())
.standId(sarStandItemsDto.getStandId())
.itemsName(sarStandItemsDto.getItemsName())
.itemsNum(sarStandItemsDto.getItemsNum())
.responsibleUnit(sarStandItemsDto.getResponsibleUnit())
.XCXSSRQ(standsTimeDto.getXCXSSRQ())
.ZCCSSRQ(standsTimeDto.getZCCSSRQ())
.svpps(sarStandItemsDto.getSvpps())
.applyArctic(sarStandItemsDto.getApplyArctic())
.claimType(sarStandItemsDto.getClaimType())
.busStandCover(sarStandItemsDto.getBusStandCover())
.build();
sarItemsTime.add(itemsTime);
}
}
}else if (!StringUtils.isEmpty(ids)){
String[] Sids=new String[1];
Sids[0]=ids;
List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,Sids);
standsTimeDto=dao.selectStandTime(ids);
for (SarStandItemsDto sarStandItemsDto:ItemDto){
SarItemsTime itemsTime = SarItemsTime.builder()
.id(sarStandItemsDto.getId())
.standId(sarStandItemsDto.getStandId())
.itemsName(sarStandItemsDto.getItemsName())
.itemsNum(sarStandItemsDto.getItemsNum())
.responsibleUnit(sarStandItemsDto.getResponsibleUnit())
.XCXSSRQ(standsTimeDto.getXCXSSRQ())
.ZCCSSRQ(standsTimeDto.getZCCSSRQ())
.svpps(sarStandItemsDto.getSvpps())
.applyArctic(sarStandItemsDto.getApplyArctic())
.claimType(sarStandItemsDto.getClaimType())
.busStandCover(sarStandItemsDto.getBusStandCover())
.build();
sarItemsTime.add(itemsTime);
}
}else {
List<SarStandItemsDto> ItemDto = dao.selectAllItemsByIds(type,null);
List<StandsTimeDto> standsTimeDtos = dao.selectStandTimeAll();
for (SarStandItemsDto sarStandItemsDto:ItemDto){
for (StandsTimeDto standsTimeDto1:standsTimeDtos){
if (sarStandItemsDto.getStandId().equals(standsTimeDto1.getStandId())){
SarItemsTime itemsTime = SarItemsTime.builder()
.id(sarStandItemsDto.getId())
.standId(sarStandItemsDto.getStandId())
.itemsName(sarStandItemsDto.getItemsName())
.itemsNum(sarStandItemsDto.getItemsNum())
.responsibleUnit(sarStandItemsDto.getResponsibleUnit())
.XCXSSRQ(standsTimeDto1.getXCXSSRQ())
.ZCCSSRQ(standsTimeDto1.getZCCSSRQ())
.svpps(sarStandItemsDto.getSvpps())
.applyArctic(sarStandItemsDto.getApplyArctic())
.claimType(sarStandItemsDto.getClaimType())
.busStandCover(sarStandItemsDto.getBusStandCover())
.build();
sarItemsTime.add(itemsTime);
}
}
}
}
return sarItemsTime;
}
public List<SarStandItemsDto> findAllItems(String type,String[] ids){
return dao.selectAllItemsByIds(type,ids);
}