From 2e27eca0c2f00befa6117e258de45ad7f0503fb7 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Fri, 30 Jul 2021 10:04:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E8=A7=A3=E5=86=B3=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E9=A1=B9=E7=9B=AE=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/StandAttrInfoDto.java | 4 +- .../SarStandProjectLibraryServiceImpl.java | 45 ++++++++++++++++--- 2 files changed, 40 insertions(+), 9 deletions(-) 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 Date: Fri, 30 Jul 2021 11:00:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Update=EF=BC=9A=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E=E5=AE=9E=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/common/ActDefineStartMap.java | 1 + 1 file changed, 1 insertion(+) 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); } } From c458d52eef2d48acc241da05b137f269a5ff1417 Mon Sep 17 00:00:00 2001 From: "Mr.Z" <709235321@qq.com> Date: Fri, 30 Jul 2021 11:13:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93sar=5Fstand=5Funqualified=E8=A1=A8=E4=B8=ADSTAND=5FSER?= =?UTF-8?q?IAL=5FNUMBER=E5=AD=97=E6=AE=B5=E7=9A=84=E9=A2=9D=E5=A4=96?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java | 2 +- .../service/impl/SarStandUnqualifiedServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java index 18ffa0db..1c5c3a6a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/entity/SarStandUnqualified.java @@ -140,7 +140,7 @@ public class SarStandUnqualified extends BaseEntity { @ExcelProperty("标准编号组合") @ApiModelProperty(value = "标准编号组合") - @TableField("STAND_SERIAL_ NUMBER") + @TableField("STAND_SERIAL_NUMBER") private String standSerialNumber; @ExcelProperty(value = "产品类型",converter = ProductTypeConverter.class) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java index 864c621c..7ecd99ae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java @@ -60,7 +60,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl