diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java index a229d7d1..29878087 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java @@ -23,6 +23,7 @@ public class ActDefineStartMap { map.put("8","nonConformanceRectificationKey"); + map.put("9","standardReadWkflow"); return map.get(type); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java index d92d3c62..c07db780 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/StandAttrInfoDto.java @@ -38,10 +38,10 @@ public class StandAttrInfoDto { private String SSRQ; //新车型实施日期 数据库中字段实际没有GJ 如需要修改 可修改此处 @ExcelProperty("新车型实施日期") - private String XCXSSRQGJ; + private String XCXSSRQ; //在产车实施日期 @ExcelProperty("在产车实施日期") - private String ZCCSSRQGJ; + private String ZCCSSRQ; //责任部门 @ExcelProperty("责任部门") private String ZRBM; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index f3b765f9..daefcd71 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; +import com.adc.da.sys.service.IDicTypeEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -16,8 +17,9 @@ import javax.annotation.Resource; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; +import java.util.Map; + /** *

* 服务实现类 @@ -34,6 +36,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { SarStandProjectLibrary sar = new SarStandProjectLibrary(); @@ -181,8 +185,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl userList2 = sarStandAttrInfoDao.selectList(wrapper2); + + Map map= iDicTypeEOService.getDicTypeListCode(); + List> zrbn = (List>)map.get("ZRBMCLASS"); + for (SarStandAttrInfo l:userList2){ + if (org.apache.commons.lang3.StringUtils.isNotBlank(l.getZrbm()) && l.getZrbm().contains(",")){ + String[] split = l.getZrbm().split(","); + StringBuilder builder = new StringBuilder(); + for (String s:split){ + for (Map map1:zrbn) { + if (map1.get("value").equals(s)){ + s=map1.get("label"); + builder.append(s+","); + break; + } + } + } + String completedString = builder.delete(builder.length()-1,builder.length()).toString(); + l.setZrbm(completedString); + }else { + for (Map map1 : zrbn) { + if (map1.get("value").equals(l.getZrbm())) { + l.setZrbm(map1.get("label")); + break; + } + } + } + } for(SarStandardsInfo s:userList1){ StandAttrInfoDto p =new StandAttrInfoDto(); p.setStandNumber(s.getStandNumber()); @@ -231,11 +262,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl