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