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

Merge branch 'develop_1' into 'develop_master'

Browse Source 
update：清单修改，时间查询

See merge request !57
This commit is contained in:
super_liu
2021-07-27 00:58:31 +00:00
parent bcb0106983 ad2b29f072
commit 6f286d6ca5
7 changed files with 73 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/controller/SarLawsAttrDetailedListController.java
+1 -4
View File
@@ -52,9 +52,6 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
/**
* @param Page 页数
* @param Size 大小
* @param id 清单id
* @return ResponseMessage
* @author zzy
* date 2021-06-17
@@ -104,7 +101,7 @@ public class SarLawsAttrDetailedListController extends BaseController<SarLawsAtt
@ApiOperation(value = "根据标准查询时间")
@GetMapping
public ResponseMessage selectTimes(String id){
Map<String ,List<StandTimeDto>> map = iSarLawsAttrDetailedList.selectTimes(id);
Map<String ,List<String>> map = iSarLawsAttrDetailedList.selectTimes(id);
return Result.success("200",map);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/entity/LawsDto.java
+2
View File
@@ -45,6 +45,8 @@ public class LawsDto {
private String standYear;
@ExcelProperty(value = "标准类别", index = 6)
private String standSortShow;
@ExcelProperty(value = "标准类别", index = 6)
private String issueTime;
@ColumnWidth(16)
@ExcelProperty(value = "标准实施日期", index = 7)
@ApiModelProperty(value = "标准实施日期")
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/ISarLawsAttrDetailedListService.java
+1 -1
View File
@@ -23,5 +23,5 @@ public interface ISarLawsAttrDetailedListService extends IService<SarLawsAttrDet
Boolean updateDetailedLaws(String id,List<TimeDto> timeDtos);
void exportExcel(HttpServletResponse response, StandExcelVo standExcelVo);
int setTimes(SarLawsAttrDetailedList sarLawsAttrDetailedList);
Map<String ,List<StandTimeDto>> selectTimes(String id);
Map<String ,List<String>> selectTimes(String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java
+48 -17
View File
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarLawsAttrDetailedList.service.impl;
import com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao;
import com.adc.da.slrs.sarLawsAttrDetailedList.entity.*;
import com.adc.da.slrs.sarLawsAttrDetailedList.service.ISarLawsAttrDetailedListService;
import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList;
import com.adc.da.slrs.sarLawsDetailedList.entity.TimeDto;
import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
@@ -15,10 +16,7 @@ import org.springframework.util.CollectionUtils;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* <p>
@@ -225,25 +223,58 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl<SarLawsAttrD
}
@Override
public Map<String, List<StandTimeDto>> selectTimes(String id) {
public Map<String, List<String>> selectTimes(String id) {
List<StandRegionalTimeDto> standRegionalTimeDto= sarLawsAttrDetailedListDao.selectTimes(id);
Map<String, List<StandTimeDto>> mapList = new HashMap<String, List<StandTimeDto>>();
for (StandRegionalTimeDto s:standRegionalTimeDto){
List<StandTimeDto> list;
if (mapList.containsKey(s.getCountry())){
list = mapList.get(s.getCountry());
Map<String, Object> map = iDicTypeEOService.getDicTypeListCode();
List<Map<String, String>> arr = (List<Map<String, String>>) map.get("COUNTRY");
for (StandRegionalTimeDto list1 : standRegionalTimeDto) {
if (StringUtils.isNotBlank(list1.getCountry()) && list1.getCountry().contains(",")) {
String[] split = list1.getCountry().split(",");
StringBuilder builder = new StringBuilder();
for (String s : split) {
for (Map<String, String> map1 : arr) {
if (map1.get("value").equals(s)) {
s = map1.get("label");
builder.append(s + ",");
break;
}
}
}
String completedString = builder.delete(builder.length() - 1, builder.length()).toString();
list1.setCountry(completedString);
}else {
list = new ArrayList<>();
for (Map<String,String> map1:arr) {
if (map1.get("value").equals(list1.getCountry())){
list1.setCountry(map1.get("label"));
break;
}
}
}
StandTimeDto standTimeDto = new StandTimeDto();
standTimeDto.setPutTime(s.getPutTime());
standTimeDto.setXcxssrq(s.getXcxssrq());
standTimeDto.setZccssrq(s.getZccssrq());
list.add(standTimeDto);
mapList.put(s.getCountry(),list);
}
LinkedHashMap<String, List<String>> mapList = new LinkedHashMap<String, List<String>>();
List<String> putTime = new ArrayList<>();
List<String> xcx = new ArrayList<>();
List<String> zcc= new ArrayList<>();
for (StandRegionalTimeDto s:standRegionalTimeDto){
if (mapList.containsKey("实施日期("+s.getCountry()+")")||mapList.containsKey("新车型实施日期("+s.getCountry()+")")||mapList.containsKey("在产车实施日期("+s.getCountry()+")")){
putTime = mapList.get("实施日期("+s.getCountry()+")");
xcx = mapList.get("新车型实施日期("+s.getCountry()+")");
zcc = mapList.get("在产车实施日期("+s.getCountry()+")");
}
dateTime(mapList, putTime, xcx, zcc, s);
}
return mapList;
}
private void dateTime(LinkedHashMap<String, List<String>> mapList, List<String> putTime, List<String> xcx, List<String> zcc, StandRegionalTimeDto s) {
putTime.add(s.getPutTime()) ;
xcx.add(s.getXcxssrq());
zcc.add(s.getZccssrq());
mapList.put("实施日期("+s.getCountry()+")",putTime);
mapList.put("新车型实施日期("+s.getCountry()+")",xcx);
mapList.put("在产车实施日期("+s.getCountry()+")",zcc);
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
-1
View File
@@ -149,7 +149,6 @@ public class SarLawsDetailedListController extends BaseController<SarLawsDetaile
@ApiOperation(value = "修改清单")
@PutMapping("/updateList")
public ResponseMessage updateList(@RequestBody DetailedUpDto detailedUpDto) {
String src = sarLawsDetailedListService.updateList(detailedUpDto);
return Result.success("200",src,true);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+13 -6
View File
@@ -61,6 +61,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
@Override
public String add(AddDetailedDto addDetailedDto) {
addDetailedDto.setInforlist(addDetailedDto.getInforlist().substring(1, addDetailedDto.getInforlist().length() -1));
addDetailedDto.setInforlist1(addDetailedDto.getInforlist1().substring(1, addDetailedDto.getInforlist1().length() -1));
addDetailedDto.setInforlist2(addDetailedDto.getInforlist2().substring(1, addDetailedDto.getInforlist2().length() -1));
addDetailedDto.setInforlist3(addDetailedDto.getInforlist3().substring(1, addDetailedDto.getInforlist3().length() -1));
try {
SarLawsDetailedList sarLawsDetailedList = SarLawsDetailedList.builder()
.id(UUIDUtils.randomUUID20())
@@ -88,17 +91,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
for (int a =0;a< id.length;a++){
TimeDto dto = new TimeDto();
dto.setStandId(id[a]);
if ("\"".equals(putTime[a])){
if (null==putTime[a]){
dto.setPutTime(null);
}else {
dto.setPutTime(putTime[a]);
}
if ("\"".equals(putTime[a])){
if (null == xcx[a]){
dto.setXcxssrqgj(null);
}else {
dto.setXcxssrqgj(xcx[a]);
}
if ("\"".equals(putTime[a])){
if (null == zcc[a]){
dto.setZccssrqgj(null);
}else {
dto.setZccssrqgj(zcc[a]);
@@ -185,7 +188,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
} else if ("3".equals(sortKey)) {
wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list_state", detailedList).
wrapper.like(StringUtils.isNotEmpty(detailedList), "detailed_list", detailedList).
like(StringUtils.isNotEmpty(detailedListName), "detailed_list_name", detailedListName);
}
wrapper.eq("sort_key", sortKey);
@@ -277,7 +280,7 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
if (null != detailedUpDto.getInforlist()) {
detailedUpDto.setInforlist(detailedUpDto.getInforlist().substring(1, detailedUpDto.getInforlist().length() - 1));
List<TimeDto> timeDto = new ArrayList<>();
if (detailedUpDto.getInforlist().indexOf(",") >= 0) {
if ("1".equals(detailedUpDto.getSortKey()) && detailedUpDto.getInforlist().contains(",")) {
String[] id = detailedUpDto.getInforlist().split(",");
String[] putTime = detailedUpDto.getInforlist1().split(",");
String[] zcc = detailedUpDto.getInforlist2().split(",");
@@ -302,13 +305,17 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
}
timeDto.add(dto);
}
} else {
} else if ("1".equals(detailedUpDto.getSortKey())){
TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist());
dto.setPutTime(detailedUpDto.getInforlist1());
dto.setXcxssrqgj(detailedUpDto.getInforlist2());
dto.setZccssrqgj(detailedUpDto.getInforlist3());
timeDto.add(dto);
}else {
TimeDto dto = new TimeDto();
dto.setStandId(detailedUpDto.getInforlist());
timeDto.add(dto);
}
service.updateDetailedLaws(detailedUpDto.getId(), timeDto);
}
adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
+8 -3
View File
@@ -4,14 +4,17 @@
<select id="selectLawsById" parameterType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.SarFindDto" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN,
b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear
b.CLLX as typeApplicable,dicstandSort.DIC_TYPE_NAME as standSortShow ,a.STAND_YEAR as standYear,ISSUE_TIME as issueTime
FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
a.ID = b.STAND_ID left join TS_DICTYPE dicstandSort on (dicstandSort.dic_type_code = a.stand_sort and
dicstandSort.dic_id is not null and dicstandSort.valid_flag = 0 and dicstandSort.PARENT_ID is null)
<where>
<if test="sarFindDto.standName != null">
(a.STAND_NUMBER LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%'))
or a.STAND_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
or a.STAND_YEAR LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
or dicstandSort.DIC_TYPE_NAME LIKE concat ('%',#{sarFindDto.standName,jdbcType=VARCHAR},'%')
)
and
</if>
<if test="sarFindDto.standEnName != null">
@@ -94,9 +97,11 @@
WHERE
b.sort_key = 1
AND a.stand_id = #{standId}
AND (a.putTime is not NULL
AND a.xcxssrq is not NULL
AND a.zccssrq is not NULL)
</select>
<insert id="insertList">
INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ,putTime,xcxssrq,zccssrq) VALUES
<foreach collection ="sarLawsAttrDetailedLists" item="list" separator =",">