diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java index 2efb26af8..3d6e6f714 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/ModuleEnum.java @@ -11,7 +11,8 @@ public enum ModuleEnum { FILE_SPLIT("文档拆分","3"), FILE_SPLIT_ITEMS("文档拆分条款","4"), ONL_CGFORM_COLLECTION("我的收藏","5"), - ONL_CGFORM_SUBSCRIBE("我的订阅","6"); + ONL_CGFORM_SUBSCRIBE("我的订阅","6"), + PARAMS_COLLECT_MANIFEST("参数收集清单","7"); String name; diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java index 896e55f4a..659566035 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/TableEnum.java @@ -13,7 +13,8 @@ public enum TableEnum { TAG("onl_cgform_tag"), TAG_AREA("onl_cgform_area"), ONL_CGFORM_COLLECTION("onl_cgform_collection"), - ONL_CGFORM_SUBSCRIBE("onl_cgform_subscribe"); + ONL_CGFORM_SUBSCRIBE("onl_cgform_subscribe"), + PARAMS_COLLECT_MANIFEST("params_collect_manifest"); String table; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 186c2a5db..429af7206 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -826,6 +826,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl { @Autowired private IParamsCollectManifestEOService paramsCollectManifestEOService; - + /** - * 分页列表查询 + * 表头中英文切换 * - * @param paramsCollectManifestEO - * @param pageNo - * @param pageSize - * @param req * @return */ - @AutoLog(value = "参数收集清单-分页列表查询") - @ApiOperation(value="参数收集清单-分页列表查询", notes="参数收集清单-分页列表查询") - @GetMapping(value = "/page") - public Result queryPageList(ParamsCollectManifestEO paramsCollectManifestEO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(paramsCollectManifestEO, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = paramsCollectManifestEOService.page(page, queryWrapper); - return Result.OK(pageList); + @AutoLog(value = "参数收集清单-表头中英文切换") + @ApiOperation(value="参数收集清单-表头中英文切换", notes="参数收集清单-表头中英文切换") + @GetMapping(value = "/getHeader") + public Result>> getHeader(@RequestParam(name = "paramsManifestId") String paramsManifestId, + @RequestParam(name = "flag") String flag, + @RequestParam(name = "cut") String cut) { + List> list = paramsCollectManifestEOService.getHeader(paramsManifestId, flag, cut); + return Result.OK(list); } /** @@ -66,8 +57,9 @@ public class ParamsCollectManifestEOController extends JeroController> queryList() { - List list = paramsCollectManifestEOService.queryList(); + public Result>> queryList(ParamsCollectManifestEO paramsCollectManifestEO, + @RequestParam(name = "cut") String cut) { + List> list = paramsCollectManifestEOService.queryList(paramsCollectManifestEO, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java index 2797d3060..420e8a68f 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigDataEOController.java @@ -137,8 +137,9 @@ public class ParamsConfigDataEOController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { - ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(id); + public Result queryById(@RequestParam(name="paramsConfigId",required=true) String paramsConfigId, + @RequestParam(name="paramsCollectManifestId",required=true) String paramsCollectManifestId) { + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(paramsConfigId, paramsCollectManifestId); if(paramsConfigDataEO==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java index d016ebd15..e8b70424e 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java @@ -1,10 +1,9 @@ package com.jero.modules.cert.collect.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; -import com.jero.modules.cert.collect.ParamsConfigVO; +import com.jero.modules.cert.collect.vo.ParamsConfigVO; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.jero.modules.cert.collect.service.IParamsConfigEOService; import io.swagger.annotations.Api; @@ -41,10 +40,7 @@ public class ParamsConfigEOController extends JeroController> queryList(@RequestParam(name = "cut") String cut, @RequestParam(name = "paramsManifestId") String paramsManifestId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); - queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); - List list = paramsConfigEOService.list(queryWrapper); + List list = paramsConfigEOService.queryList(paramsManifestId); return Result.OK(cut, list); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java index 6798b6777..b50d58e5d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsCollectManifestEO.java @@ -1,21 +1,18 @@ package com.jero.modules.cert.collect.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -30,7 +27,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; @EqualsAndHashCode(callSuper = false) @ApiModel(value="params_collect_manifest对象", description="参数收集清单") public class ParamsCollectManifestEO implements Serializable { - private static final long serialVersionUID = 1L; +// private static final long serialVersionUID = 1L; /**主键*/ @TableId(type = IdType.ASSIGN_ID) @@ -157,5 +154,4 @@ public class ParamsCollectManifestEO implements Serializable { @Excel(name = "是否冻结", width = 15) @ApiModelProperty(value = "是否冻结") private String isLock; - } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java new file mode 100644 index 000000000..112e51a0f --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestStateEnum.java @@ -0,0 +1,72 @@ +package com.jero.modules.cert.collect.enums; + +import com.jero.common.constant.enums.CutEnum; +import com.jero.modules.cert.template.enums.ControlTypeEnum; + +import java.util.HashMap; +import java.util.Map; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 15:17 2022/5/7 + */ +public enum CollectManifestStateEnum { + WAIT_COLLECT("待发起收集","wait collect","1"), + WAIT_SDT("待工程接口人处理","wait sdt","2"), + SDT_BACK("工程接口人退回","sdt back","3"), + WAIT_FILL("待填写","wait fill","4"), + DRE_BACK("填写人退回","dre back","5"), + SUBMIT("已提交","submit","6"), + CERT_BACK("认证工程师退回","cert back","7"), + SYNC_REPORT("已同步至上报库","sync report","8"), + CHANGE("变更","change","9"); + + String name; + String enName; + String value; + + CollectManifestStateEnum(String name, String enName, String value) { + this.name = name; + this.enName = enName; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } + + public static Map toMap(String cut){ + Map map = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + for (CollectManifestStateEnum collectManifestStateEnum : CollectManifestStateEnum.values()) { + map.put(collectManifestStateEnum.getValue(), collectManifestStateEnum.getName()); + } + } else if (CutEnum.EN.getValue().equals(cut)) { + for (CollectManifestStateEnum collectManifestStateEnum : CollectManifestStateEnum.values()) { + map.put(collectManifestStateEnum.getValue(), collectManifestStateEnum.getEnName()); + } + } + return map; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java new file mode 100644 index 000000000..68928cf9c --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/ConfigDataTypeEnum.java @@ -0,0 +1,37 @@ +package com.jero.modules.cert.collect.enums; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 11:33 2022/5/7 + */ +public enum ConfigDataTypeEnum { + TEXT("文本","text"), + PULL("单选","pull"), + PULL_MORE("多选","pull_more"), + FILE("附件","file"); + + String name; + String value; + + ConfigDataTypeEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index ac6ce5c2e..47146746d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ParamsCollectManifestEOMapper extends BaseMapper { -} + List listInfo(@Param("paramsCollectManifestEO") ParamsCollectManifestEO paramsCollectManifestEO); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index ddee20ad5..bfb27e565 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -28,4 +28,36 @@ + + + + + AND nio_number LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.nioNumber}),'%') + + + AND params_name LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsName}),'%') + + + AND cert_category LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.certCategory}),'%') + + + AND dre LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dre}),'%') + + + AND duty_territory LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.dutyTerritory}),'%') + + + AND params_manifest_id LIKE CONCAT(CONCAT('%',#{paramsCollectManifestEO.paramsManifestId}),'%') + + + + + + + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index b769d47cf..004dcfe3d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -3,6 +3,7 @@ package com.jero.modules.cert.collect.service; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** * @Description: 参数收集清单 @@ -54,8 +55,18 @@ public interface IParamsCollectManifestEOService extends IService queryList(); + List> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut); + + /** + * 列表表头中英文切换 + * @param paramsManifestId + * @param flag + * @param cut + * @return + */ + List> getHeader(String paramsManifestId, String flag, String cut); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java index f0e015c27..ef950390c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigDataEOService.java @@ -47,10 +47,11 @@ public interface IParamsConfigDataEOService extends IService /** * 通过id查询 * - * @param id + * @param paramsConfigId + * @param paramsCollectManifestId * @return */ - ParamsConfigDataEO queryById(String id); + ParamsConfigDataEO queryById(String paramsConfigId, String paramsCollectManifestId); /** * 列表查询 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java index da1b6b28a..c7f4f359a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java @@ -1,7 +1,7 @@ package com.jero.modules.cert.collect.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.modules.cert.collect.ParamsConfigVO; +import com.jero.modules.cert.collect.vo.ParamsConfigVO; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import java.util.List; @@ -59,5 +59,5 @@ public interface IParamsConfigEOService extends IService { * * @return */ - List queryList(); + List queryList(String paramsManifestId); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index b7bdc3ca7..8d2933968 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1,12 +1,33 @@ package com.jero.modules.cert.collect.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.generater.modules.online.cgform.entity.OnlCgformField; +import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; +import com.jero.modules.cert.collect.enums.ConfigDataTypeEnum; import com.jero.modules.cert.collect.mapper.ParamsCollectManifestEOMapper; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; +import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; +import com.jero.modules.cert.collect.service.IParamsConfigEOService; +import com.jero.modules.cert.collect.vo.ParamsConfigDataVO; +import com.jero.modules.cert.template.enums.ControlTypeEnum; +import com.jero.modules.ocr.util.LineHumpUtil; +import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.service.ISysDictItemService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import java.lang.reflect.Field; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 参数收集清单 @@ -17,6 +38,21 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ParamsCollectManifestEOServiceImpl extends ServiceImpl implements IParamsCollectManifestEOService { + @Autowired + private ParamsCollectManifestEOMapper paramsCollectManifestEOMapper; + + @Autowired + private OnlCgformFieldServiceImpl onlCgformFieldService; + + @Autowired + private IParamsConfigEOService paramsConfigEOService; + + @Autowired + private IParamsConfigDataEOService paramsConfigDataEOService; + + @Autowired + private ISysDictItemService sysDictItemService; + /** * 保存 * @@ -83,7 +119,317 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List> queryList(ParamsCollectManifestEO paramsCollectManifestEO, String cut) { + String paramsManifestId = paramsCollectManifestEO.getParamsManifestId(); + + List list = paramsCollectManifestEOMapper.listInfo(paramsCollectManifestEO); // 查询固定列 + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 + + // 普通数据字典 + List dictItemList = new ArrayList<>(); + List dictCodeList = new ArrayList<>(); + dictCodeList.add("duty_territory"); + dictCodeList.add("cert_category"); + for (String dictCode : dictCodeList) { + List dictItems = sysDictItemService.selectItemsByDictCode(dictCode); + dictItemList.addAll(dictItems); + } + + List> listMap = new ArrayList<>(); + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + list.forEach(collectManifestEO -> { // 参数收集清单 + // 处理数据字典字段 中英文切换 认证类型，责任领域 + List certCategory = Arrays.asList(collectManifestEO.getCertCategory().split(",")); + List dutyTerritory = Arrays.asList(collectManifestEO.getDutyTerritory().split(",")); + String certCategoryName = ""; + String dutyTerritoryName = ""; + if (CutEnum.CN.getValue().equals(cut)) { + certCategoryName = dictItemList.stream() + .filter(e -> certCategory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + + dutyTerritoryName = dictItemList.stream() + .filter(e -> dutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getItemText) + .collect(Collectors.joining(",")); + + } else if (CutEnum.EN.getValue().equals(cut)) { + certCategoryName = dictItemList.stream() + .filter(e -> certCategory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + + dutyTerritoryName = dictItemList.stream() + .filter(e -> dutyTerritory.contains(e.getItemValue())) + .map(SysDictItem::getEnName) + .collect(Collectors.joining(",")); + + } + + +// String certCategoryName = sysDictService.queryDictItemByValue("cert_category", collectManifestEO.getCertCategory(), cut); + collectManifestEO.setCertCategory(certCategoryName); +// String dutyTerritoryName = sysDictService.queryDictItemByValue("duty_territory", collectManifestEO.getDutyTerritory(), cut); + collectManifestEO.setDutyTerritory(dutyTerritoryName); + + // 处理状态字段 + Map collectManifestStateMap = CollectManifestStateEnum.toMap(cut); + String stateName = collectManifestStateMap.get(collectManifestEO.getState()); + collectManifestEO.setState(stateName); + + Map manifestMap = objectToMap(collectManifestEO); // 对象转map + String controlType = collectManifestEO.getControlType(); + String paramsCollectManifestId = collectManifestEO.getId(); + + if (CollectionUtil.isNotEmpty(paramsConfigEOList)) { + paramsConfigEOList.forEach(paramsConfigEO -> { // 参数配置 + Map configMap = new HashMap<>(); + String paramsConfigId = paramsConfigEO.getId(); + ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataEOService.queryById(paramsConfigId, paramsCollectManifestId); // 参数配置数据 + List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + configMap.put("controlType", controlType); + configMap.put("list", paramsConfigDataVOList); + manifestMap.put(paramsConfigEO.getId(), configMap); + }); + } + + listMap.add(manifestMap); + }); + } + return listMap; } + + /** + * 重新组装配置数据 用于返回前端 + * @param controlType + * @param paramsConfigDataEO + * @param paramsCollectManifestEO + * @return + */ + private List getConfigDataVOList(String controlType, ParamsConfigDataEO paramsConfigDataEO, ParamsCollectManifestEO paramsCollectManifestEO) { + List paramsConfigDataVOList = new ArrayList<>(); + + if (ControlTypeEnum.TEXT.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + configDataVO.setControlValue(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) { + configDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.PULL_SINGLE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + configDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + configDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.PULL_MORE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + configDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + configDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO configDataVO = new ParamsConfigDataVO(); + configDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) { + configDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(configDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_MORE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO(); + pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullMoreConfigDataVO); + + } else if (ControlTypeEnum.TEXT_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.PULL_SINGLE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.PULL_MORE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO pullMoreConfigDataVO = new ParamsConfigDataVO(); + pullMoreConfigDataVO.setType(ConfigDataTypeEnum.PULL_MORE.getValue()); + pullMoreConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + pullMoreConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullMoreConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } else if (ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue().equals(controlType)) { + + ParamsConfigDataVO textConfigDataVO = new ParamsConfigDataVO(); + textConfigDataVO.setType(ConfigDataTypeEnum.TEXT.getValue()); + textConfigDataVO.setControlValue(paramsCollectManifestEO.getControlVerify()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getTextData())) { + textConfigDataVO.setDataValue(paramsConfigDataEO.getTextData()); + } + paramsConfigDataVOList.add(textConfigDataVO); + + ParamsConfigDataVO pullConfigDataVO = new ParamsConfigDataVO(); + pullConfigDataVO.setType(ConfigDataTypeEnum.PULL.getValue()); + pullConfigDataVO.setControlValue(paramsCollectManifestEO.getControlValues()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getPullData())) { + pullConfigDataVO.setDataValue(paramsConfigDataEO.getPullData()); + } + paramsConfigDataVOList.add(pullConfigDataVO); + + ParamsConfigDataVO fileConfigDataVO = new ParamsConfigDataVO(); + fileConfigDataVO.setType(ConfigDataTypeEnum.FILE.getValue()); + if (ObjectUtil.isNotEmpty(paramsConfigDataEO) && StringUtils.isEmpty(paramsConfigDataEO.getFileConnectId())) { + fileConfigDataVO.setDataValue(paramsConfigDataEO.getFileConnectId()); + } + paramsConfigDataVOList.add(fileConfigDataVO); + + } + return paramsConfigDataVOList; + } + + /** + * 列表表头中英文切换 + * + * @return + */ + @Override + public List> getHeader(String paramsManifestId, String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); // flag--->7 + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); + List> listConfig = new LinkedList<>(); + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { + Map map = new HashMap<>(); + map.put("db_field_name", paramsConfigEO.getId()); + map.put("db_field_txt", paramsConfigEO.getConfigName()); + map.put("type", true); //配置列 标识 + listConfig.add(map); + } + + List> list = new LinkedList<>(); + int indexOfDescription = 1; // 参数说明的位置 + for (int i = 0; i < fieldList.size(); i++) { + OnlCgformField onlCgformField = fieldList.get(i); + Map map = new HashMap<>(); + String dbFieldName = onlCgformField.getDbFieldName(); + if ("description".equals(dbFieldName)) { + indexOfDescription = i; + } + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + + list.addAll(indexOfDescription+1, listConfig); + return list; + } + + /** + * 实体对象转成Map + * @param obj 实体对象 + * @return + */ + private Map objectToMap(Object obj) { + Map map = new HashMap<>(); + if (obj == null) { + return map; + } + Class clazz = obj.getClass(); + Field[] fields = clazz.getDeclaredFields(); + try { + for (Field field : fields) { + field.setAccessible(true); + map.put(field.getName(), field.get(obj)); + } + } catch (Exception e) { + e.printStackTrace(); + } + return map; + } + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java index b5f540990..33a861895 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigDataEOServiceImpl.java @@ -1,12 +1,14 @@ package com.jero.modules.cert.collect.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper; import com.jero.modules.cert.collect.service.IParamsConfigDataEOService; import org.springframework.stereotype.Service; -import java.util.List; + import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 参数配置数据 @@ -69,12 +71,17 @@ public class ParamsConfigDataEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigDataEO::getParamsConfigId, paramsConfigId); + queryWrapper.eq(ParamsConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); + getOne(queryWrapper); + return getOne(queryWrapper); } /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index d97897269..9bbf26128 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -1,9 +1,10 @@ package com.jero.modules.cert.collect.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; -import com.jero.modules.cert.collect.ParamsConfigVO; +import com.jero.modules.cert.collect.vo.ParamsConfigVO; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper; import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; @@ -43,18 +44,18 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl paramsConfigEOList = paramsConfigVO.getParamsConfigEOList(); - int ind = 1; +// int ind = 1; List addConfigList = new ArrayList<>(); // 新增的配置 List updateConfigList = new ArrayList<>(); // 修改的配置 for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { paramsConfigEO.setParamsManifestId(paramsManifestId); - paramsConfigEO.setDisplaySeq(ind); +// paramsConfigEO.setDisplaySeq(ind); if (StringUtils.isEmpty(paramsConfigEO.getId())) { addConfigList.add(paramsConfigEO); } else { updateConfigList.add(paramsConfigEO); } - ind++; +// ind++; } // 删除的配置 @@ -136,7 +137,11 @@ public class ParamsConfigEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(String paramsManifestId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); + List list = list(queryWrapper); + return list; } } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 64e1cb0bd..8cf5a84c6 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.cert.collect.entity.ParamsCollectManifestEO; import com.jero.modules.cert.collect.entity.ParamsManifestEO; +import com.jero.modules.cert.collect.enums.CollectManifestStateEnum; import com.jero.modules.cert.collect.enums.ManifestStateEnum; import com.jero.modules.cert.collect.mapper.ParamsManifestEOMapper; import com.jero.modules.cert.collect.service.IParamsCollectManifestEOService; @@ -64,6 +65,9 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl发布 2-->撤回 //撤回需要发消息 - if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState())){ //先判断第一次发布的时候是否保存过数据 LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); @@ -310,11 +314,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoCJBaseSerialNumberList = infoCJList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); - - List dummyInventoryInfoEOSerialNumberList = dummyInventoryInfoEOList.stream().map(e -> e.getSerialNumber()).collect(Collectors.toList()); - List sameDummyInventoryInfoEOList = new ArrayList<>(); List sameinfoCJList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(dummyInventoryInfoEOSerialNumberList)) { @@ -346,9 +347,15 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl> infoDiffList=new ArrayList<>(); for (int i = 0; i < sameinfoCJList.size(); i++) { - infoDiff = ListDiff.compareObject(sameinfoCJList.get(i), sameDummyInventoryInfoEOList.get(i)); + try {//!!! + infoDiff = ListDiff.compareObject(sameinfoCJList.get(i), sameDummyInventoryInfoEOList.get(i)); + }catch (Exception e){ + e.printStackTrace(); + } if (MapUtils.isNotEmpty(infoDiff)) { - infoDiffList.add(infoDiff); + if(infoDiff.size() > 1) { + infoDiffList.add(infoDiff); + } } } @@ -375,35 +382,50 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl不发送消息,数据不处理 + if(MapUtils.isNotEmpty(baseDiff) || CollectionUtils.isNotEmpty(infoDiffList)) { + //向订阅该领域管理的人发消息和飞书 + sendMsg(baseDiff, dummyContentChangeEOBaseList.get(0).getConnectId(), infoDiffList, addSerialNumber, deleteSerialNumber,dummyInventoryBaseEO.getState()); + Date now=new Date(); + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //5.数据对比完成后.更新之前保存的dummy_inventory_info中的content_json数据,重新保存最新的数据 + if(MapUtils.isNotEmpty(baseDiff)){//列表有不同字段 + String base = JSONArray.toJSONString(dummyInventoryBaseEOList); + UpdateWrapper baseUpdateWrapper=new UpdateWrapper<>(); + baseUpdateWrapper.set("content_json",base) + .set("update_by",sysUser.getUsername()) + .set("update_time",now) + .eq("connect_id",dummyInventoryBaseEOList.get(0).getId()); + dummyContentChangeEOMapper.update(null,baseUpdateWrapper); + } + if(CollectionUtils.isNotEmpty(infoDiffList)){//维护清单有不同字段 + String info = JSONArray.toJSONString(dummyInventoryInfoEOList); + UpdateWrapper infoUpdateWrapper=new UpdateWrapper<>(); + infoUpdateWrapper.set("content_json",info) + .set("update_by",sysUser.getUsername()) + .set("update_time",now) + .eq("parent_id",dummyInventoryBaseEOList.get(0).getId()); + dummyContentChangeEOMapper.update(null,infoUpdateWrapper); + } + } } - - }else{ - //撤回 - + //撤回,需要发消息 + sendMsg(null, dummyInventoryBaseEO.getId(),null, null , null,dummyInventoryBaseEO.getState()); } - - } public void disposeData(List records) { Set technologyTerritorySet = new HashSet<>(); for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { //技术领域 - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); } //树形结构数据字典(技术领域) List categoryList = new ArrayList<>(); - if(technologyTerritorySet.size() != 0){ + if (technologyTerritorySet.size() != 0) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(SysCategory::getId, technologyTerritorySet); categoryList = sysCategoryService.list(wrapper); @@ -414,9 +436,9 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); - if(collect.size() != 0){ + if (collect.size() != 0) { // if (CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())) { - sb.append(collect.get(0).getName()+ ","); + sb.append(collect.get(0).getName() + ","); // } else { // sb.append(collect.get(0).getEnName()+ ","); // } @@ -428,115 +450,169 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DUTY_TERRITORY.getValue()); - List dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getDutyTerritory().split(",")); - StringBuilder dutyTerritoryBuilder =new StringBuilder(); - for(String midDutyTerritory : dutyTerritoryList){ - String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dutyTerritoryBuilder.append(dutyTerritoryName).append(","); + //适用范围 SHI4_YONG4_FAN4_WEI2("","apply_scope"), + // REGION("适用地区","region"), + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())) { + List shi4Yong4Fan4Wei2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.SHI4_YONG4_FAN4_WEI2.getValue()); + List shi4Yong4Fan4Wei2List = Arrays.asList(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2().split(",")); + StringBuilder shi4Yong4Fan4Wei2Builder = new StringBuilder(); + for (String midshi4Yong4Fan4Wei2 : shi4Yong4Fan4Wei2List) { + String shi4Yong4Fan4Wei2Name = shi4Yong4Fan4Wei2.stream().filter(e -> e.getItemValue().equals(midshi4Yong4Fan4Wei2)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + shi4Yong4Fan4Wei2Builder.append(shi4Yong4Fan4Wei2Name).append(","); + } + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(shi4Yong4Fan4Wei2Builder.substring(0, shi4Yong4Fan4Wei2Builder.toString().length() - 1)); + } + //适用地区 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())) { + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.REGION.getValue()); + List regionList = Arrays.asList(dummyInventoryInfoEO.getRegion().split(",")); + StringBuilder regionBuilder = new StringBuilder(); + for (String midRegion : regionList) { + String regionName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + regionBuilder.append(regionName).append(","); + } + dummyInventoryInfoEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + } + //责任领域 + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(dummyInventoryInfoEO.getDutyTerritory().split(",")); + StringBuilder dutyTerritoryBuilder = new StringBuilder(); + for (String midDutyTerritory : dutyTerritoryList) { + String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dutyTerritoryBuilder.append(dutyTerritoryName).append(","); + } + dummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); } - dummyInventoryInfoEO.setDutyTerritory(dutyTerritoryBuilder.substring(0,dutyTerritoryBuilder.toString().length()-1)); - //实施类别 - List implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.IMPLEMENT_TYPE.getValue()); - String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setImplementType(implementTypeName); - + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + List implementType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.IMPLEMENT_TYPE.getValue()); + String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setImplementType(implementTypeName); + } //认证级别 - List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setAttestationType(attestationTypeName); - + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + List attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_TYPE.getValue()); + String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationType(attestationTypeName); + } //认证级别 - List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_RANK.getValue()); - String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setAttestationRank(attestationRankName); - + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + List attestationRank = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ATTESTATION_RANK.getValue()); + String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setAttestationRank(attestationRankName); + } //交付物类型 List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.DELIVERABLE_TEMPLATE.getValue()); //设计符合性确认-交付物类型 // designDeliverableType; - String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { + String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName); + } //prehomo确认-交付物类型 // prehomoDeliverableType; - String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); + } //验证符合性确认-交付物类型 // verifyDeliverableType; - String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName); + } //发起人 List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.FA1_QI3_REN2.getValue()); //设计符合性确认-发起人 // designInitiator; - String designInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignInitiator(designInitiatorName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignInitiator())) { + String designInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignInitiator(designInitiatorName); + } //prehomo确认-发起人 // prehomoInitiator; - String prehomoInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoInitiator(prehomoInitiatorName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoInitiator())) { + String prehomoInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoInitiator(prehomoInitiatorName); + } //验证符合性确认-发起人 // verifyInitiator; - String verifyInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyInitiator(verifyInitiatorName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyInitiator())) { + String verifyInitiatorName = fa1_qi3_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyInitiator())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyInitiator(verifyInitiatorName); + } //责任人 List ze2_ren4_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseDictCodeEnum.ZE2_REN2_REN2.getValue()); //设计符合性确认-责任人 // designDuty; - String designDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDuty(designDutyName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDuty())) { + String designDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setDesignDuty(designDutyName); + } //prehomo确认-责任人 // prehomoDuty; - String prehomoDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDuty(prehomoDutyName); + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDuty())) { + String prehomoDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setPrehomoDuty(prehomoDutyName); + } //验证符合性确认-责任人 // verifyDuty; - String verifyDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDuty(verifyDutyName); - - + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDuty())) { + String verifyDutyName = ze2_ren4_ren2.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDuty())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + dummyInventoryInfoEO.setVerifyDuty(verifyDutyName); + } } } //发送消息 - private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList,String addSerialNumber,String deleteSerialNumber) { + private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, + String addSerialNumber,String deleteSerialNumber,String state) { - String baseName=queryById(idTemp).getName();//基础表id + String baseName = queryById(idTemp).getName();//基础表id + //查询订阅用户 List userNameList = dummyReadEOService.queryReadUserInfo(idTemp); - List userIdList=sysUserService.queryUserIdListByNameList(userNameList).stream().map(e->e.getId()).collect(Collectors.toList()); - //给发送消息的用户 - if(userIdList.size() == 0){ - return; - } - List sysUsers = sysUserService.listByIds(userIdList); - List thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); - if (userIdList.size() != 0) { - String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp; - - //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx - String content = "The " + baseName + " virtual list you subscribed to has been updated."; - String contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; - //拼接维护清单的消息 - contentInfo =setContentInfo(contentInfo,baseDiff,infoDiffList,addSerialNumber,deleteSerialNumber); - System.out.println(contentInfo); - //封装消息的实体类 - SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); - sysAnnouncementService.saveAnnouncement(sysAnnouncement); - bussDocumentLibraryEOService.sendWebsocket(idTemp, idTemp); - //飞书 - try { - iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.PUSH.getName(), href); - } catch (IOException e) { - log.error("飞书消息推送失败"); + if (CollectionUtils.isNotEmpty(userNameList)) { + List userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); + //给发送消息的用户 + if (userIdList.size() == 0) { + return; } + List sysUsers = sysUserService.listByIds(userIdList); + List thirdIdList = sysUsers.stream().map(SysUser::getThirdId).collect(Collectors.toList()); + if (userIdList.size() != 0) { + String href = backUrl + "/dummy/dummyInventoryBaseEO/issue?id=" + idTemp; + String content = null; + String contentInfo = null; + if(InventoryStateEnum.ISSUE.getValue().equals(state)) { + //The xx virtual list you subscribed to has been updated as follows:1 . xxxxx 2.xxxx + content = "The " + baseName + " virtual list you subscribed to has been updated."; + contentInfo = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "\r\n"; + //拼接维护清单的消息 + contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber); + + }else{//撤回的消息 + content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note."; + contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note."; + } + //封装消息的实体类 + SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); + sysAnnouncementService.saveAnnouncement(sysAnnouncement); + bussDocumentLibraryEOService.sendWebsocket(idTemp, idTemp); + //飞书 + try { + iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.PUSH.getName(), href); + } catch (IOException e) { + log.error("飞书消息推送失败"); + } + } + } else { + throw new JeroBootException("该虚拟清单未被订阅,消息发送失败"); } } - ////拼接维护清单的消息 public String setContentInfo(String contentInfo, Map baseDiff, List> infoDiffList , String addSerialNumber, String deleteSerialNumber) { @@ -575,187 +651,189 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff: infoDiffList) { - int infoDiffRow=1; - contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; - //技术领域 - if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) { + for (Map infoDiff : infoDiffList) { + if (infoDiff.size() > 1) { + int infoDiffRow = 1; + contentInfo += row + ". The serial Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; + //技术领域 + if (StringUtils.isNotBlank(infoDiff.get("technologyTerritoryName"))) { - List list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Technology territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; + List list = Arrays.asList(infoDiff.get("technologyTerritoryName").split("\\|")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Technology territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //新车型实施日期 + if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1"))) { + List list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). The implementation date of new model has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //在产车实施日期 + if (StringUtils.isNotBlank(infoDiff.get("implementTime"))) { + List list = Arrays.asList(infoDiff.get("implementTime").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Implement time has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //WVTA ID + if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { + List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). WVTA ID has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //子标题 + if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { + List list = Arrays.asList(infoDiff.get("subtitle").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //实施类别 + if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { + List list = Arrays.asList(infoDiff.get("implementType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Implement type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //认证类型 + if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { + List list = Arrays.asList(infoDiff.get("attestationType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Attestation type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //认证级别 + if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { + List list = Arrays.asList(infoDiff.get("attestationRank").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Attestation rank has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //责任领域 + if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { + List list = Arrays.asList(infoDiff.get("dutyTerritory").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Duty territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //备注 + if (StringUtils.isNotBlank(infoDiff.get("remark"))) { + List list = Arrays.asList(infoDiff.get("remark").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentInfo += "(" + infoDiffRow + "). Remark has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Design deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //设计符合性确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Design deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //设计符合性确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) { + List list = Arrays.asList(infoDiff.get("designInitiator").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Design initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //设计符合性确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) { + List list = Arrays.asList(infoDiff.get("designDuty").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Design duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Prehomo deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //prehomo确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Prehomo deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //prehomo确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) { + List list = Arrays.asList(infoDiff.get("prehomoInitiator").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Prehomo initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //prehomo确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) { + List list = Arrays.asList(infoDiff.get("prehomoDuty").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Prehomo duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Verify deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //验证符合性确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Verify deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //验证符合性确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) { + List list = Arrays.asList(infoDiff.get("verifyInitiator").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Verify initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + //验证符合性确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) { + List list = Arrays.asList(infoDiff.get("verifyDuty").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1);//需要翻译 + contentInfo += "(" + infoDiffRow + "). Verify duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; + infoDiffRow++; + } + row++; } - //新车型实施日期 - if (StringUtils.isNotBlank(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1"))) { - List list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). The implementation date of new model has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //在产车实施日期 - if (StringUtils.isNotBlank(infoDiff.get("implementTime"))) { - List list = Arrays.asList(infoDiff.get("implementTime").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Implement time has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //WVTA ID - if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { - List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). WVTA ID has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //子标题 - if (StringUtils.isNotBlank(infoDiff.get("subtitle"))) { - List list = Arrays.asList(infoDiff.get("subtitle").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Subtitle has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //实施类别 - if (StringUtils.isNotBlank(infoDiff.get("implementType"))) { - List list = Arrays.asList(infoDiff.get("implementType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Implement type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //认证类型 - if (StringUtils.isNotBlank(infoDiff.get("attestationType"))) { - List list = Arrays.asList(infoDiff.get("attestationType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Attestation type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //认证级别 - if (StringUtils.isNotBlank(infoDiff.get("attestationRank"))) { - List list = Arrays.asList(infoDiff.get("attestationRank").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Attestation rank has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //责任领域 - if (StringUtils.isNotBlank(infoDiff.get("dutyTerritory"))) { - List list = Arrays.asList(infoDiff.get("dutyTerritory").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Duty territory has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //备注 - if (StringUtils.isNotBlank(infoDiff.get("remark"))) { - List list = Arrays.asList(infoDiff.get("remark").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentInfo += "(" + infoDiffRow + "). Remark has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //设计符合性确认-交付物类型 - if (StringUtils.isNotBlank(infoDiff.get("designDeliverableType"))) { - List list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Design deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //设计符合性确认-交付物模板 - if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) { - List list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Design deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //设计符合性确认-发起人 - if (StringUtils.isNotBlank(infoDiff.get("designInitiator"))) { - List list = Arrays.asList(infoDiff.get("designInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Design initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //设计符合性确认-责任人 - if (StringUtils.isNotBlank(infoDiff.get("designDuty"))) { - List list = Arrays.asList(infoDiff.get("designDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Design duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { - List list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Prehomo deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //prehomo确认-交付物模板 - if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) { - List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Prehomo deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //prehomo确认-发起人 - if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiator"))) { - List list = Arrays.asList(infoDiff.get("prehomoInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Prehomo initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //prehomo确认-责任人 - if (StringUtils.isNotBlank(infoDiff.get("prehomoDuty"))) { - List list = Arrays.asList(infoDiff.get("prehomoDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Prehomo duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { - List list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Verify deliverable type has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //验证符合性确认-交付物模板 - if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { - List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Verify deliverable template has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //验证符合性确认-发起人 - if (StringUtils.isNotBlank(infoDiff.get("verifyInitiator"))) { - List list = Arrays.asList(infoDiff.get("verifyInitiator").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Verify initiator has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - //验证符合性确认-责任人 - if (StringUtils.isNotBlank(infoDiff.get("verifyDuty"))) { - List list = Arrays.asList(infoDiff.get("verifyDuty").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1);//需要翻译 - contentInfo += "(" + infoDiffRow + "). Verify duty has been changed from " + infoDiffOld + " to " + infoDiffNew + ".\r\n"; - infoDiffRow++; - } - row++; } } return contentInfo; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 526fc70dc..b56253bc5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -290,6 +290,20 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl bussDocumentLibraryEOList = verifySerialNumber(dataList,dummyInventoryInfoEOTemp); + verifySerialNumber(dataList,dummyInventoryInfoEOTemp); for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { i++; String errorMsg = ""; @@ -872,7 +886,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { + private void verifySerialNumber(List dataList,DummyInventoryInfoEO dummyInventoryInfoEOTemp) { //文档库数据 List serialNumberList = dataList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); - List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); - //文档库中可能存在重复的标准号 - List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); - - //虚拟清单数据 - LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); - wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberList).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); - List dummyInventoryInfoEOList = this.list(wrapperTemp); - List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); - if(serialNumberList.size() != serialNumberListTemp.size()){ - //存在文档库没有的数据 - List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); - List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + List serialNumberS = new ArrayList<>(); + if(serialNumberList.size() != 0){ + for (String s : serialNumberList) { + if(StringUtils.isNotBlank(s)){ + serialNumberS.add(s); + } } } - if(dummyInventoryInfoEOList.size() > 0){ - if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); - }else{ - throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + if(serialNumberS.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberS); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + //文档库中可能存在重复的标准号 + List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + + //虚拟清单数据 + LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); + wrapperTemp.in(DummyInventoryInfoEO::getSerialNumber,serialNumberS).in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryInfoEOTemp.getDummyInventoryBaseId()); + List dummyInventoryInfoEOList = this.list(wrapperTemp); + List serialNumberTempList = dummyInventoryInfoEOList.stream().map(DummyInventoryInfoEO::getSerialNumber).collect(Collectors.toList()); + if(serialNumberS.size() != serialNumberListTemp.size()){ + //存在文档库没有的数据 + List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberS.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } + } + if(dummyInventoryInfoEOList.size() > 0){ + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + } + } + //通过编号将导入的数据与文档库进行关联 + for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); + dummyInventoryInfoEO.setTitle(collect.get(0).getTitle()); + dummyInventoryInfoEO.setState(collect.get(0).getState()); + dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard()); + dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory()); + dummyInventoryInfoEO.setRegion(collect.get(0).getRegion()); + dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2()); + dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime()); + dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1()); } } - //通过编号将导入的数据与文档库进行关联 - for (DummyInventoryInfoEO dummyInventoryInfoEO : dataList) { - List collect = bussDocumentLibraryEOList.stream() - .filter(e -> e.getSerialNumber().equals(dummyInventoryInfoEO.getSerialNumber())).collect(Collectors.toList()); - dummyInventoryInfoEO.setTitle(collect.get(0).getTitle()); - dummyInventoryInfoEO.setState(collect.get(0).getState()); - dummyInventoryInfoEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard()); - dummyInventoryInfoEO.setTechnologyTerritory(collect.get(0).getTechnologyTerritory()); - dummyInventoryInfoEO.setRegion(collect.get(0).getRegion()); - dummyInventoryInfoEO.setShi4Yong4Fan4Wei2(collect.get(0).getShi4Yong4Fan4Wei2()); - dummyInventoryInfoEO.setImplementTime(collect.get(0).getImplementTime()); - dummyInventoryInfoEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1()); - } - - return bussDocumentLibraryEOList; } private String template(String zipEntryName, DummyInventoryInfoEO dummyInventoryInfoEO, @@ -1137,7 +1159,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, DummyInventoryInfoEO dummyInventoryInfoEO, String errorMsg, String value,List msgList, - String nameCn,String nameEn) { + String nameCn,String nameEn,String dictCode) { if(StringUtils.isNotBlank(value)){ if(value.contains(",")){ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ @@ -1147,7 +1169,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e -> value.equals(e.getItemText())).collect(Collectors.toList()); + List collect = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); if (collect.size() == 0) { if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ errorMsg += nameCn + "中的" + value + "与数据字典不匹配"; @@ -1164,11 +1186,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dictItemList, DummyInventoryInfoEO dummyInventoryInfoEO, String errorMsg, String value,List msgList, - String nameCn,String nameEn) { + String nameCn,String nameEn,String dictCode) { List valueList = new ArrayList<>(); if (StringUtils.isNotBlank(value)) { List list = Arrays.asList(value.split(",")); - List collect = dictItemList.stream().filter(e -> list.contains(e.getItemText())).collect(Collectors.toList()); + List collect = dictItemList.stream().filter(e -> dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList()); if(list.size() == collect.size()){ valueList = collect.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); }else{ @@ -1192,9 +1214,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl { } if( ! equals(v1, v2) && !f.getName().contains("create") && !f.getName().contains("update") && !f.getName().equals("id")){ - + if (StringUtils.isBlank(v1.toString())){ + v1 = "null"; + } + if (StringUtils.isBlank(v2.toString())){ + v2 = "null"; + } StringBuilder v1String= new StringBuilder(String.valueOf(v1)); StringBuilder v2String= new StringBuilder(String.valueOf(v2)); - if(f.getName().contains("erritory") || f.getName().contains("emplate")){ + if(f.getName().contains("erritory") || f.getName().contains("emplate") + || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region")){ result.put(f.getName(), v1String.append("|").append(v2String).toString()); }else { - result.put(f.getName(), v1String.append(",").append(v2String).toString()); +// +// if (StringUtils.isBlank(v2String)) { +// result.put(f.getName(), v1String.append(",").append("null").toString()); +// }else { + result.put(f.getName(), v1String.append(",").append(v2String).toString()); +// } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java index 7dc8eb7cc..48d0b509a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java @@ -138,8 +138,9 @@ public class ProjectTaskPlanningController extends JeroController queryByProjectId(@RequestParam(name="projectId",required=true) String projectId) { - List projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId); + public Result queryByProjectId(@RequestParam(name="projectId",required=true) String projectId, + @RequestParam(name="cut",required=true) String cut) { + List projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId,cut); if(projectTaskPlanning==null) { return Result.error("未找到对应数据"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java index 6e8e635d9..07e172834 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectTaskPlanningNameEnum.java @@ -1,21 +1,21 @@ package com.jero.modules.project.enums; public enum ProjectTaskPlanningNameEnum { - LIST_CONFIRMATION("法规清单确认"), - LEGAL_TASK_CONFIRMATION("法规任务确认"), - DESIGN_DEADLINE("设计符合性确认截止时间"), - PREHOMO_DEADLINE("PreHomo确认截止时间"), - ATTESTATION_START_TIME("认证开始"), - ATTESTATION_END_TIME("认证结束"), - VERIFY_DEADLINE("验证符合性确认截止时间"), + LIST_CONFIRMATION("法规清单确认","listConfirmation"), + LEGAL_TASK_CONFIRMATION("法规任务确认","legalTaskConfirmation"), + DESIGN_DEADLINE("设计符合性确认截止时间","designDeadline"), + PREHOMO_DEADLINE("PreHomo确认截止时间","prehomoDeadline"), + ATTESTATION_START_TIME("认证开始","attestationStartTime"), + ATTESTATION_END_TIME("认证结束","attestationEndTime"), + VERIFY_DEADLINE("验证符合性确认截止时间","verifyDeadline"), ; String name; + String value; - - ProjectTaskPlanningNameEnum(String name) { + ProjectTaskPlanningNameEnum(String name, String value) { this.name = name; - + this.value = value; } public String getName() { @@ -25,4 +25,12 @@ public enum ProjectTaskPlanningNameEnum { public void setName(String name) { this.name = name; } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java index a084d82f7..8cc1ff17f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java @@ -52,7 +52,7 @@ public interface IProjectTaskPlanningService extends IService queryByProjectId(String projectId); + List queryByProjectId(String projectId,String cut); /** * 列表查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 84caea01b..276559890 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1403,7 +1403,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(titleOne.split(",")); int index = 0; if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -1599,12 +1598,21 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 10){ String flag = ""; if(10 < j && j < 16){ - flag ="设计"; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + flag ="设计"; + }else{ + flag ="design "; + } key = flag + headerCell.getStringCellValue(); } if(15 < j && j < 21){ - flag ="pre"; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + flag ="pre"; + }else{ + flag ="pre "; + } key = flag + headerCell.getStringCellValue(); } if(20 < j && j < 26){ - flag ="验证"; + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + flag ="验证"; + }else{ + flag ="verify "; + } key = flag + headerCell.getStringCellValue(); - } headerSb.append(key + ","); } @@ -1783,6 +1802,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList = new ArrayList<>(); String value = ""; boolean flag = true; - //iProjectRelatedPersonnelService //编号验证 -// List bussDocumentLibraryEOList = verifySerialNumber(dataList,projectLawsInventoryEOTemp); + verifySerialNumber(dataList,projectLawsInventoryEOTemp); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { i++; String errorMsg = ""; @@ -1897,7 +1917,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> mapCertificationList = (List>) objectMap.get("certificationEngineerList"); //工程接口人 List> mapPersonList = (List>) objectMap.get("engineeringInterfacePersonList"); + //所有人 + List> allPersonList = (List>) objectMap.get("allPersonList"); String nameCn = ""; String nameEn = ""; @@ -1953,7 +1975,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList,ProjectLawsInventoryEO projectLawsInventoryEOTemp){ + //1. 验证标准号在文档库中是否存在 + List serialNumberList = dataList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getSerialNumber,serialNumberList); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + //文档库中可能存在重复的标准号 + List serialNumberListTemp = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).distinct().collect(Collectors.toList()); + if(serialNumberList.size() != serialNumberListTemp.size()){ + //存在文档库没有的数据 + List collect = bussDocumentLibraryEOList.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); + List serialNumbers = serialNumberList.stream().filter(e -> !collect.contains(e)).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+"文档库中不存在,不能添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumbers,",")+" does not exist in the document library and cannot be added"); + } + } + + //2. 验证标准号在法规清单中是否添加过 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(ProjectLawsInventoryEO::getSerialNumber,serialNumberList).in(ProjectLawsInventoryEO::getProjectLibraryId,projectLawsInventoryEOTemp.getProjectLibraryId()); + List projectLawsInventoryEOList = this.list(lambdaQueryWrapper); + List serialNumberTempList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); + if(projectLawsInventoryEOList.size() > 0){ + if(CutEnum.CN.getValue().equals(dataList.get(0).getCut())){ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+"已存在,不能重复添加"); + }else{ + throw new JeroBootException(StringUtils.join(serialNumberTempList,",")+" already exists and cannot be added again"); + } + } + //3. 通过编号将导入的数据与文档库进行关联 + for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> e.getSerialNumber().equals(projectLawsInventoryEO.getSerialNumber())).collect(Collectors.toList()); + projectLawsInventoryEO.setTitle(collect.get(0).getTitle());//标题 + projectLawsInventoryEO.setCorrespondingStandard(collect.get(0).getCorrespondingStandard());//对应标准 + projectLawsInventoryEO.setRegion(collect.get(0).getRegion());//适用地区 + projectLawsInventoryEO.setImplementTime(collect.get(0).getImplementTime());//在产车实施日期 + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1(collect.get(0).getXin1Che1Xing2Shi2Shi1Ri4Qi1());//新车实施日期 + } + } + private void personnelVerify(ProjectLawsInventoryEO projectLawsInventoryEO, - String errorMsg, String regulationOwnerId, - List> mapList, - String nameCn,String nameEn) { + String errorMsg, List msgList, + String regulationOwnerId, + List> mapList, + String nameCn,String nameEn) { //单选 if(regulationOwnerId.contains(",")){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -2095,6 +2174,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg, String value,List msgList, - String nameCn,String nameEn) { + String nameCn,String nameEn,String dictCode) { List valueList = new ArrayList<>(); if (StringUtils.isNotBlank(value)) { List list = Arrays.asList(value.split(",")); - List collect = dictItemList.stream().filter(e -> list.contains(e.getItemText())).collect(Collectors.toList()); + List collect = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && list.contains(e.getItemText())).collect(Collectors.toList()); if(list.size() == collect.size()){ valueList = collect.stream().map(SysDictItem::getItemValue).collect(Collectors.toList()); }else{ @@ -2189,7 +2271,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dictItemList, ProjectLawsInventoryEO projectLawsInventoryEO, String errorMsg, String value,List msgList, - String nameCn,String nameEn) { + String nameCn,String nameEn,String dictCode) { if(StringUtils.isNotBlank(value)){ if(value.contains(",")){ if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ @@ -2199,7 +2281,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl collect = dictItemList.stream().filter(e -> value.equals(e.getItemText())).collect(Collectors.toList()); + List collect = dictItemList.stream().filter(e ->dictCode.equals(e.getDictCode()) && value.equals(e.getItemText())).collect(Collectors.toList()); if (collect.size() == 0) { if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ errorMsg += nameCn + "中的" + value + "与数据字典不匹配"; @@ -2256,34 +2338,66 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryByProjectId(String projectId) { + public List queryByProjectId(String projectId,String cut) { ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId); List timeNodeVOS = new ArrayList<>(); TimeNodeVO listConfirmationVO=null; @@ -106,7 +107,13 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl + + + + + + + + + + + {{$t('query')}} + {{$t('reset')}} + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + + + + + + + + + \ No newline at end of file diff --git a/jero-web/src/components/searchalonesplit/index.vue b/jero-web/src/components/searchalonesplit/index.vue new file mode 100644 index 000000000..e19c93f3c --- /dev/null +++ b/jero-web/src/components/searchalonesplit/index.vue @@ -0,0 +1,259 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index d0ac7014b..419112d34 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -49,8 +49,9 @@ router.beforeEach((to, from, next) => { message: '系统提示', description: '请求用户信息失败，请重试！' })*/ + // query: { redirect: to.fullPath } store.dispatch('Logout').then(() => { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + next({ path: '/user/login', }) }) }) } else { @@ -62,7 +63,8 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next({ path: '/user/login', query: { redirect: to.fullPath } }) + //query: { redirect: to.fullPath } + next({ path: '/user/login', }) NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } } diff --git a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue index 473c2b1a4..370ad0ec8 100644 --- a/jero-web/src/views/documentManage/ocr/modules/DocTable.vue +++ b/jero-web/src/views/documentManage/ocr/modules/DocTable.vue @@ -11,7 +11,7 @@ >
- +
@@ -34,13 +34,13 @@