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_1' into develop_master

Browse Source
This commit is contained in:
yuezhihang
2021-07-06 19:12:25 +08:00
parent 1ea0d09cb0 106e808b99
commit b4c0465f18
3 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/AddDetailedDto.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class AddDetailedDto {
@ApiModelProperty(value = "上传的附件")
private MultipartFile[] files;
@ApiModelProperty(value = "要添加的清单id")
private String[] lawsIds;
private String inforlist;
public MultipartFile getFiles(int i) {
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/DetailedUpDto.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class DetailedUpDto {
private String reNewPeople;
@ApiModelProperty(value = "要添加的清单id")
private String[] lawsIds;
private String inforlist;
@ApiModelProperty(value = "清单详情")
private String remark;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+36 -4
View File
@@ -9,6 +9,7 @@ import com.adc.da.slrs.sarLawsDetailedList.entity.AddDetailedDto;
import com.adc.da.slrs.sarLawsDetailedList.entity.SarLawsDetailedList;
import com.adc.da.slrs.sarLawsDetailedList.entity.DetailedUpDto;
import com.adc.da.slrs.sarLawsDetailedList.service.ISarLawsDetailedListService;
import com.adc.da.sys.service.IDicTypeEOService;
import com.adc.da.util.UUIDUtils;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -19,8 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.*;
/**
* <p>
@@ -41,6 +41,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
private SarLawsAttrDetailedListDao sarLawsAttrDetailedListDao;
@Autowired
private SarLawsAttrDetailedListServiceImpl service;
@Autowired
private IDicTypeEOService iDicTypeEOService;
@Override
public String del(List<String> idList) {
@@ -81,7 +83,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
break;
}
sarLawsDetailedListDao.insert(sarLawsDetailedList);
service.insertDetailedList(sarLawsDetailedList.getId(),addDetailedDto.getLawsIds());
String[] split = addDetailedDto.getInforlist().split(",");
service.insertDetailedList(sarLawsDetailedList.getId(),split);
} catch (Exception e) {
e.printStackTrace();
@@ -109,6 +112,34 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
wrapper.eq("sort_key",sortKey);
Page<SarLawsDetailedList> page = new Page<>(pages, size);
IPage<SarLawsDetailedList> userIPage = sarLawsDetailedListDao.selectPage(page, wrapper);
Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
List<SarLawsDetailedList> list= userIPage.getRecords();
List<Map<String, String>> arr = (List<Map<String, String>>)map.get("COUNTRY");
for (SarLawsDetailedList list1:list){
if (list1.getCountryArea().contains(",")){
String[] split = list1.getCountryArea().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.setCountryArea(completedString);
}else {
for (Map<String,String> map1:arr) {
if (map1.get("value").equals(list1.getCountryArea())){
list1.setCountryArea(map1.get("label"));
break;
}
}
}
}
userIPage.setRecords(list);
System.out.println("总条数" + userIPage.getTotal());
System.out.println("总页数" + userIPage.getPages());
return userIPage;
@@ -158,7 +189,8 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
else list.setDetailedListState(detailedUpDto.getDetailedListState());
sarLawsDetailedListDao.updateById(list);
service.updateDetailedLaws(detailedUpDto.getId(), detailedUpDto.getLawsIds());
String[] split = detailedUpDto.getInforlist().split(",");
service.updateDetailedLaws(detailedUpDto.getId(), split);
return "修改成功";
}