Merge remote-tracking branch 'origin/develop_master' into develop_master

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);
     }
 }

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;

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;
+
 /**
  * <p>
  *  服务实现类
@@ -34,6 +36,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
     private SarStandardsInfoDao SarStandardsInfoDao;
     @Resource
     private SarStandAttrInfoDao sarStandAttrInfoDao;
+    @Resource
+    private IDicTypeEOService iDicTypeEOService;
     @Override
     public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) {
         SarStandProjectLibrary sar = new SarStandProjectLibrary();
@@ -181,8 +185,8 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
                     p.setCYCVPPSBM(a.getCycvppsbm());
                     p.setCYCVPPSCN(a.getCycvppscn());
                     p.setSSRQ(a.getSsrq());
-                    p.setXCXSSRQGJ(a.getXcxssrq());
+                    p.setXCXSSRQ(a.getXcxssrq());
-                    p.setZCCSSRQGJ(a.getZccssrq());
+                    p.setZCCSSRQ(a.getZccssrq());
                     p.setKCCVPPSBM(a.getKccvppsbm());
                     p.setKCCVPPSCN(a.getKccvppscn());
                     p.setZRBM(a.getZrbm());
@@ -219,6 +223,33 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
         wrapper2.select("r.STAND_ID","SSRQ","XCXSSRQ","ZCCSSRQ","ZRBM","KCCVPPSBM","KCCVPPSCN","CYCVPPSBM","CYCVPPSCN");
         wrapper2.last("INNER JOIN sar_stand_project_relation r ON r.stand_id = sar_stand_attr_info.STAND_ID WHERE r.stand_id in ("+ idmis +") and r.project_id = '"+ id+"'");
         List<SarStandAttrInfo> userList2 = sarStandAttrInfoDao.selectList(wrapper2);
+
+        Map<String,Object> map= iDicTypeEOService.getDicTypeListCode();
+        List<Map<String, String>> zrbn = (List<Map<String, String>>)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<String,String> 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<String, String> 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<SarStandProje
                     if (a.getSsrq()!=null){
                         p.setSSRQ(a.getSsrq().substring(0,10));
                     }
-                    if (a.getXcxssrqgj()!=null){
+                    if (a.getXcxssrq()!=null){
-                        p.setXCXSSRQGJ(a.getXcxssrq().substring(0,10));
+                        p.setXCXSSRQ(a.getXcxssrq().substring(0,10));
                     }
-                    if (a.getZccssrqgj()!=null){
+                    if (a.getZccssrq()!=null){
-                        p.setZCCSSRQGJ(a.getZccssrq().substring(0,10));
+                        p.setZCCSSRQ(a.getZccssrq().substring(0,10));
                     }
                     p.setKCCVPPSBM(a.getKccvppsbm());
                     p.setKCCVPPSCN(a.getKccvppscn());

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)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java

@@ -60,7 +60,7 @@ public class SarStandUnqualifiedServiceImpl extends ServiceImpl<SarStandUnqualif
 //            sarStandUnqualifiedQueryWrapper.eq("stand_id",sarStandUnqualifiedPage.getStandId()).or().like("stand_name","%"+sarStandUnqualifiedPage.getStandId()+"%");
         }
         if (sarStandUnqualifiedPage.getStandSerialNumber()!=null){
-            sarStandUnqualifiedQueryWrapper.like("STAND_SERIAL_ NUMBER",sarStandUnqualifiedPage.getStandSerialNumber());
+            sarStandUnqualifiedQueryWrapper.like("STAND_SERIAL_NUMBER",sarStandUnqualifiedPage.getStandSerialNumber());
         }
         if (sarStandUnqualifiedPage.getStandName()!=null){
             sarStandUnqualifiedQueryWrapper.like("stand_name",sarStandUnqualifiedPage.getStandName());