From 557fec17fd0008baae1eec50c033c674ce744c5e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 6 Jan 2023 14:55:59 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 16 ++ .../controller/HeadCustomEOController.java | 172 ++++++++++++++++ .../modules/head/entity/HeadCustomEO.java | 106 ++++++++++ .../head/mapper/HeadCustomEOMapper.java | 17 ++ .../head/mapper/xml/HeadCustomEOMapper.xml | 18 ++ .../head/service/IHeadCustomEOService.java | 63 ++++++ .../service/impl/HeadCustomEOServiceImpl.java | 186 ++++++++++++++++++ .../jero/modules/head/vo/HeadCustomVO.java | 20 ++ 8 files changed, 598 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/HeadCustomEOMapper.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/IHeadCustomEOService.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b298be65c..1290b8041 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -159,3 +159,19 @@ ALTER TABLE `laws_weilai`.`params_report_detail` -- 更新拆分详情列 展示顺序不在列表头展示sql 2022-12-30 已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 0 WHERE `id` = '1529373706885799937' + +-- 自定义表头 2023-01-05 未同步生产环境 +CREATE TABLE `laws_weilai`.`head_custom` ( + `id` varchar(36) NOT NULL COMMENT 'id', + `create_by` varchar(255) NULL COMMENT '创建人', + `create_time` datetime(0) NULL COMMENT '创建时间', + `update_by` varchar(255) NULL COMMENT '修改人', + `update_time` datetime(0) NULL COMMENT '修改时间', + `sys_org_code` varchar(255) NULL COMMENT '部门', + `head_field_cn` varchar(255) NULL COMMENT '表头字段中文', + `head_field_en` varchar(255) NULL COMMENT '表头字段英文', + `parent_id` varchar(36) NULL COMMENT '父id', + `module_flag` varchar(255) NULL COMMENT '模块标识', + `sort` varchar(255) NULL COMMENT '排序', + `field` varchar(255) NULL COMMENT '对应列表接口字段名', + PRIMARY KEY (`id`)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java new file mode 100644 index 000000000..c0bd74601 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java @@ -0,0 +1,172 @@ +package com.jero.modules.head.controller; + +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.head.entity.HeadCustomEO; +import com.jero.modules.head.service.IHeadCustomEOService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.modules.head.vo.HeadCustomVO; +import lombok.extern.slf4j.Slf4j; +import com.jero.common.system.base.controller.JeroController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.jero.common.aspect.annotation.AutoLog; + + + /** + * @Description: 自定义表头 + * @Author: jero-boot + * @Date: 2023-01-05 + * @Version: V1.0 + */ +@Api(tags="自定义表头") +@RestController +@RequestMapping("/head/headCustomEO") +@Slf4j +public class HeadCustomEOController extends JeroController { + @Autowired + private IHeadCustomEOService headCustomEOService; + + /** + * 分页列表查询 + * + * @param headCustomEO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "自定义表头-分页列表查询") + @ApiOperation(value="自定义表头-分页列表查询", notes="自定义表头-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(HeadCustomEO headCustomEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(headCustomEO, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = headCustomEOService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + * @param cut + * @param moduleFlag 模块标识 + * @return + */ + @AutoLog(value = "自定义表头-列表查询") + @ApiOperation(value="自定义表头-列表查询", notes="自定义表头-列表查询") + @GetMapping(value = "/list") + public Result> queryList(String cut,String moduleFlag) { + List list = headCustomEOService.queryList(cut,moduleFlag); + return Result.OK(list); + } + + /** + * 添加 + * + * @param headCustomEOList + * @return + */ + @AutoLog(value = "自定义表头-添加") + @ApiOperation(value="自定义表头-添加", notes="自定义表头-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody List headCustomEOList) { + headCustomEOService.add(headCustomEOList); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param headCustomEO + * @return + */ + @AutoLog(value = "自定义表头-编辑") + @ApiOperation(value="自定义表头-编辑", notes="自定义表头-编辑") + @PutMapping(value = "/edit") + public Result edit(@Validated @RequestBody HeadCustomEO headCustomEO) { + headCustomEOService.editById(headCustomEO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "自定义表头-通过id删除") + @ApiOperation(value="自定义表头-通过id删除", notes="自定义表头-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + headCustomEOService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "自定义表头-批量删除") + @ApiOperation(value="自定义表头-批量删除", notes="自定义表头-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.headCustomEOService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "自定义表头-通过id查询") + @ApiOperation(value="自定义表头-通过id查询", notes="自定义表头-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + HeadCustomEO headCustomEO = headCustomEOService.queryById(id); + if(headCustomEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(headCustomEO); + } + + /** + * 导出excel + * + * @param request + * @param headCustomEO + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, HeadCustomEO headCustomEO) { + return super.exportXls(request, headCustomEO, HeadCustomEO.class, "自定义表头"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, HeadCustomEO.class); + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java new file mode 100644 index 000000000..a8fbab6bf --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java @@ -0,0 +1,106 @@ +package com.jero.modules.head.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.util.List; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.project.entity.ProjectLibraryBase; +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.EqualsAndHashCode; +import lombok.experimental.Accessors; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; + + +/** + * @Description: 自定义表头 + * @Author: jero-boot + * @Date: 2023-01-05 + * @Version: V1.0 + */ +@Data +@TableName("head_custom") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="head_custom对象", description="自定义表头") +public class HeadCustomEO implements Comparable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private java.lang.String sysOrgCode; + + /**表头字段中文*/ + @Excel(name = "表头字段中文", width = 15) + @ApiModelProperty(value = "表头字段中文") + private java.lang.String headFieldCn; + + /**表头字段英文*/ + @Excel(name = "表头字段英文", width = 15) + @ApiModelProperty(value = "表头字段英文") + private java.lang.String headFieldEn; + + /**对应列表接口字段名*/ + @Excel(name = "对应列表接口字段名", width = 15) + @ApiModelProperty(value = "对应列表接口字段名") + private java.lang.String field; + + /**父id*/ + @Excel(name = "父id", width = 15) + @ApiModelProperty(value = "父id") + private java.lang.String parentId; + + /**模块标识*/ + @Excel(name = "模块标识", width = 15) + @ApiModelProperty(value = "模块标识") + private java.lang.String moduleFlag; + + @TableField(exist = false) + @ApiModelProperty(value = "二级标题") + private List children; + + @ApiModelProperty(value = "标题顺序") + private String sort; + + @Override + public int compareTo(HeadCustomEO o) { + return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序 +// return o.id-this.id;//降序 + } + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/HeadCustomEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/HeadCustomEOMapper.java new file mode 100644 index 000000000..065700021 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/HeadCustomEOMapper.java @@ -0,0 +1,17 @@ +package com.jero.modules.head.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import com.jero.modules.head.entity.HeadCustomEO; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 自定义表头 + * @Author: jero-boot + * @Date: 2023-01-05 + * @Version: V1.0 + */ +public interface HeadCustomEOMapper extends BaseMapper { + +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml new file mode 100644 index 000000000..79e47d03e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/mapper/xml/HeadCustomEOMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/IHeadCustomEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/IHeadCustomEOService.java new file mode 100644 index 000000000..6c734819b --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/IHeadCustomEOService.java @@ -0,0 +1,63 @@ +package com.jero.modules.head.service; + +import com.jero.modules.head.entity.HeadCustomEO; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.head.vo.HeadCustomVO; + +import java.util.List; + +/** + * @Description: 自定义表头 + * @Author: jero-boot + * @Date: 2023-01-05 + * @Version: V1.0 + */ +public interface IHeadCustomEOService extends IService { + + /** + * 保存 + * + * @param headCustomEOList + * @return + */ + void add(List headCustomEOList); + + /** + * 更新 + * + * @param headCustomEO + * @return + */ + void editById(HeadCustomEO headCustomEO); + + /** + * 通过id删除 + * + * @param id + * @return + */ + void deleteById(String id); + + /** + * 批量删除 + * + * @param ids + * @return + */ + void deleteByIds(List ids); + + /** + * 通过id查询 + * + * @param id + * @return + */ + HeadCustomEO queryById(String id); + + /** + * 列表查询 + * + * @return + */ + List queryList(String cut, String moduleFlag); +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java new file mode 100644 index 000000000..f980982ee --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -0,0 +1,186 @@ +package com.jero.modules.head.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.head.entity.HeadCustomEO; +import com.jero.modules.head.mapper.HeadCustomEOMapper; +import com.jero.modules.head.service.IHeadCustomEOService; +import com.jero.modules.head.vo.HeadCustomVO; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Date; +import java.util.UUID; +import java.util.stream.Collectors; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 自定义表头 + * @Author: jero-boot + * @Date: 2023-01-05 + * @Version: V1.0 + */ +@Service +public class HeadCustomEOServiceImpl extends ServiceImpl implements IHeadCustomEOService { + + /** + * 保存 + * + * @param headCustomEOList + * @return + */ + @Override + public void add(List headCustomEOList) { + if(ObjectUtils.isNotEmpty(headCustomEOList)){ + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + //先删除再新增 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(HeadCustomEO::getCreateBy,loginUser.getUsername()).in(HeadCustomEO::getModuleFlag,headCustomEOList.get(0).getModuleFlag()); + this.remove(wrapper); + + List headCustomEOS = new ArrayList<>(); + for (HeadCustomEO headCustomEO : headCustomEOList) { + //一级标题 + String id = UUID.randomUUID().toString().replace("-", ""); + HeadCustomEO headCustomEOTemp = getHeadCustomEO(loginUser, headCustomEO, id); + headCustomEOS.add(headCustomEOTemp); + //二级标题 + if(ObjectUtils.isNotEmpty(headCustomEO.getChildren())){ + for (HeadCustomEO child : headCustomEO.getChildren()) { + String idTemp = UUID.randomUUID().toString().replace("-", ""); + HeadCustomEO customEO = getHeadCustomEO(loginUser, child, idTemp); + customEO.setParentId(id); + headCustomEOS.add(customEO); + } + } + } + if(ObjectUtils.isNotEmpty(headCustomEOS)){ + this.saveBatch(headCustomEOS); + } + } + } + + @NotNull + private HeadCustomEO getHeadCustomEO(LoginUser loginUser, HeadCustomEO headCustomEO, String id) { + HeadCustomEO headCustomEOTemp = new HeadCustomEO(); + headCustomEOTemp.setId(id); + headCustomEOTemp.setHeadFieldCn(headCustomEO.getHeadFieldCn()); + headCustomEOTemp.setHeadFieldEn(headCustomEO.getHeadFieldEn()); + headCustomEOTemp.setModuleFlag(headCustomEO.getModuleFlag()); + headCustomEOTemp.setField(headCustomEO.getField()); + headCustomEOTemp.setSort(headCustomEO.getSort()); + headCustomEOTemp.setCreateBy(loginUser.getUsername()); + headCustomEOTemp.setCreateTime(new Date()); + headCustomEOTemp.setUpdateTime(new Date()); + return headCustomEOTemp; + } + + /** + * 更新 + * + * @param headCustomEO + * @return + */ + @Override + public void editById(HeadCustomEO headCustomEO) { + Date now = new Date(); + headCustomEO.setUpdateTime(now); + saveOrUpdate(headCustomEO); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Override + public void deleteById(String id) { + removeById(id); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @Override + public void deleteByIds(List ids) { + removeByIds(ids); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @Override + public HeadCustomEO queryById(String id) { + return getById(id); + } + + /** + * 列表查询 + * + * @return + */ + @Override + public List queryList(String cut,String moduleFlag) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(HeadCustomEO::getCreateBy,loginUser.getUsername()).in(HeadCustomEO::getModuleFlag,moduleFlag); + List list = this.list(wrapper); + List headCustomVOOneList = new LinkedList<>(); + if(ObjectUtils.isNotEmpty(list)){ + //列表表头一级 + List oneList = list.stream() + .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + //列表表头二级 + List twoList = list.stream() + .filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); + Collections.sort(oneList); + for (HeadCustomEO headCustomEO : oneList) { + HeadCustomVO headCustomVO = new HeadCustomVO(); + if(ObjectUtils.isNotEmpty(twoList)){ + List two = twoList.stream() + .filter(e -> headCustomEO.getId().equals(e.getParentId())).collect(Collectors.toList()); + Collections.sort(two); + List headCustomVOTwoList = new LinkedList<>(); + for (HeadCustomEO customEO : two) { + HeadCustomVO headCustomVOTemp = new HeadCustomVO(); + getHeadCustomVO(cut, customEO, headCustomVOTemp); + headCustomVOTwoList.add(headCustomVOTemp); + } + if(ObjectUtils.isNotEmpty(headCustomVOTwoList)){ + headCustomVO.setHeadCustomVOList(headCustomVOTwoList); + } + } + getHeadCustomVO(cut, headCustomEO,headCustomVO); + headCustomVOOneList.add(headCustomVO); + } + } + return headCustomVOOneList; + } + + @NotNull + private HeadCustomVO getHeadCustomVO(String cut, HeadCustomEO headCustomEO,HeadCustomVO headCustomVO) { + headCustomVO.setDataIndex(headCustomEO.getField()); + if(CutEnum.CN.getValue().equals(cut)){ + headCustomVO.setTitle(headCustomEO.getHeadFieldCn()); + }else{ + headCustomVO.setTitle(headCustomEO.getHeadFieldEn()); + } + return headCustomVO; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java new file mode 100644 index 000000000..28e134c16 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java @@ -0,0 +1,20 @@ +package com.jero.modules.head.vo; + +import lombok.Data; + +import java.util.List; + +/** + * @description + * @date 2023/1/6 9:48 + * @auth zhn + */ +@Data +public class HeadCustomVO { + private String title;//表头字段 + + private String dataIndex;//对应列表字段 + + private List headCustomVOList;//二级表头 + +} From ba7d0e9a0813528d8c8c721333bf4838d529501d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 6 Jan 2023 16:58:00 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 1 + .../modules/head/entity/HeadCustomEO.java | 5 ++ .../modules/head/enums/AffirmFlagEnum.java | 48 +++++++++++ .../service/impl/HeadCustomEOServiceImpl.java | 83 ++++++++++++++++++- 4 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 1290b8041..561ad9290 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -174,4 +174,5 @@ CREATE TABLE `laws_weilai`.`head_custom` ( `module_flag` varchar(255) NULL COMMENT '模块标识', `sort` varchar(255) NULL COMMENT '排序', `field` varchar(255) NULL COMMENT '对应列表接口字段名', + `affirm_flag` varchar(36) NULL COMMENT '确认标识', PRIMARY KEY (`id`)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java index a8fbab6bf..e0bc49fa3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/entity/HeadCustomEO.java @@ -97,6 +97,11 @@ public class HeadCustomEO implements Comparable { @ApiModelProperty(value = "标题顺序") private String sort; + /**确认标识*/ + @Excel(name = "确认标识", width = 15) + @ApiModelProperty(value = "确认标识") + private java.lang.String affirmFlag; + @Override public int compareTo(HeadCustomEO o) { return Integer.valueOf(this.getSort())-Integer.valueOf(o.getSort());//升序 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java new file mode 100644 index 000000000..c7f391a04 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/enums/AffirmFlagEnum.java @@ -0,0 +1,48 @@ +package com.jero.modules.head.enums; + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum AffirmFlagEnum { + DESIGN_FLAG("设计符合性确认","Design Compliance Check","1"), + AFFIRM_FLAG("Pre-Homo确认","Pre-Homo Confirmation","2"), + VERIFY_FLAG("验证符合性确认","Validation Compliance Check","3"); + + + + String name; + String nameEn; + String value; + + private AffirmFlagEnum(String name,String nameEn, String value) { + this.name = name; + this.nameEn = nameEn; + 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 getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index f980982ee..cfb039ea2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.head.entity.HeadCustomEO; +import com.jero.modules.head.enums.AffirmFlagEnum; import com.jero.modules.head.mapper.HeadCustomEOMapper; import com.jero.modules.head.service.IHeadCustomEOService; import com.jero.modules.head.vo.HeadCustomVO; @@ -38,7 +39,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl headCustomEOList) { if(ObjectUtils.isNotEmpty(headCustomEOList)){ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); @@ -47,8 +48,52 @@ public class HeadCustomEOServiceImpl extends ServiceImpl oneList = headCustomEOList.stream().filter(e -> StringUtils.isBlank(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(oneList); + //二级标题 + List twoList = headCustomEOList.stream().filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); + + //设计 + List design = twoList.stream().filter(e -> AffirmFlagEnum.DESIGN_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(design); + //pre + List affirm = twoList.stream().filter(e -> AffirmFlagEnum.AFFIRM_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(affirm); + //验证 + List verify = twoList.stream().filter(e -> AffirmFlagEnum.VERIFY_FLAG.getValue().equals(e.getAffirmFlag())).collect(Collectors.toList()); + Collections.sort(verify); + + if(ObjectUtils.isNotEmpty(design)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.DESIGN_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.DESIGN_FLAG.getNameEn()); + headCustomEO.setModuleFlag(design.get(0).getModuleFlag()); + headCustomEO.setSort(design.get(0).getSort()); + headCustomEO.setChildren(design); + oneList.add(headCustomEO); + } + if(ObjectUtils.isNotEmpty(affirm)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.AFFIRM_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.AFFIRM_FLAG.getNameEn()); + headCustomEO.setModuleFlag(affirm.get(0).getModuleFlag()); + headCustomEO.setSort(affirm.get(0).getSort()); + headCustomEO.setChildren(affirm); + oneList.add(headCustomEO); + } + if(ObjectUtils.isNotEmpty(verify)){ + HeadCustomEO headCustomEO = new HeadCustomEO(); + headCustomEO.setHeadFieldCn(AffirmFlagEnum.VERIFY_FLAG.getName()); + headCustomEO.setHeadFieldEn(AffirmFlagEnum.VERIFY_FLAG.getNameEn()); + headCustomEO.setModuleFlag(affirm.get(0).getModuleFlag()); + headCustomEO.setSort(affirm.get(0).getSort()); + headCustomEO.setChildren(verify); + oneList.add(headCustomEO); + } + List headCustomEOS = new ArrayList<>(); - for (HeadCustomEO headCustomEO : headCustomEOList) { + for (HeadCustomEO headCustomEO : oneList) { //一级标题 String id = UUID.randomUUID().toString().replace("-", ""); HeadCustomEO headCustomEOTemp = getHeadCustomEO(loginUser, headCustomEO, id); @@ -68,6 +113,36 @@ public class HeadCustomEOServiceImpl extends ServiceImpl headCustomEOList) { +// if(ObjectUtils.isNotEmpty(headCustomEOList)){ +// LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// //先删除再新增 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.in(HeadCustomEO::getCreateBy,loginUser.getUsername()).in(HeadCustomEO::getModuleFlag,headCustomEOList.get(0).getModuleFlag()); +// this.remove(wrapper); +// +// List headCustomEOS = new ArrayList<>(); +// for (HeadCustomEO headCustomEO : headCustomEOList) { +// //一级标题 +// String id = UUID.randomUUID().toString().replace("-", ""); +// HeadCustomEO headCustomEOTemp = getHeadCustomEO(loginUser, headCustomEO, id); +// headCustomEOS.add(headCustomEOTemp); +// //二级标题 +// if(ObjectUtils.isNotEmpty(headCustomEO.getChildren())){ +// for (HeadCustomEO child : headCustomEO.getChildren()) { +// String idTemp = UUID.randomUUID().toString().replace("-", ""); +// HeadCustomEO customEO = getHeadCustomEO(loginUser, child, idTemp); +// customEO.setParentId(id); +// headCustomEOS.add(customEO); +// } +// } +// } +// if(ObjectUtils.isNotEmpty(headCustomEOS)){ +// this.saveBatch(headCustomEOS); +// } +// } +// } @NotNull private HeadCustomEO getHeadCustomEO(LoginUser loginUser, HeadCustomEO headCustomEO, String id) { @@ -145,10 +220,10 @@ public class HeadCustomEOServiceImpl extends ServiceImpl oneList = list.stream() - .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + .filter(e -> StringUtils.isBlank(e.getAffirmFlag())).collect(Collectors.toList()); //列表表头二级 List twoList = list.stream() - .filter(e -> StringUtils.isNotBlank(e.getParentId())).collect(Collectors.toList()); + .filter(e -> StringUtils.isNotBlank(e.getAffirmFlag())).collect(Collectors.toList()); Collections.sort(oneList); for (HeadCustomEO headCustomEO : oneList) { HeadCustomVO headCustomVO = new HeadCustomVO(); From 5d312c2d951a73046a0b1ca52226a8e456b51720 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 6 Jan 2023 17:09:34 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/customizeList.vue | 572 ++++++++++++++++++ .../components/listOfRegulations.vue | 14 +- 4 files changed, 590 insertions(+), 1 deletion(-) create mode 100644 jero-web/src/views/projectManagement/components/customizeList.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b57ccfc50..1397a811f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1376,4 +1376,7 @@ module.exports = { Updateparametercolumn:'Update The Parameter Column', columnfirst:'Reference the parameter column first', columnforced:'Confirm a forced retraction?', + customize:'Customize the header', + customColumn:'Custom column', + } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 3f62cbed7..ecda6ea34 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1477,4 +1477,6 @@ module.exports = { brand:'品牌', allsubitemsitem:'该项目下拥有子项目，是否全部删除', contactTheFounder:'联系创建人', + customize:'自定义表头', + customColumn:'自定义列', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/customizeList.vue b/jero-web/src/views/projectManagement/components/customizeList.vue new file mode 100644 index 000000000..2a34c531a --- /dev/null +++ b/jero-web/src/views/projectManagement/components/customizeList.vue @@ -0,0 +1,572 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 04be80b4c..3907cae38 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -161,6 +161,10 @@ ...{{ $t('more') }} +
+ + {{ $t('customize') }} +
{{ $t('bringInRelevantPersonnel') }} @@ -311,6 +315,7 @@ + 0) { @@ -2261,7 +2271,9 @@ } }) }, - + customizeClick(){ + this.$refs.customizeListRef.transferModel() + }, bringInRelevantPersonnelClick() { let _this = this if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { From 43af0f8c2375826cacc3477deb37c31e64ee28bc Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 6 Jan 2023 17:28:29 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/customizeList.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/customizeList.vue b/jero-web/src/views/projectManagement/components/customizeList.vue index 2a34c531a..10103f9a5 100644 --- a/jero-web/src/views/projectManagement/components/customizeList.vue +++ b/jero-web/src/views/projectManagement/components/customizeList.vue @@ -484,7 +484,11 @@ export default { delete item.name delete item.id }) - postAction('head/headCustomEO/add', this.selectedRows).then((res) => { + let headCustomEOList = JSON.parse(JSON.stringify(this.selectedRows)) + let query ={ + headCustomEOList :headCustomEOList + } + postAction('head/headCustomEO/add', query).then((res) => { if (res.success) { this.confirmLoading = false this.$message.success(this.$t('OperationSuccessful')) From 91a3c16956ae9893e072cf0cc1685211467ef9cc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Jan 2023 09:18:37 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4=E5=8F=82=E6=95=B0=E6=8E=A5=E6=94=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../head/controller/HeadCustomEOController.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java index c0bd74601..6fcd7e3f9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/controller/HeadCustomEOController.java @@ -1,9 +1,13 @@ package com.jero.modules.head.controller; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.head.entity.HeadCustomEO; @@ -76,13 +80,21 @@ public class HeadCustomEOController extends JeroController add(@Validated @RequestBody List headCustomEOList) { + public Result add(@RequestBody JSONObject jsonObject) { + JSONArray headCustomEOArr = jsonObject.getJSONArray("headCustomEOList"); + List headCustomEOList = new ArrayList<>(); + HeadCustomEO headCustomEO = null; + for (Object headCustom : headCustomEOArr) { + headCustomEO = JSONObject.parseObject(JSONObject.toJSONString(headCustom),HeadCustomEO.class); + headCustomEOList.add(headCustomEO); + } + headCustomEOService.add(headCustomEOList); return Result.OK("添加成功！"); } From 14ab5b1877f36fb802dbcadb13c13cbc93d5f735 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Jan 2023 09:38:38 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/head/service/impl/HeadCustomEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index cfb039ea2..0b75e49cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -86,8 +86,8 @@ public class HeadCustomEOServiceImpl extends ServiceImpl Date: Mon, 9 Jan 2023 09:58:16 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/head/service/impl/HeadCustomEOServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 0b75e49cc..78a8bd605 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -151,6 +151,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl Date: Mon, 9 Jan 2023 11:10:05 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../head/service/impl/HeadCustomEOServiceImpl.java | 11 ++++++++++- .../java/com/jero/modules/head/vo/HeadCustomVO.java | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 78a8bd605..b8c2c6bc8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -239,7 +239,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl headCustomVOList;//二级表头 + private String fixed;//字段位置标识 + + private List child;//二级表头 } From 75df08798e7faf65104d1f3c13309771e777afda Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Jan 2023 11:42:51 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/head/vo/HeadCustomVO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java index 3210fa1de..a29392850 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/vo/HeadCustomVO.java @@ -17,6 +17,6 @@ public class HeadCustomVO { private String fixed;//字段位置标识 - private List child;//二级表头 + private List children;//二级表头 } From dba8529941fd877913d99fbf655488d46f2e5ee8 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 9 Jan 2023 11:49:46 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/head/service/impl/HeadCustomEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index b8c2c6bc8..758262cbd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -239,7 +239,7 @@ public class HeadCustomEOServiceImpl extends ServiceImpl Date: Mon, 9 Jan 2023 11:55:09 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HeadCustomEOServiceImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java index 758262cbd..636cbf7fb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/head/service/impl/HeadCustomEOServiceImpl.java @@ -257,14 +257,17 @@ public class HeadCustomEOServiceImpl extends ServiceImpl Date: Mon, 9 Jan 2023 15:57:58 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/less/common.less | 4 + .../components/customizeList.vue | 110 +++++++++--------- .../components/listOfRegulations.vue | 66 ++++++++++- 3 files changed, 120 insertions(+), 60 deletions(-) diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 8683c2b46..deed47827 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -136,4 +136,8 @@ } .ant-tooltip-arrow::before { background-color: #fff; +} +.customizetable .ant-table-thead > tr > th { + //padding: 12px 8px; + min-height: 46px; } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/customizeList.vue b/jero-web/src/views/projectManagement/components/customizeList.vue index 10103f9a5..30b447500 100644 --- a/jero-web/src/views/projectManagement/components/customizeList.vue +++ b/jero-web/src/views/projectManagement/components/customizeList.vue @@ -11,11 +11,11 @@
@@ -69,7 +69,7 @@ export default { headFieldCn:'编号', headFieldEn:'Number', field: 'serialNumber', - id: '1', + key: 1, moduleFlag:'法规清单', status:1, }, @@ -79,7 +79,7 @@ export default { headFieldCn:'标题', headFieldEn:'title', field: 'title', - id: '2', + key: 2, moduleFlag:'法规清单', status:2, }, @@ -89,7 +89,7 @@ export default { headFieldCn:'子标题', headFieldEn:'Sub-title', field: 'subtitle', - id: '3', + key: 3, moduleFlag:'法规清单', }, { @@ -98,7 +98,7 @@ export default { headFieldCn:'清单确认状态', headFieldEn:'List Confirmation Status', field: 'inventoryAffirmStatusName', - id: '4', + key: 4, moduleFlag:'法规清单', }, { @@ -107,7 +107,7 @@ export default { headFieldCn:'任务确认状态', headFieldEn:'Task Confirmation Status', field: 'taskAffirmStatusName', - id: '5', + key: 5, moduleFlag:'法规清单', }, { @@ -116,7 +116,7 @@ export default { headFieldCn:'适用地区', headFieldEn:'Area', field: 'region_dictText', - id: '6', + key: 6, moduleFlag:'法规清单', }, { @@ -125,7 +125,7 @@ export default { headFieldCn:'对应标准', headFieldEn:'Compare EU/CN', field: 'correspondingStandard', - id: '7', + key: 7, moduleFlag:'法规清单', }, { @@ -134,7 +134,7 @@ export default { headFieldCn:'实施类别', headFieldEn:'Usage', field: 'implementType_dictText', - id: '8', + key: 8, moduleFlag:'法规清单', }, { @@ -143,7 +143,7 @@ export default { headFieldCn:'标准实施日期', headFieldEn:'New Type Execution Date', field: 'xin1Che1Xing2Shi2Shi1Ri4Qi1', - id: '9', + key: 9, moduleFlag:'法规清单', }, { @@ -152,7 +152,7 @@ export default { headFieldCn:'在产车实施日期', headFieldEn:'New Vehicle Execution Date', field: 'implementTime', - id: '10', + key: 10, moduleFlag:'法规清单', }, { @@ -161,7 +161,7 @@ export default { headFieldCn:'认证类型', headFieldEn:'Certification Type', field: 'attestationType_dictText', - id: '11', + key: 11, moduleFlag:'法规清单', }, { @@ -170,7 +170,7 @@ export default { headFieldCn:'认证级别', headFieldEn:'Certification Level', field: 'attestationRank_dictText', - id: '12', + key: 12, moduleFlag:'法规清单', }, { @@ -179,7 +179,7 @@ export default { headFieldCn:'适用增补件', headFieldEn:'Applicable Supplement', field: 'applicableSupplement', - id: '13', + key: 13, moduleFlag:'法规清单', }, { @@ -188,7 +188,7 @@ export default { headFieldCn:'WVTA ID', headFieldEn:'WVTA ID', field: 'wvtaId', - id: '14', + key: 14, moduleFlag:'法规清单', }, { @@ -197,7 +197,7 @@ export default { headFieldCn:'责任领域', headFieldEn:'Responsible Field', field: 'dutyTerritory_dictText', - id: '15', + key: 15, moduleFlag:'法规清单', }, { @@ -206,7 +206,7 @@ export default { headFieldCn:'法规工程师', headFieldEn:'Regulation Engineer', field: 'regulationOwnerName', - id: '16', + key: 16, moduleFlag:'法规清单', }, { @@ -215,7 +215,7 @@ export default { headFieldCn:'认证工程师', headFieldEn:'Homo Engineer', field: 'homologationEngineerName', - id: '17', + key: 17, moduleFlag:'法规清单', }, { @@ -224,7 +224,7 @@ export default { headFieldCn:'工程接口人', headFieldEn:'Eng. Interface', field: 'engineeringInterfacePersonName', - id: '18', + key: 18, moduleFlag:'法规清单', }, { @@ -233,7 +233,7 @@ export default { headFieldCn:'备注', headFieldEn:'Comments', field: 'remark', - id: '19', + key: 19, moduleFlag:'法规清单', }, { @@ -243,7 +243,7 @@ export default { headFieldEn:'Deliverables', field: 'designDeliverableTemplateName', affirmFlag:'1', - id: '20', + key: 20, moduleFlag:'法规清单', }, { @@ -253,7 +253,7 @@ export default { headFieldEn:'Creator', field: 'designInitiatorName', affirmFlag:'1', - id: '21', + key: 21, moduleFlag:'法规清单', }, { @@ -263,7 +263,7 @@ export default { headFieldEn:'Assignee', field: 'designDutyName', affirmFlag:'1', - id: '22', + key: 22, moduleFlag:'法规清单', }, { @@ -273,7 +273,7 @@ export default { headFieldEn:'Due Date', field: 'designDueDate', affirmFlag:'1', - id: '23', + key: 23, moduleFlag:'法规清单', }, { @@ -283,7 +283,7 @@ export default { headFieldEn:'Instruction', field: 'designRemark', affirmFlag:'1', - id: '24', + key: 24, moduleFlag:'法规清单', }, { @@ -293,7 +293,7 @@ export default { headFieldEn:'Deliverables', field: 'prehomoDeliverableTemplateName', affirmFlag:'2', - id: '25', + key: 25, moduleFlag:'法规清单', }, { @@ -303,7 +303,7 @@ export default { headFieldEn:'Creator', field: 'prehomoInitiatorName', affirmFlag:'2', - id: '26', + key:26, moduleFlag:'法规清单', }, { @@ -313,7 +313,7 @@ export default { headFieldEn:'Assignee', field: 'prehomoDutyName', affirmFlag:'2', - id: '27', + key: 27, moduleFlag:'法规清单', }, { @@ -323,7 +323,7 @@ export default { headFieldEn:'Due Date', field: 'prehomoDueDate', affirmFlag:'2', - id: '28', + key: 28, moduleFlag:'法规清单', }, { @@ -333,7 +333,7 @@ export default { headFieldEn:'Instruction', field: 'prehomoRemark', affirmFlag:'2', - id: '29', + key: 29, moduleFlag:'法规清单', }, { @@ -343,7 +343,7 @@ export default { headFieldEn:'Deliverables', field: 'verifyDeliverableTemplateName', affirmFlag:'3', - id: '30', + key: 30, moduleFlag:'法规清单', }, { @@ -353,7 +353,7 @@ export default { headFieldEn:'Creator', field: 'verifyInitiatorName', affirmFlag:'3', - id: '31', + key: 31, moduleFlag:'法规清单', }, { @@ -363,7 +363,7 @@ export default { headFieldEn:'Assignee', field: 'verifyDutyName', affirmFlag:'3', - id: '32', + key: 32, moduleFlag:'法规清单', }, { @@ -373,7 +373,7 @@ export default { headFieldEn:'Due Date', field: 'verifyDueDate', affirmFlag:'3', - id: '33', + key: 33, moduleFlag:'法规清单', }, { @@ -383,7 +383,7 @@ export default { headFieldEn:'Instruction', field: 'verifyRemark', affirmFlag:'3', - id: '34', + key: 34, moduleFlag:'法规清单', }, { @@ -391,12 +391,13 @@ export default { name: this.$t('operation'), headFieldCn:'操作', headFieldEn:'Operation', - id: '35', + key: 35, moduleFlag:'法规清单', status:2, }, ], content: [], + columnsAll:[], loading: false, pageNo: 1, pageSize: 10, @@ -406,9 +407,10 @@ export default { mounted() { }, methods: { - transferModel() { + transferModel(val) { this.visible = true this.queryParam = {} + this.columnsAll = val // this.$nextTick(() => { // this.selectedRowKeys = [] // this.selectedRows = [] @@ -459,12 +461,22 @@ export default { // } }, getCheckboxProps(record) { - console.log(record.id, 'status'); + let titleList = [] + this.columnsAll.forEach((item) => { + if(item.children){ + item.children.forEach((val) => { + titleList.push(item.dataIndex,val.dataIndex) + }) + }else { + titleList.push(item.dataIndex) + } + }) + console.log(titleList) return ({ props: { //当状态是1或者2的时候执行disable disabled: record.status === 1 || record.status === 2, - defaultChecked: ['1','2','35'].includes(record.id) + defaultChecked: titleList.includes(record.field) } }) }, @@ -480,9 +492,6 @@ export default { // this.selectedRowKeys = [] this.selectedRows.forEach((item,index) => { item.sort = index + 1 - delete item.status - delete item.name - delete item.id }) let headCustomEOList = JSON.parse(JSON.stringify(this.selectedRows)) let query ={ @@ -491,23 +500,15 @@ export default { postAction('head/headCustomEO/add', query).then((res) => { if (res.success) { this.confirmLoading = false - this.$message.success(this.$t('OperationSuccessful')) this.visible = false - this.selectedRowKeys = [] - // this.$emit('transferListForm') + this.$message.success(this.$t('OperationSuccessful')) + this.$emit('customizeListForm') } else { - // if (res.message == '该虚拟清单的维护清单中没有数据,是否需要添加') { - // this.confirmLoading = false - // this.getAdd() - // return - // } this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false + this.visible = false } }) - // } else { - // this.$message.warning(this.$t('selectLeastOne')) - // } }, getAdd() { let _this = this @@ -573,4 +574,5 @@ export default { .box-button { height: 38px; } + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 3907cae38..cc31da797 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -215,7 +215,7 @@ { this.getAndUserId() @@ -1223,9 +1225,6 @@ } else { this.$message.warning(this.$t('selectLeastOne')) } - }, - customizeListForm(){ - }, batchSettingPersonnelClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { @@ -1526,6 +1525,9 @@ this.selectedRowKeys = [] this.getList() }, + customizeListForm(val){ + this.getHeader() + }, transferListForm(id){ this.$refs.transferListvirtalRef.transferModel(id) }, @@ -1557,6 +1559,58 @@ } this.getList() }, + getHeader(){ + getAction('head/headCustomEO/list', { + moduleFlag:'法规清单' + }).then((res) => { + if (res.success) { + console.log(res.result) + if(res.result.length != 0){ + this.columnsAll = res.result + }else{ + this.columnsAll = this.column + } + this.columnsAll.forEach((item,index) => { + if(item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认'){ + item.width = 180 + item.align = 'left' + if(item.title == '操作'){ + item.scopedSlots = { + customRender: 'operationOne' + } + }else if(item.title == '编号'){ + item.sorter = true + item.scopedSlots = { + customRender: 'standard' + } + }else if(item.title == '标题'){ + item.scopedSlots = { + customRender: 'titleName' + } + } + else if(item.title == '清单确认状态' || item.title == '任务确认状态' || item.title == '认证级别' || item.title == 'WVTA ID' || + item.title == '责任领域' || item.title == '法规工程师' || item.title == '认证工程师' || item.title == '工程接口人'){ + item.sorter = true + } + }else { + delete item.dataIndex + delete item.fixed + item.children.forEach((val,index) => { + val.width = 180 + val.align = 'left' + val.ellipsis = true + }) + } + }) + console.log(this.columnsAll) + this.loading = false + this.JLoading = false + } else { + this.JLoading = false + this.loading = false + } + }) + }, getList() { let roleCode if (this.isDisplay) { @@ -2272,7 +2326,7 @@ }) }, customizeClick(){ - this.$refs.customizeListRef.transferModel() + this.$refs.customizeListRef.transferModel(this.columnsAll) }, bringInRelevantPersonnelClick() { let _this = this From e70c438e6fc37e8e2682236256305a3c0b08a485 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 9 Jan 2023 16:15:19 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/less/common.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index deed47827..b8e04592a 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -138,6 +138,5 @@ background-color: #fff; } .customizetable .ant-table-thead > tr > th { - //padding: 12px 8px; - min-height: 46px; + padding: 12px 8px; } \ No newline at end of file From 1ed4250bc0f62becc1fe88b172944e8783021e50 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 9 Jan 2023 17:55:44 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/assets/less/common.less | 3 --- jero-web/src/mixins/header.js | 9 +++++++-- .../components/listOfRegulations.vue | 12 +++++++++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index b8e04592a..8683c2b46 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -136,7 +136,4 @@ } .ant-tooltip-arrow::before { background-color: #fff; -} -.customizetable .ant-table-thead > tr > th { - padding: 12px 8px; } \ No newline at end of file diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js index 75982d9b0..701975eba 100644 --- a/jero-web/src/mixins/header.js +++ b/jero-web/src/mixins/header.js @@ -94,7 +94,7 @@ const ResizeHeaderOne = function(val, name) { // 处理多级表头 col = getRenderCoL(key, val) let content = [].concat(children) - if (col) { + if (col ) { const handlerVNode = h(DragHandler, { props: { width: col.width, @@ -106,10 +106,15 @@ const ResizeHeaderOne = function(val, name) { handlerVNode ) } + console.log(restProps) + let className = '' + if ((restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan == 1) || (restProps.attrs && restProps.attrs.colSpan && restProps.attrs.colSpan > 0)){ + className = ' second' + } return h('th', { key, props: { col }, - ...Object.assign({}, restProps, { class: (restProps.class || '') + ' nio-header-th' }) + ...Object.assign({}, restProps, { class: (restProps.class || '') + ' nio-header-th' + className}) }, content) } } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index cc31da797..fe26a1264 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -2672,12 +2672,18 @@ width: 100% !important; } - .tableList .ant-table-thead > tr > th { - padding: 0px 16px !important; + //.customizetable .ant-table-thead > tr > th { + // height: 46px !important; + //padding: 8px 8px !important; //font-weight: bold; //background: #f3f6f6; + //} + .ant-table-row-cell-ellipsis{ + padding: 0!important; + } + .second{ + padding: 0!important; } - //.tableList .ant-table-tbody > tr > td{ // color: #040B29 ; //}