From 7ca3f462a4ea889b16dcf6b6ef19ed85450606e2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 13 Jun 2024 09:08:35 +0800 Subject: [PATCH 01/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 61 +++++++ .../com/jero/common/api/vo/IdsMapBody.java | 18 ++ .../FunctionalSafetyCenterController.java | 150 +++++++++++++++++ ...nctionalSafetyCenterSubitemController.java | 158 ++++++++++++++++++ .../entity/FunctionalSafetyCenter.java | 100 +++++++++++ .../entity/FunctionalSafetyCenterSubitem.java | 80 +++++++++ ...FunctionalSafetyCenterSubitemContacts.java | 100 +++++++++++ .../mapper/FunctionalSafetyCenterMapper.java | 12 ++ ...onalSafetyCenterSubitemContactsMapper.java | 12 ++ .../FunctionalSafetyCenterSubitemMapper.java | 11 ++ .../xml/FunctionalSafetyCenterMapper.xml | 24 +++ ...ionalSafetyCenterSubitemContactsMapper.xml | 24 +++ .../FunctionalSafetyCenterSubitemMapper.xml | 20 +++ .../FunctionalSafetyCenterService.java | 38 +++++ ...nalSafetyCenterSubitemContactsService.java | 17 ++ .../FunctionalSafetyCenterSubitemService.java | 38 +++++ 16 files changed, 863 insertions(+) create mode 100644 db/24年6月功能安全中心变更.sql create mode 100644 jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/IdsMapBody.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterSubitemController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql new file mode 100644 index 00000000..db9c4eb8 --- /dev/null +++ b/db/24年6月功能安全中心变更.sql @@ -0,0 +1,61 @@ +drop table if exists pay_functional_safety_center; +create table pay_functional_safety_center +( + id varchar(36) not null comment 'id', + parent_id varchar(36) not null comment '父级id', + project_type int null comment '项目类型（1功能安全中心，2研究组，3项目组）', + project_name varchar(50) null comment '项目名称', + principal_id varchar(32) null comment '负责人id', + mission_and_objectives varchar(200) null comment '任务及目标', + remarks varchar(200) null comment '备注', + create_by varchar(32) null comment '创建人', + create_time datetime null comment '创建时间', + update_by varchar(32) null comment '更新人', + update_time datetime null comment '更新时间', + constraint Index_1 + unique (id) +) + comment '功能安全中心'; + +alter table pay_functional_safety_center + add primary key (id); +drop table if exists pay_functional_safety_center_subitem; +create table pay_functional_safety_center_subitem +( + id varchar(36) not null comment 'id', + project_id varchar(36) not null comment '项目id', + company_id varchar(32) null comment '成员单位id', + remarks varchar(50) null comment '备注', + create_by varchar(32) null comment '创建人', + create_time datetime null comment '创建时间', + update_by varchar(32) null comment '更新人', + update_time datetime null comment '更新时间', + constraint Index_1 + unique (id) +) + comment '功能安全中心成员'; + +alter table pay_functional_safety_center_subitem + add primary key (id); +drop table if exists pay_functional_safety_center_subitem_contacts; +create table pay_functional_safety_center_subitem_contacts +( + id varchar(36) not null comment 'id', + project_id varchar(36) not null comment '项目id', + subitem_id varchar(36) not null comment '项目成员id', + company_id varchar(32) null comment '成员单位id', + contacts_id varchar(32) null comment '企业联系人id', + remarks varchar(50) null comment '备注', + order_num int null comment '序号', + create_by varchar(32) null comment '创建人', + create_time datetime null comment '创建时间', + update_by varchar(32) null comment '更新人', + update_time datetime null comment '更新时间', + constraint Index_1 + unique (id) +) + comment '功能安全中心成员-联系人'; + +alter table pay_functional_safety_center_subitem_contacts + add primary key (id); + diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/IdsMapBody.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/IdsMapBody.java new file mode 100644 index 00000000..895fe86e --- /dev/null +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/api/vo/IdsMapBody.java @@ -0,0 +1,18 @@ +package com.jero.common.api.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liJiaRao + * @date 2023-11-17 15:27 + */ +@Data +public class IdsMapBody { + /**id*/ + @ApiModelProperty(value = "id") + private String id; + /**ids*/ + @ApiModelProperty(value = "ids") + private String ids; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java new file mode 100644 index 00000000..b91210aa --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java @@ -0,0 +1,150 @@ +package com.jero.functionalsafetycenter.controller; + +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.common.api.vo.IdsMapBody; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; +import com.jero.functionalsafetycenter.service.FunctionalSafetyCenterService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 功能安全中心(pay_functional_safety_center)表控制层 + * + * @author xxxxx + */ +@Slf4j +@Api(tags = "功能安全中心") +@RestController +@RequestMapping("FunctionalSafetyCenter") +public class FunctionalSafetyCenterController extends JeroController { + /** + * 服务对象 + */ + @Resource + private FunctionalSafetyCenterService functionalSafetyCenterService; + + /** + * 分页列表查询 + */ + @ApiOperation(value = "功能安全中心-分页列表查询", notes = "功能安全中心-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(FunctionalSafetyCenter functionalSafetyCenter, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenter, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = functionalSafetyCenterService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + */ + @ApiOperation(value = "功能安全中心-列表查询", notes = "功能安全中心-列表查询") + @GetMapping(value = "/list") + public Result> queryList(FunctionalSafetyCenter functionalSafetyCenter, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenter, req.getParameterMap()); + List list = functionalSafetyCenterService.list(queryWrapper); + return Result.OK(list); + } + + /** + * 添加 + */ + @AutoLog(value = "功能安全中心-添加") + @ApiOperation(value = "功能安全中心-添加", notes = "功能安全中心-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody FunctionalSafetyCenter functionalSafetyCenter) { + functionalSafetyCenterService.add(functionalSafetyCenter); + return Result.OK(Result.ADD_SUCCESS); + } + + /** + * 编辑 + */ + @AutoLog(value = "功能安全中心-编辑") + @ApiOperation(value = "功能安全中心-编辑", notes = "功能安全中心-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody FunctionalSafetyCenter functionalSafetyCenter) { + functionalSafetyCenterService.editById(functionalSafetyCenter); + return Result.OK(Result.EDIT_SUCCESS); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "功能安全中心-通过id删除") + @ApiOperation(value = "功能安全中心-通过id删除", notes = "功能安全中心-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody IdsMapBody map) { + String id = map.getId(); + if (StringUtils.isBlank(id)) { + return Result.error(Result.NULL_ID); + } + functionalSafetyCenterService.deleteById(id); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 批量删除 + */ + @AutoLog(value = "功能安全中心-批量删除") + @ApiOperation(value = "功能安全中心-批量删除", notes = "功能安全中心-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody IdsMapBody map) { + String ids = map.getIds(); + if (StringUtils.isBlank(ids)) { + return Result.error(Result.NULL_ID); + } + List idList = Arrays.asList(map.getIds().split(",")); + this.functionalSafetyCenterService.deleteByIds(idList); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 通过id查询 + */ + @AutoLog(value = "功能安全中心-通过id查询") + @ApiOperation(value = "功能安全中心-通过id查询", notes = "功能安全中心-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + FunctionalSafetyCenter functionalSafetyCenter = functionalSafetyCenterService.queryById(id); + if (functionalSafetyCenter == null) { + throw new JeroBootException(Result.NULL_DATA); + } + return Result.OK(functionalSafetyCenter); + } + + /** + * 导出excel + */ + @ApiOperation(value = "功能安全中心-导出excel") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, FunctionalSafetyCenter functionalSafetyCenter) { + return super.exportXls(request, functionalSafetyCenter, FunctionalSafetyCenter.class, "功能安全中心"); + } + + + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterSubitemController.java new file mode 100644 index 00000000..6ad4c6ca --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterSubitemController.java @@ -0,0 +1,158 @@ +package com.jero.functionalsafetycenter.controller; + +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.common.api.vo.IdsMapBody; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitem; +import com.jero.functionalsafetycenter.service.FunctionalSafetyCenterSubitemService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; + +/** + * 功能安全中心成员(pay_functional_safety_center_subitem)表控制层 + * + * @author xxxxx + */ +@Slf4j +@Api(tags = "功能安全中心成员") +@RestController +@RequestMapping("FunctionalSafetyCenterSubitem") +public class FunctionalSafetyCenterSubitemController extends JeroController { + /** + * 服务对象 + */ + @Resource + private FunctionalSafetyCenterSubitemService functionalSafetyCenterSubitemService; + + /** + * 分页列表查询 + */ + @ApiOperation(value = "功能安全中心成员-分页列表查询", notes = "功能安全中心成员-分页列表查询") + @GetMapping(value = "/page") + public Result> queryPageList(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenterSubitem, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = functionalSafetyCenterSubitemService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 列表查询 + */ + @ApiOperation(value = "功能安全中心成员-列表查询", notes = "功能安全中心成员-列表查询") + @GetMapping(value = "/list") + public Result> queryList(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenterSubitem, req.getParameterMap()); + List list = functionalSafetyCenterSubitemService.list(queryWrapper); + return Result.OK(list); + } + + /** + * 添加 + */ + @AutoLog(value = "功能安全中心成员-添加") + @ApiOperation(value = "功能安全中心成员-添加", notes = "功能安全中心成员-添加") + @PostMapping(value = "/add") + public Result add(@Validated @RequestBody FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { + functionalSafetyCenterSubitemService.add(functionalSafetyCenterSubitem); + return Result.OK(Result.ADD_SUCCESS); + } + + /** + * 编辑 + */ + @AutoLog(value = "功能安全中心成员-编辑") + @ApiOperation(value = "功能安全中心成员-编辑", notes = "功能安全中心成员-编辑") + @PostMapping(value = "/edit") + public Result edit(@Validated @RequestBody FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { + functionalSafetyCenterSubitemService.editById(functionalSafetyCenterSubitem); + return Result.OK(Result.EDIT_SUCCESS); + } + + /** + * 通过id删除 + */ + @AutoLog(value = "功能安全中心成员-通过id删除") + @ApiOperation(value = "功能安全中心成员-通过id删除", notes = "功能安全中心成员-通过id删除") + @PostMapping(value = "/delete") + public Result delete(@RequestBody IdsMapBody map) { + String id = map.getId(); + if (StringUtils.isBlank(id)) { + return Result.error(Result.NULL_ID); + } + functionalSafetyCenterSubitemService.deleteById(id); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 批量删除 + */ + @AutoLog(value = "功能安全中心成员-批量删除") + @ApiOperation(value = "功能安全中心成员-批量删除", notes = "功能安全中心成员-批量删除") + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody IdsMapBody map) { + String ids = map.getIds(); + if (StringUtils.isBlank(ids)) { + return Result.error(Result.NULL_ID); + } + List idList = Arrays.asList(map.getIds().split(",")); + this.functionalSafetyCenterSubitemService.deleteByIds(idList); + return Result.OK(Result.DELETE_SUCCESS); + } + + /** + * 通过id查询 + */ + @AutoLog(value = "功能安全中心成员-通过id查询") + @ApiOperation(value = "功能安全中心成员-通过id查询", notes = "功能安全中心成员-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem = functionalSafetyCenterSubitemService.queryById(id); + if (functionalSafetyCenterSubitem == null) { + throw new JeroBootException(Result.NULL_DATA); + } + return Result.OK(functionalSafetyCenterSubitem); + } + + /** + * 导出excel + */ + @ApiOperation(value = "功能安全中心成员-导出excel") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { + return super.exportXls(request, functionalSafetyCenterSubitem, FunctionalSafetyCenterSubitem.class, "功能安全中心成员"); + } + + /** + * 通过excel导入数据 + */ + @ApiOperation(value = "功能安全中心成员-通过excel导入数据") + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, FunctionalSafetyCenterSubitem.class); + } + + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java new file mode 100644 index 00000000..ac487df6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java @@ -0,0 +1,100 @@ +package com.jero.functionalsafetycenter.entity; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +/** + * 功能安全中心 + */ +@ApiModel(description="功能安全中心") +@Data +@TableName(value = "pay_functional_safety_center") +public class FunctionalSafetyCenter { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private String id; + + /** + * 父级id + */ + @TableField(value = "parent_id") + @ApiModelProperty(value="父级id") + private String parentId; + + /** + * 项目类型（1功能安全中心，2研究组，3项目组） + */ + @TableField(value = "project_type") + @ApiModelProperty(value="项目类型（1功能安全中心，2研究组，3项目组）") + private Integer projectType; + + /** + * 项目名称 + */ + @TableField(value = "project_name") + @ApiModelProperty(value="项目名称") + private String projectName; + + /** + * 负责人id + */ + @TableField(value = "principal_id") + @ApiModelProperty(value="负责人id") + private String principalId; + + /** + * 任务及目标 + */ + @TableField(value = "mission_and_objectives") + @ApiModelProperty(value="任务及目标") + private String missionAndObjectives; + + /** + * 备注 + */ + @TableField(value = "remarks") + @ApiModelProperty(value="备注") + private String remarks; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java new file mode 100644 index 00000000..5029fcc1 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java @@ -0,0 +1,80 @@ +package com.jero.functionalsafetycenter.entity; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-06-12 16:40 + */ + +/** + * 功能安全中心成员 + */ +@ApiModel(description = "功能安全中心成员") +@Data +@TableName(value = "pay_functional_safety_center_subitem") +public class FunctionalSafetyCenterSubitem { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + + /** + * 项目id + */ + @TableField(value = "project_id") + @ApiModelProperty(value = "项目id") + private String projectId; + + /** + * 成员单位id + */ + @TableField(value = "company_id") + @ApiModelProperty(value = "成员单位id") + private String companyId; + + /** + * 备注 + */ + @TableField(value = "remarks") + @ApiModelProperty(value = "备注") + private String remarks; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value = "创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value = "更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value = "更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java new file mode 100644 index 00000000..1469fde4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java @@ -0,0 +1,100 @@ +package com.jero.functionalsafetycenter.entity; + +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 io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.Date; +import lombok.Data; + +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +/** + * 功能安全中心成员-联系人 + */ +@ApiModel(description="功能安全中心成员-联系人") +@Data +@TableName(value = "pay_functional_safety_center_subitem_contacts") +public class FunctionalSafetyCenterSubitemContacts { + /** + * id + */ + @TableId(value = "id", type = IdType.ASSIGN_ID) + @ApiModelProperty(value="id") + private String id; + + /** + * 项目id + */ + @TableField(value = "project_id") + @ApiModelProperty(value="项目id") + private String projectId; + + /** + * 项目成员id + */ + @TableField(value = "subitem_id") + @ApiModelProperty(value="项目成员id") + private String subitemId; + + /** + * 成员单位id + */ + @TableField(value = "company_id") + @ApiModelProperty(value="成员单位id") + private String companyId; + + /** + * 企业联系人id + */ + @TableField(value = "contacts_id") + @ApiModelProperty(value="企业联系人id") + private String contactsId; + + /** + * 备注 + */ + @TableField(value = "remarks") + @ApiModelProperty(value="备注") + private String remarks; + + /** + * 序号 + */ + @TableField(value = "order_num") + @ApiModelProperty(value="序号") + private Integer orderNum; + + /** + * 创建人 + */ + @TableField(value = "create_by") + @ApiModelProperty(value="创建人") + private String createBy; + + /** + * 创建时间 + */ + @TableField(value = "create_time") + @ApiModelProperty(value="创建时间") + private Date createTime; + + /** + * 更新人 + */ + @TableField(value = "update_by") + @ApiModelProperty(value="更新人") + private String updateBy; + + /** + * 更新时间 + */ + @TableField(value = "update_time") + @ApiModelProperty(value="更新时间") + private Date updateTime; +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java new file mode 100644 index 00000000..312b9db5 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java @@ -0,0 +1,12 @@ +package com.jero.functionalsafetycenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; + +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +public interface FunctionalSafetyCenterMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java new file mode 100644 index 00000000..8068ff8d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java @@ -0,0 +1,12 @@ +package com.jero.functionalsafetycenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitemContacts; + +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +public interface FunctionalSafetyCenterSubitemContactsMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java new file mode 100644 index 00000000..9ec87a46 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java @@ -0,0 +1,11 @@ +package com.jero.functionalsafetycenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitem; + +/** + * @author liJiaRao + * @date 2024-06-12 16:40 + */ +public interface FunctionalSafetyCenterSubitemMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml new file mode 100644 index 00000000..5dd83920 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, parent_id, project_type, project_name, principal_id, mission_and_objectives, + remarks, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml new file mode 100644 index 00000000..d983cad6 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + id, project_id, subitem_id, company_id, contacts_id, remarks, order_num, create_by, + create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml new file mode 100644 index 00000000..6afb9562 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + id, project_id, company_id, remarks, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java new file mode 100644 index 00000000..cedd6b2f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java @@ -0,0 +1,38 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; +import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterMapper; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class FunctionalSafetyCenterService extends ServiceImpl { + public void add(FunctionalSafetyCenter functionalSafetyCenter) { + this.save(functionalSafetyCenter); + } + + public void editById(FunctionalSafetyCenter functionalSafetyCenter) { + this.updateById(functionalSafetyCenter); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public FunctionalSafetyCenter queryById(String id) { + FunctionalSafetyCenter functionalSafetyCenter = this.getById(id); + return functionalSafetyCenter; + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java new file mode 100644 index 00000000..09e9b985 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java @@ -0,0 +1,17 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterSubitemContactsMapper; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class FunctionalSafetyCenterSubitemContactsService extends ServiceImpl { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java new file mode 100644 index 00000000..931583ec --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java @@ -0,0 +1,38 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterSubitemMapper; +import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitem; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class FunctionalSafetyCenterSubitemService extends ServiceImpl { + public void add(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { + this.save(functionalSafetyCenterSubitem); + } + + public void editById(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { + this.updateById(functionalSafetyCenterSubitem); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public FunctionalSafetyCenterSubitem queryById(String id) { + FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem = this.getById(id); + return functionalSafetyCenterSubitem; + } +} From 97c1f1706315c22fcf6607b18d0752d51d875818 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jun 2024 10:25:42 +0800 Subject: [PATCH 02/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SafetyCenterCommon.java | 8 +++ ...oller.java => SafetyCenterController.java} | 57 +++++++++--------- ...ava => SafetyCenterSubitemController.java} | 58 +++++++++---------- ...nalSafetyCenter.java => SafetyCenter.java} | 2 +- ...rSubitem.java => SafetyCenterSubitem.java} | 2 +- ....java => SafetyCenterSubitemContacts.java} | 2 +- ...onalSafetyCenterSubitemContactsMapper.java | 12 ---- .../FunctionalSafetyCenterSubitemMapper.java | 11 ---- ...terMapper.java => SafetyCenterMapper.java} | 4 +- .../SafetyCenterSubitemContactsMapper.java | 12 ++++ .../mapper/SafetyCenterSubitemMapper.java | 11 ++++ ...enterMapper.xml => SafetyCenterMapper.xml} | 4 +- ... => SafetyCenterSubitemContactsMapper.xml} | 4 +- ...pper.xml => SafetyCenterSubitemMapper.xml} | 4 +- .../FunctionalSafetyCenterService.java | 38 ------------ ...nalSafetyCenterSubitemContactsService.java | 17 ------ .../FunctionalSafetyCenterSubitemService.java | 38 ------------ .../service/SafetyCenterService.java | 38 ++++++++++++ .../SafetyCenterSubitemContactsService.java | 15 +++++ .../service/SafetyCenterSubitemService.java | 38 ++++++++++++ 20 files changed, 190 insertions(+), 185 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/{FunctionalSafetyCenterController.java => SafetyCenterController.java} (58%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/{FunctionalSafetyCenterSubitemController.java => SafetyCenterSubitemController.java} (57%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/{FunctionalSafetyCenter.java => SafetyCenter.java} (98%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/{FunctionalSafetyCenterSubitem.java => SafetyCenterSubitem.java} (97%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/{FunctionalSafetyCenterSubitemContacts.java => SafetyCenterSubitemContacts.java} (97%) delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/{FunctionalSafetyCenterMapper.java => SafetyCenterMapper.java} (50%) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/{FunctionalSafetyCenterMapper.xml => SafetyCenterMapper.xml} (91%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/{FunctionalSafetyCenterSubitemContactsMapper.xml => SafetyCenterSubitemContactsMapper.xml} (89%) rename jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/{FunctionalSafetyCenterSubitemMapper.xml => SafetyCenterSubitemMapper.xml} (88%) delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java new file mode 100644 index 00000000..062ff336 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java @@ -0,0 +1,8 @@ +package com.jero.functionalsafetycenter.common; + +/** + * @author liJiaRao + * @date 2024-06-25 10:10 + */ +public class SafetyCenterCommon { +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java similarity index 58% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java index b91210aa..4eddfc36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/FunctionalSafetyCenterController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java @@ -9,8 +9,8 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; -import com.jero.functionalsafetycenter.service.FunctionalSafetyCenterService; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.service.SafetyCenterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,7 +21,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; @@ -33,26 +32,26 @@ import java.util.List; @Slf4j @Api(tags = "功能安全中心") @RestController -@RequestMapping("FunctionalSafetyCenter") -public class FunctionalSafetyCenterController extends JeroController { +@RequestMapping("SafetyCenter") +public class SafetyCenterController extends JeroController { /** * 服务对象 */ @Resource - private FunctionalSafetyCenterService functionalSafetyCenterService; + private SafetyCenterService safetyCenterService; /** * 分页列表查询 */ @ApiOperation(value = "功能安全中心-分页列表查询", notes = "功能安全中心-分页列表查询") @GetMapping(value = "/page") - public Result> queryPageList(FunctionalSafetyCenter functionalSafetyCenter, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenter, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = functionalSafetyCenterService.page(page, queryWrapper); + public Result> queryPageList(SafetyCenter safetyCenter, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = safetyCenterService.page(page, queryWrapper); return Result.OK(pageList); } @@ -61,10 +60,10 @@ public class FunctionalSafetyCenterController extends JeroController> queryList(FunctionalSafetyCenter functionalSafetyCenter, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenter, req.getParameterMap()); - List list = functionalSafetyCenterService.list(queryWrapper); + public Result> queryList(SafetyCenter safetyCenter, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, req.getParameterMap()); + List list = safetyCenterService.list(queryWrapper); return Result.OK(list); } @@ -74,8 +73,8 @@ public class FunctionalSafetyCenterController extends JeroController add(@Validated @RequestBody FunctionalSafetyCenter functionalSafetyCenter) { - functionalSafetyCenterService.add(functionalSafetyCenter); + public Result add(@Validated @RequestBody SafetyCenter safetyCenter) { + safetyCenterService.add(safetyCenter); return Result.OK(Result.ADD_SUCCESS); } @@ -85,8 +84,8 @@ public class FunctionalSafetyCenterController extends JeroController edit(@Validated @RequestBody FunctionalSafetyCenter functionalSafetyCenter) { - functionalSafetyCenterService.editById(functionalSafetyCenter); + public Result edit(@Validated @RequestBody SafetyCenter safetyCenter) { + safetyCenterService.editById(safetyCenter); return Result.OK(Result.EDIT_SUCCESS); } @@ -101,7 +100,7 @@ public class FunctionalSafetyCenterController extends JeroController idList = Arrays.asList(map.getIds().split(",")); - this.functionalSafetyCenterService.deleteByIds(idList); + this.safetyCenterService.deleteByIds(idList); return Result.OK(Result.DELETE_SUCCESS); } @@ -127,12 +126,12 @@ public class FunctionalSafetyCenterController extends JeroController queryById(@RequestParam(name = "id") String id) { - FunctionalSafetyCenter functionalSafetyCenter = functionalSafetyCenterService.queryById(id); - if (functionalSafetyCenter == null) { + public Result queryById(@RequestParam(name = "id") String id) { + SafetyCenter safetyCenter = safetyCenterService.queryById(id); + if (safetyCenter == null) { throw new JeroBootException(Result.NULL_DATA); } - return Result.OK(functionalSafetyCenter); + return Result.OK(safetyCenter); } /** @@ -140,8 +139,8 @@ public class FunctionalSafetyCenterController extends JeroController { +@RequestMapping("SafetyCenterSubitem") +public class SafetyCenterSubitemController extends JeroController { /** * 服务对象 */ @Resource - private FunctionalSafetyCenterSubitemService functionalSafetyCenterSubitemService; + private SafetyCenterSubitemService safetyCenterSubitemService; /** * 分页列表查询 */ @ApiOperation(value = "功能安全中心成员-分页列表查询", notes = "功能安全中心成员-分页列表查询") @GetMapping(value = "/page") - public Result> queryPageList(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenterSubitem, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = functionalSafetyCenterSubitemService.page(page, queryWrapper); + public Result> queryPageList(SafetyCenterSubitem safetyCenterSubitem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenterSubitem, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = safetyCenterSubitemService.page(page, queryWrapper); return Result.OK(pageList); } @@ -61,10 +61,10 @@ public class FunctionalSafetyCenterSubitemController extends JeroController> queryList(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem, - HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(functionalSafetyCenterSubitem, req.getParameterMap()); - List list = functionalSafetyCenterSubitemService.list(queryWrapper); + public Result> queryList(SafetyCenterSubitem safetyCenterSubitem, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenterSubitem, req.getParameterMap()); + List list = safetyCenterSubitemService.list(queryWrapper); return Result.OK(list); } @@ -74,8 +74,8 @@ public class FunctionalSafetyCenterSubitemController extends JeroController add(@Validated @RequestBody FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { - functionalSafetyCenterSubitemService.add(functionalSafetyCenterSubitem); + public Result add(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { + safetyCenterSubitemService.add(safetyCenterSubitem); return Result.OK(Result.ADD_SUCCESS); } @@ -85,8 +85,8 @@ public class FunctionalSafetyCenterSubitemController extends JeroController edit(@Validated @RequestBody FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { - functionalSafetyCenterSubitemService.editById(functionalSafetyCenterSubitem); + public Result edit(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { + safetyCenterSubitemService.editById(safetyCenterSubitem); return Result.OK(Result.EDIT_SUCCESS); } @@ -101,7 +101,7 @@ public class FunctionalSafetyCenterSubitemController extends JeroController idList = Arrays.asList(map.getIds().split(",")); - this.functionalSafetyCenterSubitemService.deleteByIds(idList); + this.safetyCenterSubitemService.deleteByIds(idList); return Result.OK(Result.DELETE_SUCCESS); } @@ -127,12 +127,12 @@ public class FunctionalSafetyCenterSubitemController extends JeroController queryById(@RequestParam(name = "id") String id) { - FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem = functionalSafetyCenterSubitemService.queryById(id); - if (functionalSafetyCenterSubitem == null) { + public Result queryById(@RequestParam(name = "id") String id) { + SafetyCenterSubitem safetyCenterSubitem = safetyCenterSubitemService.queryById(id); + if (safetyCenterSubitem == null) { throw new JeroBootException(Result.NULL_DATA); } - return Result.OK(functionalSafetyCenterSubitem); + return Result.OK(safetyCenterSubitem); } /** @@ -140,8 +140,8 @@ public class FunctionalSafetyCenterSubitemController extends JeroController importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, FunctionalSafetyCenterSubitem.class); + return super.importExcel(request, response, SafetyCenterSubitem.class); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java similarity index 98% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java index ac487df6..2d490001 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenter.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java @@ -20,7 +20,7 @@ import lombok.Data; @ApiModel(description="功能安全中心") @Data @TableName(value = "pay_functional_safety_center") -public class FunctionalSafetyCenter { +public class SafetyCenter { /** * id */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index 5029fcc1..11eb1b00 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -21,7 +21,7 @@ import lombok.Data; @ApiModel(description = "功能安全中心成员") @Data @TableName(value = "pay_functional_safety_center_subitem") -public class FunctionalSafetyCenterSubitem { +public class SafetyCenterSubitem { /** * id */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java similarity index 97% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java index 1469fde4..b7e2da0d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/FunctionalSafetyCenterSubitemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java @@ -20,7 +20,7 @@ import lombok.Data; @ApiModel(description="功能安全中心成员-联系人") @Data @TableName(value = "pay_functional_safety_center_subitem_contacts") -public class FunctionalSafetyCenterSubitemContacts { +public class SafetyCenterSubitemContacts { /** * id */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java deleted file mode 100644 index 8068ff8d..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemContactsMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jero.functionalsafetycenter.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitemContacts; - -/** - * - *@author liJiaRao - *@date 2024-06-12 15:13 - */ -public interface FunctionalSafetyCenterSubitemContactsMapper extends BaseMapper { -} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java deleted file mode 100644 index 9ec87a46..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterSubitemMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jero.functionalsafetycenter.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitem; - -/** - * @author liJiaRao - * @date 2024-06-12 16:40 - */ -public interface FunctionalSafetyCenterSubitemMapper extends BaseMapper { -} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterMapper.java similarity index 50% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterMapper.java index 312b9db5..eaf95ab8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/FunctionalSafetyCenterMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterMapper.java @@ -1,12 +1,12 @@ package com.jero.functionalsafetycenter.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenter; /** * *@author liJiaRao *@date 2024-06-12 15:13 */ -public interface FunctionalSafetyCenterMapper extends BaseMapper { +public interface SafetyCenterMapper extends BaseMapper { } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java new file mode 100644 index 00000000..c90c9b10 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java @@ -0,0 +1,12 @@ +package com.jero.functionalsafetycenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; + +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +public interface SafetyCenterSubitemContactsMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java new file mode 100644 index 00000000..9490f06a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -0,0 +1,11 @@ +package com.jero.functionalsafetycenter.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; + +/** + * @author liJiaRao + * @date 2024-06-12 16:40 + */ +public interface SafetyCenterSubitemMapper extends BaseMapper { +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml similarity index 91% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml index 5dd83920..1bcbf5ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml similarity index 89% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml index d983cad6..692d7a22 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemContactsMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml similarity index 88% rename from jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml rename to jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index 6afb9562..a9e5c65b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/FunctionalSafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java deleted file mode 100644 index cedd6b2f..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.functionalsafetycenter.service; - -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenter; -import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterMapper; -/** - * - *@author liJiaRao - *@date 2024-06-12 15:13 - */ -@Service -public class FunctionalSafetyCenterService extends ServiceImpl { - public void add(FunctionalSafetyCenter functionalSafetyCenter) { - this.save(functionalSafetyCenter); - } - - public void editById(FunctionalSafetyCenter functionalSafetyCenter) { - this.updateById(functionalSafetyCenter); - } - - public void deleteById(String id) { - this.removeById(id); - } - - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } - - public FunctionalSafetyCenter queryById(String id) { - FunctionalSafetyCenter functionalSafetyCenter = this.getById(id); - return functionalSafetyCenter; - } -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java deleted file mode 100644 index 09e9b985..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemContactsService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.jero.functionalsafetycenter.service; - -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitemContacts; -import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterSubitemContactsMapper; -/** - * - *@author liJiaRao - *@date 2024-06-12 15:13 - */ -@Service -public class FunctionalSafetyCenterSubitemContactsService extends ServiceImpl { - -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java deleted file mode 100644 index 931583ec..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/FunctionalSafetyCenterSubitemService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.jero.functionalsafetycenter.service; - -import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.functionalsafetycenter.mapper.FunctionalSafetyCenterSubitemMapper; -import com.jero.functionalsafetycenter.entity.FunctionalSafetyCenterSubitem; -/** - * - *@author liJiaRao - *@date 2024-06-12 15:13 - */ -@Service -public class FunctionalSafetyCenterSubitemService extends ServiceImpl { - public void add(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { - this.save(functionalSafetyCenterSubitem); - } - - public void editById(FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem) { - this.updateById(functionalSafetyCenterSubitem); - } - - public void deleteById(String id) { - this.removeById(id); - } - - public void deleteByIds(List idList) { - for (String id : idList) { - deleteById(id); - } - } - - public FunctionalSafetyCenterSubitem queryById(String id) { - FunctionalSafetyCenterSubitem functionalSafetyCenterSubitem = this.getById(id); - return functionalSafetyCenterSubitem; - } -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java new file mode 100644 index 00000000..ce5fee2c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java @@ -0,0 +1,38 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.mapper.SafetyCenterMapper; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class SafetyCenterService extends ServiceImpl { + public void add(SafetyCenter safetyCenter) { + this.save(safetyCenter); + } + + public void editById(SafetyCenter safetyCenter) { + this.updateById(safetyCenter); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public SafetyCenter queryById(String id) { + SafetyCenter safetyCenter = this.getById(id); + return safetyCenter; + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java new file mode 100644 index 00000000..1803d487 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -0,0 +1,15 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class SafetyCenterSubitemContactsService extends ServiceImpl { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java new file mode 100644 index 00000000..ad12248b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -0,0 +1,38 @@ +package com.jero.functionalsafetycenter.service; + +import org.springframework.stereotype.Service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemMapper; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +/** + * + *@author liJiaRao + *@date 2024-06-12 15:13 + */ +@Service +public class SafetyCenterSubitemService extends ServiceImpl { + public void add(SafetyCenterSubitem safetyCenterSubitem) { + this.save(safetyCenterSubitem); + } + + public void editById(SafetyCenterSubitem safetyCenterSubitem) { + this.updateById(safetyCenterSubitem); + } + + public void deleteById(String id) { + this.removeById(id); + } + + public void deleteByIds(List idList) { + for (String id : idList) { + deleteById(id); + } + } + + public SafetyCenterSubitem queryById(String id) { + SafetyCenterSubitem safetyCenterSubitem = this.getById(id); + return safetyCenterSubitem; + } +} From 77fbddbb5f1328deb52bad0070ac1c68bb233256 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jun 2024 11:23:01 +0800 Subject: [PATCH 03/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functionalsafetycenter/common/SafetyCenterCommon.java | 4 ++++ .../controller/SafetyCenterController.java | 4 ++-- .../functionalsafetycenter/service/SafetyCenterService.java | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java index 062ff336..0fe31929 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java @@ -5,4 +5,8 @@ package com.jero.functionalsafetycenter.common; * @date 2024-06-25 10:10 */ public class SafetyCenterCommon { + + public static final int PROJECT_TYPE_1 = 1; + public static final int PROJECT_TYPE_2 = 2; + public static final int PROJECT_TYPE_3 = 3; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java index 4eddfc36..69fea5e5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java @@ -70,8 +70,8 @@ public class SafetyCenterController extends JeroController add(@Validated @RequestBody SafetyCenter safetyCenter) { safetyCenterService.add(safetyCenter); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java index ce5fee2c..6f28d67b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java @@ -1,5 +1,6 @@ package com.jero.functionalsafetycenter.service; +import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import org.springframework.stereotype.Service; import java.util.List; @@ -14,6 +15,7 @@ import com.jero.functionalsafetycenter.mapper.SafetyCenterMapper; @Service public class SafetyCenterService extends ServiceImpl { public void add(SafetyCenter safetyCenter) { + safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_2); this.save(safetyCenter); } From f2ef469008451e4212acff2ecded42c440ce4c4a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 25 Jun 2024 17:54:02 +0800 Subject: [PATCH 04/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterController.java | 4 ++-- .../functionalsafetycenter/service/SafetyCenterService.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java index 69fea5e5..4eddfc36 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java @@ -70,8 +70,8 @@ public class SafetyCenterController extends JeroController add(@Validated @RequestBody SafetyCenter safetyCenter) { safetyCenterService.add(safetyCenter); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java index 6f28d67b..a2b700c9 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java @@ -1,5 +1,6 @@ package com.jero.functionalsafetycenter.service; +import com.jero.common.exception.JeroBootException; import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import org.springframework.stereotype.Service; @@ -15,7 +16,10 @@ import com.jero.functionalsafetycenter.mapper.SafetyCenterMapper; @Service public class SafetyCenterService extends ServiceImpl { public void add(SafetyCenter safetyCenter) { - safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_2); + Integer projectType = safetyCenter.getProjectType(); + if (projectType == null){ + throw new JeroBootException("项目类型不能为空"); + } this.save(safetyCenter); } From 5dbda5dffed57043c0a859e5b83c01034c540511 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Jul 2024 10:17:19 +0800 Subject: [PATCH 05/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E5=92=8C=E9=A1=B9=E7=9B=AE=E7=BB=84?= =?UTF-8?q?=E7=9A=84=E6=9F=A5=E8=AF=A2=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/SafetyCenterCommon.java | 10 +- .../controller/SafetyCenterController.java | 117 ++++++++++++++++-- .../entity/SafetyCenter.java | 5 +- .../entity/SafetyCenterSubitem.java | 6 +- .../entity/SafetyCenterSubitemContacts.java | 5 +- .../service/SafetyCenterService.java | 10 +- .../vo/SafetyCenterEditVO.java | 53 ++++++++ 7 files changed, 183 insertions(+), 23 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterEditVO.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java index 0fe31929..b5b66056 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/common/SafetyCenterCommon.java @@ -5,8 +5,16 @@ package com.jero.functionalsafetycenter.common; * @date 2024-06-25 10:10 */ public class SafetyCenterCommon { - + /** + * 安全中心 + */ public static final int PROJECT_TYPE_1 = 1; + /** + * 研究组 + */ public static final int PROJECT_TYPE_2 = 2; + /** + * 项目组 + */ public static final int PROJECT_TYPE_3 = 3; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java index 4eddfc36..52a06fe0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java @@ -1,5 +1,7 @@ package com.jero.functionalsafetycenter.controller; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -9,8 +11,12 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.oConvertUtils; +import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.service.SafetyCenterService; +import com.jero.functionalsafetycenter.vo.SafetyCenterEditVO; +import com.jero.member.entity.TbMemberProjectFile; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -21,8 +27,10 @@ import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 功能安全中心(pay_functional_safety_center)表控制层 @@ -50,6 +58,28 @@ public class SafetyCenterController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, req.getParameterMap()); + //只查询安全中心和研究组 + ArrayList objects = new ArrayList<>(); + objects.add(SafetyCenterCommon.PROJECT_TYPE_1); + objects.add(SafetyCenterCommon.PROJECT_TYPE_2); + queryWrapper.lambda().in(SafetyCenter::getProjectType,objects); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = safetyCenterService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 分页列表查询 + */ + @ApiOperation(value = "功能安全中心-项目组分页列表查询", notes = "功能安全中心-分页列表查询") + @GetMapping(value = "/projectGroupPage") + public Result> queryProjectGroupPageList(SafetyCenter safetyCenter, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, req.getParameterMap()); + //只查询项目组 + queryWrapper.lambda().eq(SafetyCenter::getProjectType,SafetyCenterCommon.PROJECT_TYPE_3); Page page = new Page<>(pageNo, pageSize); IPage pageList = safetyCenterService.page(page, queryWrapper); return Result.OK(pageList); @@ -70,10 +100,23 @@ public class SafetyCenterController extends JeroController add(@Validated @RequestBody SafetyCenter safetyCenter) { + safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_2); + safetyCenterService.add(safetyCenter); + return Result.OK(Result.ADD_SUCCESS); + } + /** + * 添加 + */ + @AutoLog(value = "功能安全中心-添加项目组") + @ApiOperation(value = "功能安全中心-添加项目组", notes = "功能安全中心-添加项目组") + @PostMapping(value = "/addProjectGroup") + public Result addProjectGroup(@Validated @RequestBody SafetyCenter safetyCenter) { + safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_3); + safetyCenterService.add(safetyCenter); return Result.OK(Result.ADD_SUCCESS); } @@ -81,10 +124,20 @@ public class SafetyCenterController extends JeroController edit(@Validated @RequestBody SafetyCenter safetyCenter) { + public Result edit(@Validated @RequestBody SafetyCenterEditVO safetyCenter) { + safetyCenterService.editById(safetyCenter); + return Result.OK(Result.EDIT_SUCCESS); + } + /** + * 编辑 + */ + @AutoLog(value = "功能安全中心-编辑项目组") + @ApiOperation(value = "功能安全中心-编辑项目组", notes = "功能安全中心-编辑") + @PostMapping(value = "/editProjectGroup") + public Result editProjectGroup(@Validated @RequestBody SafetyCenterEditVO safetyCenter) { safetyCenterService.editById(safetyCenter); return Result.OK(Result.EDIT_SUCCESS); } @@ -140,10 +193,58 @@ public class SafetyCenterController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, request.getParameterMap()); + //只查询安全中心和研究组 + ArrayList objects = new ArrayList<>(); + objects.add(SafetyCenterCommon.PROJECT_TYPE_1); + objects.add(SafetyCenterCommon.PROJECT_TYPE_2); + queryWrapper.lambda().in(SafetyCenter::getProjectType,objects); + Page page = new Page<>(-1, -1); + IPage pageList = safetyCenterService.page(page, queryWrapper); + List records = pageList.getRecords(); + List exportList; + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + }else { + exportList = records; + } + if (exportList.isEmpty()) { + throw new JeroBootException("没有数据"); + } + + return super.exportListXls(exportList, SafetyCenter.class, "功能安全中心"); + } + + /** + * 导出excel + */ + @ApiOperation(value = "功能安全中心-导出项目组excel") + @GetMapping(value = "/exportProjectGroupXls") + public ModelAndView exportProjectGroupXls(HttpServletRequest request, SafetyCenter safetyCenter) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, request.getParameterMap()); + //只查询项目组 + queryWrapper.lambda().eq(SafetyCenter::getProjectType,SafetyCenterCommon.PROJECT_TYPE_3); + Page page = new Page<>(-1, -1); + IPage pageList = safetyCenterService.page(page, queryWrapper); + List records = pageList.getRecords(); + List exportList; + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + }else { + exportList = records; + } + if (exportList.isEmpty()) { + throw new JeroBootException("没有数据"); + } + + return super.exportListXls(exportList, SafetyCenter.class, "功能安全中心"); } - - } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java index 2d490001..3e8fb958 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java @@ -10,13 +10,10 @@ import java.util.Date; import lombok.Data; /** - * + *功能安全中心 *@author liJiaRao *@date 2024-06-12 15:13 */ -/** - * 功能安全中心 - */ @ApiModel(description="功能安全中心") @Data @TableName(value = "pay_functional_safety_center") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index 11eb1b00..877b71cb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -10,14 +10,10 @@ import java.util.Date; import lombok.Data; /** - * + *功能安全中心成员 *@author liJiaRao *@date 2024-06-12 16:40 */ - -/** - * 功能安全中心成员 - */ @ApiModel(description = "功能安全中心成员") @Data @TableName(value = "pay_functional_safety_center_subitem") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java index b7e2da0d..266c4769 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java @@ -10,13 +10,10 @@ import java.util.Date; import lombok.Data; /** - * + *功能安全中心成员-联系人 *@author liJiaRao *@date 2024-06-12 15:13 */ -/** - * 功能安全中心成员-联系人 - */ @ApiModel(description="功能安全中心成员-联系人") @Data @TableName(value = "pay_functional_safety_center_subitem_contacts") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java index a2b700c9..a70bea4e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java @@ -2,6 +2,8 @@ package com.jero.functionalsafetycenter.service; import com.jero.common.exception.JeroBootException; import com.jero.functionalsafetycenter.common.SafetyCenterCommon; +import com.jero.functionalsafetycenter.vo.SafetyCenterEditVO; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -23,7 +25,13 @@ public class SafetyCenterService extends ServiceImpl Date: Mon, 1 Jul 2024 10:31:19 +0800 Subject: [PATCH 06/64] =?UTF-8?q?add=20=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E5=A2=9E=E5=8A=A0@Excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SafetyCenter.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java index 3e8fb958..dfd4eabe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java @@ -4,10 +4,14 @@ 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.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; /** *功能安全中心 @@ -44,13 +48,16 @@ public class SafetyCenter { */ @TableField(value = "project_name") @ApiModelProperty(value="项目名称") + @Excel(name = "项目名称", width = 15) private String projectName; /** * 负责人id */ @TableField(value = "principal_id") - @ApiModelProperty(value="负责人id") + @ApiModelProperty(value = "负责人id") + @Excel(name = "负责人", width = 15, dictTable = "sys_user",dicText = "realname",dicCode = "id") + @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id") private String principalId; /** @@ -58,6 +65,7 @@ public class SafetyCenter { */ @TableField(value = "mission_and_objectives") @ApiModelProperty(value="任务及目标") + @Excel(name = "任务及目标", width = 15) private String missionAndObjectives; /** @@ -65,6 +73,7 @@ public class SafetyCenter { */ @TableField(value = "remarks") @ApiModelProperty(value="备注") + @Excel(name = "备注", width = 15) private String remarks; /** @@ -79,6 +88,8 @@ public class SafetyCenter { */ @TableField(value = "create_time") @ApiModelProperty(value="创建时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date createTime; /** @@ -93,5 +104,7 @@ public class SafetyCenter { */ @TableField(value = "update_time") @ApiModelProperty(value="更新时间") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; } \ No newline at end of file From 5b3a6c6275fc1914952a216b84a8c69e4b7ecb60 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 1 Jul 2024 16:22:02 +0800 Subject: [PATCH 07/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 2 + .../SafetyCenterSubitemController.java | 2 +- .../entity/SafetyCenterSubitem.java | 19 ++++ .../service/SafetyCenterSubitemService.java | 92 +++++++++++++++++++ 4 files changed, 114 insertions(+), 1 deletion(-) diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql index db9c4eb8..e569d5c4 100644 --- a/db/24年6月功能安全中心变更.sql +++ b/db/24年6月功能安全中心变更.sql @@ -59,3 +59,5 @@ create table pay_functional_safety_center_subitem_contacts alter table pay_functional_safety_center_subitem_contacts add primary key (id); +insert into sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time, update_by, update_time) +values ('1803314563741982722', '1432280766382727169', '功能安全中心会议', '9', '', 9.00, 1, 'LKGLZ', '2024-06-19 14:31:11', 'LKGLZ', '2024-06-25 10:40:33'); \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index cfbc2c8d..3d8ad93a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -52,7 +52,7 @@ public class SafetyCenterSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenterSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = safetyCenterSubitemService.page(page, queryWrapper); + IPage pageList = safetyCenterSubitemService.pageList(page, queryWrapper); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index 877b71cb..95359776 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -4,10 +4,16 @@ 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.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.util.Date; +import java.util.List; + import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +import javax.validation.constraints.Size; /** *功能安全中心成员 @@ -37,8 +43,21 @@ public class SafetyCenterSubitem { */ @TableField(value = "company_id") @ApiModelProperty(value = "成员单位id") + @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") + @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; + /**企业联系人id*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人id") + @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + private String contactsId; + + /**企业联系人列表*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人列表") + private List contactsList; + /** * 备注 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index ad12248b..c88d9db8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -1,11 +1,25 @@ package com.jero.functionalsafetycenter.service; +import cn.hutool.core.collection.CollStreamUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.common.exception.JeroBootException; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemMapper; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; + +import javax.annotation.Resource; + /** * *@author liJiaRao @@ -13,12 +27,67 @@ import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; */ @Service public class SafetyCenterSubitemService extends ServiceImpl { + @Resource + private SafetyCenterService safetyCenterService; + @Resource + private SafetyCenterSubitemContactsService contactsService; + public void add(SafetyCenterSubitem safetyCenterSubitem) { + String projectId = safetyCenterSubitem.getProjectId(); + SafetyCenter safetyCenter = safetyCenterService.getById(projectId); + if (safetyCenter == null){ + throw new JeroBootException("项目不存在"); + } + //判重，公司是否重复 + String companyId = safetyCenterSubitem.getCompanyId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitem::getProjectId,projectId); + wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId); + if (this.count(wrapper) > 0){ + throw new JeroBootException("成员单位已经存在"); + } this.save(safetyCenterSubitem); + //保存成员单位联系人 + String subitemId = safetyCenterSubitem.getId(); + List contactsList = safetyCenterSubitem.getContactsList(); + for (SafetyCenterSubitemContacts contacts : contactsList) { + contacts.setProjectId(projectId); + contacts.setCompanyId(companyId); + contacts.setSubitemId(subitemId); + } + contactsService.saveBatch(contactsList); } public void editById(SafetyCenterSubitem safetyCenterSubitem) { + String subitemId = safetyCenterSubitem.getId(); + String projectId = safetyCenterSubitem.getProjectId(); + SafetyCenter safetyCenter = safetyCenterService.getById(projectId); + if (safetyCenter == null){ + throw new JeroBootException("项目不存在"); + } + + //判重，公司是否重复 + String companyId = safetyCenterSubitem.getCompanyId(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.ne(SafetyCenterSubitem::getId,subitemId); + wrapper.eq(SafetyCenterSubitem::getProjectId,projectId); + wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId); + if (this.count(wrapper) > 0){ + throw new JeroBootException("成员单位已经存在"); + } this.updateById(safetyCenterSubitem); + //先删除之前保存的 + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); + contactsService.remove(wrapper1); + //保存成员单位联系人 + List contactsList = safetyCenterSubitem.getContactsList(); + for (SafetyCenterSubitemContacts contacts : contactsList) { + contacts.setProjectId(projectId); + contacts.setCompanyId(companyId); + contacts.setSubitemId(subitemId); + } + contactsService.saveBatch(contactsList); } public void deleteById(String id) { @@ -35,4 +104,27 @@ public class SafetyCenterSubitemService extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { + IPage pageList = this.page(page, queryWrapper); + List records = pageList.getRecords(); + //根据企业id获取所有联系人 + List companyIdList = records.stream().map(SafetyCenterSubitem::getCompanyId).collect(Collectors.toList()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SafetyCenterSubitemContacts::getCompanyId,companyIdList); + wrapper.orderByAsc(SafetyCenterSubitemContacts::getCompanyId); + //根据orderNum排序 + wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum); + List contactsList = contactsService.list(wrapper); + //根据企业id分组 + Map> stringListMap = CollStreamUtil.groupByKey(contactsList, SafetyCenterSubitemContacts::getCompanyId); + //遍历，存入数据 + for (SafetyCenterSubitem subitem : records) { + String companyId = subitem.getCompanyId(); + List safetyCenterSubitemContacts = stringListMap.get(companyId); + subitem.setContactsId(safetyCenterSubitemContacts.get(0).getContactsId()); + subitem.setContactsList(safetyCenterSubitemContacts); + } + return pageList; + } } From 93c6636c3ef4a85177cd5994155046f1d018fbf3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 10:22:32 +0800 Subject: [PATCH 08/64] =?UTF-8?q?update=2024=E5=B9=B46=E6=9C=88=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83=E5=8F=98=E6=9B=B4?= =?UTF-8?q?.sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql index e569d5c4..da2cefb6 100644 --- a/db/24年6月功能安全中心变更.sql +++ b/db/24年6月功能安全中心变更.sql @@ -2,7 +2,7 @@ drop table if exists pay_functional_safety_center; create table pay_functional_safety_center ( id varchar(36) not null comment 'id', - parent_id varchar(36) not null comment '父级id', + parent_id varchar(36) null comment '父级id', project_type int null comment '项目类型（1功能安全中心，2研究组，3项目组）', project_name varchar(50) null comment '项目名称', principal_id varchar(32) null comment '负责人id', From 351b303f55ab283881a1f2b4118b6f12d1400372 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 10:33:03 +0800 Subject: [PATCH 09/64] =?UTF-8?q?add=20=E5=AE=89=E5=85=A8=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=EF=BC=8C=E7=A0=94=E7=A9=B6=E7=BB=84=E5=92=8C=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=84=E6=96=B0=E5=A2=9E=E6=88=90=E5=91=98=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8D=95=E4=BD=8D=E5=92=8C=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCompanyManagementController.java | 50 ++++++++++++++++++- .../PayContactsManagementController.java | 41 ++++++++++++++- .../mapper/PayCompanyManagementMapper.java | 6 +++ .../mapper/PayContactsManagementMapper.java | 4 ++ .../mapper/xml/PayCompanyManagementMapper.xml | 7 +++ .../xml/PayContactsManagementMapper.xml | 7 +++ .../service/IPayCompanyManagementService.java | 6 +++ .../IPayContactsManagementService.java | 3 ++ .../impl/PayCompanyManagementServiceImpl.java | 9 +++- .../PayContactsManagementServiceImpl.java | 5 ++ 10 files changed, 133 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index bbf8e09d..de877dbd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -26,6 +26,11 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.vo.UpdateInvoicePram; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.functionalsafetycenter.service.SafetyCenterService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; @@ -34,7 +39,6 @@ import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.member.service.ITbMemberProjectSubitemService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.pack.entity.PayPackCompany; import com.jero.project.entity.PayCommonProject; import com.jero.project.entity.PayWorkingGroupSubItem; import com.jero.project.service.IPayCommonProjectService; @@ -96,7 +100,8 @@ public class PayCompanyManagementController extends JeroController queryPageSafetyCenter(PayCompanyManagement payCompanyManagement, + @RequestParam(name="projectId") String projectId, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ + return Result.error("企业名称长度不能大于50个字符！"); + } + SafetyCenter safetyCenter = safetyCenterService.getById(projectId); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); + + queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper); + List listPayCompanyManagement = pageList.getRecords(); + if(!CollectionUtils.isEmpty(listPayCompanyManagement)){ + try { + listPayCompanyManagement.forEach(p->{ + if (!StringUtils.isBlank(p.getCompanyPhone())){ + p.setCompanyPhone(PasswordUtil.decrypt(p.getCompanyPhone())); + } + }); + pageList.setRecords(listPayCompanyManagement); + }catch (Exception e){ + log.error("公司电话解密异常！",e); + } + } + return Result.OK(pageList); + } + /** * 添加-会议对外开放接口 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index 7c768720..a43b0822 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -22,6 +22,8 @@ import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; import com.jero.company.service.ProjectCountService; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.service.SafetyCenterService; import com.jero.meeting.entity.PayMeetingSituation; import com.jero.meeting.service.IPayMeetingSituationService; import com.jero.member.entity.PayMemberProjectSubitem; @@ -96,7 +98,8 @@ public class PayContactsManagementController extends JeroController queryBySafetyCenter(@RequestParam(name="projectId") String projectId, + @RequestParam(name="companyId",required = false) String companyId, + @RequestParam(name="name",required = false) String name) { + if (StringUtils.isBlank(companyId)||StringUtils.isBlank(projectId)){ + return Result.OK(); + } + SafetyCenter safetyCenter = safetyCenterService.getById(projectId); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId()); + queryWrapper.eq("pfscsc.company_id", companyId); + if(!StringUtils.isEmpty(name)){ + queryWrapper.like("pcm.name", name); + } + List list = payContactsManagementService.queryBySafetyCenter(queryWrapper); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + if(!StringUtils.isBlank(p.getPhone())){ + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + if(!StringUtils.isBlank(p.getEmail())){ + p.setEmail(PasswordUtil.decrypt(p.getEmail())); + } + }); + } + return Result.OK(list); + } + /** * 导出excel * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java index 550f1faa..57d92f4b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayCompanyManagementMapper.java @@ -1,7 +1,11 @@ package com.jero.company.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayCompanyManagement; import org.apache.ibatis.annotations.Param; @@ -27,4 +31,6 @@ public interface PayCompanyManagementMapper extends BaseMapper pageSafetyCenter(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java index 5610f887..1afda935 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayContactsManagementMapper.java @@ -1,8 +1,10 @@ package com.jero.company.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.company.entity.PayContactsManagement; import com.jero.company.vo.CompanyLoginVO; @@ -39,4 +41,6 @@ public interface PayContactsManagementMapper extends BaseMapper listPayContactsManagement(List phoneList); void forgetPassword(@Param("companyLoginVO") CompanyLoginVO companyLoginVO); + + List queryBySafetyCenter(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml index cabfbc48..3071f2c3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayCompanyManagementMapper.xml @@ -39,4 +39,11 @@ and member_id != #{memberId} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index e540256c..932ac8a7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -69,4 +69,11 @@ phone = #{companyLoginVO.phone} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java index 5bb9f597..2cb6d3bb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayCompanyManagementService.java @@ -1,6 +1,9 @@ package com.jero.company.service; +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.baomidou.mybatisplus.extension.service.IService; import com.jero.company.entity.PayCompanyAndContactsManagement; import com.jero.company.entity.PayCompanyManagement; @@ -121,4 +124,7 @@ public interface IPayCompanyManagementService extends IService pageSafetyCenter(Page page, QueryWrapper queryWrapper); + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java index 0bde0375..2af24513 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayContactsManagementService.java @@ -1,5 +1,6 @@ package com.jero.company.service; +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.baomidou.mybatisplus.extension.service.IService; @@ -85,4 +86,6 @@ public interface IPayContactsManagementService extends IService queryBySafetyCenter(QueryWrapper queryWrapper); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java index eeaf06fd..e4ba21a2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayCompanyManagementServiceImpl.java @@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.common.ProjectCommon; import com.jero.common.common.RoleCommon; @@ -15,12 +17,10 @@ import com.jero.common.enums.ManagementMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.service.SendMessageService; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.AuthenticationUtils; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.company.common.PayCompanyManagementCommon; import com.jero.company.common.PayContactsManagementCommon; -import com.jero.company.entity.MemberInfo; import com.jero.company.entity.PayCompanyAndContactsManagement; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; @@ -710,6 +710,11 @@ public class PayCompanyManagementServiceImpl extends ServiceImpl pageSafetyCenter(Page page, QueryWrapper queryWrapper) { + return payCompanyManagementMapper.pageSafetyCenter(page, queryWrapper); + } + /** * 校验企业名称和信用代码是否匹配 * @param payCompanyManagement diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java index 03113e01..d13bf321 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayContactsManagementServiceImpl.java @@ -455,4 +455,9 @@ public class PayContactsManagementServiceImpl extends ServiceImpl queryBySafetyCenter(QueryWrapper queryWrapper) { + return baseMapper.queryBySafetyCenter(queryWrapper); + } } From e61d2900cffe5cfa3f4af2f456310ed8e4196131 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 10:37:21 +0800 Subject: [PATCH 10/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayCompanyManagementController.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index de877dbd..fde30a7f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -263,26 +263,21 @@ public class PayCompanyManagementController extends JeroController queryPageSafetyCenter(PayCompanyManagement payCompanyManagement, - @RequestParam(name="projectId") String projectId, + public Result queryPageSafetyCenter(@RequestParam(name="projectId") String projectId, + @RequestParam(name="companyName",required = false) String companyName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - if(!StringUtils.isBlank(payCompanyManagement.getCompanyName()) && payCompanyManagement.getCompanyName().length() > 50){ - return Result.error("企业名称长度不能大于50个字符！"); - } SafetyCenter safetyCenter = safetyCenterService.getById(projectId); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payCompanyManagement, req.getParameterMap()); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId()); + queryWrapper.like(StringUtils.isNotBlank(companyName),"pcm.company_name",companyName); Page page = new Page<>(pageNo, pageSize); IPage pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper); List listPayCompanyManagement = pageList.getRecords(); From d7bcd67ae72349db381fe6e62e6d1525d997d205 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 11:36:47 +0800 Subject: [PATCH 11/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E5=88=A4=E9=87=8D=EF=BC=8C?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E6=98=AF=E5=90=A6=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index c88d9db8..7f949639 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -46,10 +46,17 @@ public class SafetyCenterSubitemService extends ServiceImpl 0){ throw new JeroBootException("成员单位已经存在"); } + //判重，联系人是否重复 + List contactsList = safetyCenterSubitem.getContactsList(); + if (!contactsList.isEmpty()){ + List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (collect.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + } this.save(safetyCenterSubitem); //保存成员单位联系人 String subitemId = safetyCenterSubitem.getId(); - List contactsList = safetyCenterSubitem.getContactsList(); for (SafetyCenterSubitemContacts contacts : contactsList) { contacts.setProjectId(projectId); contacts.setCompanyId(companyId); @@ -75,13 +82,20 @@ public class SafetyCenterSubitemService extends ServiceImpl 0){ throw new JeroBootException("成员单位已经存在"); } + //判重，联系人是否重复 + List contactsList = safetyCenterSubitem.getContactsList(); + if (!contactsList.isEmpty()){ + List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (collect.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + } this.updateById(safetyCenterSubitem); //先删除之前保存的 LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); contactsService.remove(wrapper1); //保存成员单位联系人 - List contactsList = safetyCenterSubitem.getContactsList(); for (SafetyCenterSubitemContacts contacts : contactsList) { contacts.setProjectId(projectId); contacts.setCompanyId(companyId); From 6c063f5933a5b2925a3edf645bec22ba9389cb23 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 14:13:01 +0800 Subject: [PATCH 12/64] update nginx.conf --- nginxConfig/prod/nginx.conf | 88 +++++++++++++++++++++++++++---------- 1 file changed, 64 insertions(+), 24 deletions(-) diff --git a/nginxConfig/prod/nginx.conf b/nginxConfig/prod/nginx.conf index d4db0725..bc3698e8 100644 --- a/nginxConfig/prod/nginx.conf +++ b/nginxConfig/prod/nginx.conf @@ -24,6 +24,12 @@ http { # '"$http_user_agent" "$http_x_forwarded_for"'; #access_log logs/access.log main; + log_format access-upstream '$time_iso8601|$request|$remote_addr|$upstream_response_time|$http_user_agent|$http_x_forwarded_for'; + map $time_iso8601 $logdate { + '~^(?\d{4}-\d{2}-\d{2})' $ymd; + default 'date-not-found'; + } + access_log logs/access-$logdate.log ; sendfile on; #tcp_nopush on; @@ -31,7 +37,7 @@ http { #keepalive_timeout 0; keepalive_timeout 1000s; proxy_read_timeout 1000s; - client_max_body_size 50m; + client_max_body_size 100m; #gzip on; # 企业端 server { @@ -56,22 +62,15 @@ http { location / { root D:/income_payments/UI_enterprise/enterprise; - #try_files $uri $uri/ /index.html; + index index.html index.htm; + try_files $uri $uri/ /index.html; proxy_read_timeout 150s; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; add_header 'Referrer-Policy' 'origin'; add_header X-XSS-Protection "1; mode=block"; add_header X-Content-Type-Options "nosniff"; - #add_header X-Frame-Options "ALLOW-FROM http://casa.catarc.org.cn:7008/"; - #add_header Strict-Transport-Security "max-age=16070400;"; - index index.html index.htm; -# root html; -# index index.html index.htm; - if (!-e $request_filename) { - rewrite ^(.*)$ /index.html?s=$1 last; - break; - } + } location /jero-boot { @@ -79,6 +78,9 @@ http { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + location /jero-boot/actuator { + return 403; } #会员系统的后端 location /memberApi { @@ -87,6 +89,26 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + #拦截 getcorsfile 接口 + location /preview/getCorsFile { + return 403; + } + #拦截 deletefile 接口 + location /preview/deleteFile { + return 403; + } + #防止 kkfile 执行恶意代码 + location /preview/index { + return 403; + } + #拦截 deletefile 接口 + #通过 preview 接口允许访问 kkfile 预览 + location /preview { + proxy_pass http://127.0.0.1:8092; + proxy_set_header host $host; + proxy_set_header x-real-ip $remote_addr; + proxy_set_header x-forwarded-for $proxy_add_x_forwarded_for; + } #error_page 404 /404.html; # redirect server error pages to the static page /50x.html @@ -137,6 +159,9 @@ http { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + location /jero-boot/actuator { + return 403; } # 请求大屏客户环境 location /zxd { @@ -271,6 +296,7 @@ http { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + #error_page 404 /404.html; # redirect server error pages to the static page /50x.html @@ -283,21 +309,35 @@ http { } } - server { - listen 8092; - server_name localhost; - #charset koi8-r; - #access_log logs/host.access.log main; + server { + listen 8093; + server_name localhost; - location ^~ /getCorsFile { - return 404; - index index.html index.htm; - } - location ^~ / { - proxy_pass http://cwp.catarc.org.cn:8093/; - } - } + #charset koi8-r; + + #access_log logs/host.access.log main; + + location ^~ /getCorsFile { + return 404; + index index.html index.htm; + } + location /preview/getCorsFile { + return 403; + } + #拦截 deletefile 接口 + location /preview/deleteFile { + return 403; + } + #防止 kkfile 执行恶意代码 + location /preview/index { + return 403; + } + #拦截 deletefile 接口 + location /index { + return 403; + } + } } From 8843c006c6545de6fa51318008280dbcdb63d2f4 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 14:22:36 +0800 Subject: [PATCH 13/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterSubitemController.java | 3 +-- .../entity/SafetyCenterSubitem.java | 6 ++++++ .../mapper/SafetyCenterSubitemMapper.java | 5 +++++ .../mapper/xml/SafetyCenterSubitemMapper.xml | 13 +++++++++++++ .../service/SafetyCenterSubitemService.java | 5 ++--- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 3d8ad93a..1fc0d97b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -50,9 +50,8 @@ public class SafetyCenterSubitemController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenterSubitem, req.getParameterMap()); Page page = new Page<>(pageNo, pageSize); - IPage pageList = safetyCenterSubitemService.pageList(page, queryWrapper); + IPage pageList = safetyCenterSubitemService.pageList(page, safetyCenterSubitem); return Result.OK(pageList); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index 95359776..efcbb1fe 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -46,6 +46,12 @@ public class SafetyCenterSubitem { @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; + /** + * 成员单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "成员单位名称") + private String companyName; /**企业联系人id*/ @TableField(exist = false) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index 9490f06a..eae688ee 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -1,11 +1,16 @@ package com.jero.functionalsafetycenter.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import org.apache.ibatis.annotations.Param; /** * @author liJiaRao * @date 2024-06-12 16:40 */ public interface SafetyCenterSubitemMapper extends BaseMapper { + IPage pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index a9e5c65b..c857d363 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -17,4 +17,17 @@ id, project_id, company_id, remarks, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 7f949639..e2b7a2e2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -2,7 +2,6 @@ package com.jero.functionalsafetycenter.service; import cn.hutool.core.collection.CollStreamUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -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.common.exception.JeroBootException; @@ -119,8 +118,8 @@ public class SafetyCenterSubitemService extends ServiceImpl pageList(Page page, QueryWrapper queryWrapper) { - IPage pageList = this.page(page, queryWrapper); + public IPage pageList(Page page, SafetyCenterSubitem safetyCenterSubitem) { + IPage pageList = baseMapper.pageList(page, safetyCenterSubitem); List records = pageList.getRecords(); //根据企业id获取所有联系人 List companyIdList = records.stream().map(SafetyCenterSubitem::getCompanyId).collect(Collectors.toList()); From f7ceedb0dd1ae4f424b00e0003f28bb010b09da9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 14:49:35 +0800 Subject: [PATCH 14/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SafetyCenterSubitemMapper.java | 5 +++- .../mapper/xml/SafetyCenterSubitemMapper.xml | 10 ++++++++ .../SafetyCenterSubitemContactsService.java | 13 +++++++++- .../service/SafetyCenterSubitemService.java | 25 +++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index eae688ee..8617b415 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -1,16 +1,19 @@ package com.jero.functionalsafetycenter.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author liJiaRao * @date 2024-06-12 16:40 */ public interface SafetyCenterSubitemMapper extends BaseMapper { IPage pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); + + List listByParentIdAndCompanyId(@Param("parentId") String parentId, @Param("companyId") String companyId); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index c857d363..c02750bf 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -30,4 +30,14 @@ + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index 1803d487..67fb0da8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -1,9 +1,14 @@ package com.jero.functionalsafetycenter.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; + +import java.util.List; +import java.util.stream.Collectors; + /** * *@author liJiaRao @@ -11,5 +16,11 @@ import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; */ @Service public class SafetyCenterSubitemContactsService extends ServiceImpl { - + public void deleteBySubitemId(String subitemId){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); + List list = this.list(wrapper); + List idList = list.stream().map(SafetyCenterSubitemContacts::getId).collect(Collectors.toList()); + this.removeByIds(idList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index e2b7a2e2..229ebff7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import org.springframework.stereotype.Service; @@ -104,7 +105,21 @@ public class SafetyCenterSubitemService extends ServiceImpl subitemList = this.listByParentIdAndCompanyId(projectId, subitem.getCompanyId()); + for (SafetyCenterSubitem safetyCenterSubitem : subitemList) { + deleteById(safetyCenterSubitem.getId()); + } + } + //删除成员 this.removeById(id); + //删除联系人 + contactsService.deleteBySubitemId(id); } public void deleteByIds(List idList) { @@ -140,4 +155,14 @@ public class SafetyCenterSubitemService extends ServiceImpl listByParentIdAndCompanyId(String parentId,String companyId){ + return baseMapper.listByParentIdAndCompanyId(parentId,companyId); + } } From efd2c3628f1c35e88e3821bf088f815d88705953 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 15:17:17 +0800 Subject: [PATCH 15/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemContactsService.java | 6 ++ .../service/SafetyCenterSubitemService.java | 61 ++++++++++++++++--- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index 67fb0da8..f7de7294 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -23,4 +23,10 @@ public class SafetyCenterSubitemContactsService extends ServiceImpl idList = list.stream().map(SafetyCenterSubitemContacts::getId).collect(Collectors.toList()); this.removeByIds(idList); } + public List listBySubitemId(String subitemId){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); + return this.list(wrapper); + } + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 229ebff7..06d20cc2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -17,6 +17,7 @@ import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemMapper; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -26,6 +27,7 @@ import javax.annotation.Resource; *@date 2024-06-12 15:13 */ @Service +@Transactional(rollbackFor = Exception.class) public class SafetyCenterSubitemService extends ServiceImpl { @Resource private SafetyCenterService safetyCenterService; @@ -48,12 +50,34 @@ public class SafetyCenterSubitemService extends ServiceImpl contactsList = safetyCenterSubitem.getContactsList(); - if (!contactsList.isEmpty()){ - List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); - if (collect.size() != contactsList.size()){ - throw new JeroBootException("企业联系人重复"); + if (contactsList.isEmpty()){ + throw new JeroBootException("企业联系人不能为空"); + } + List contactIdList = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (contactIdList.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + //判断父级是否有所选企业和所选联系人 + Integer projectType = safetyCenter.getProjectType(); + if (SafetyCenterCommon.PROJECT_TYPE_3 != projectType){ + //判断企业 + String parentId = safetyCenter.getParentId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitem::getProjectId,parentId); + wrapper1.eq(SafetyCenterSubitem::getCompanyId,companyId); + SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper); + if (parentCenterSubitem == null){ + throw new JeroBootException("该成员单位无法添加到当前项目"); + } + //判断联系人 + String parentCenterSubitemId = parentCenterSubitem.getId(); + List parentContactList = contactsService.listBySubitemId(parentCenterSubitemId); + List parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (!parentContactIdList.containsAll(contactIdList)) { + throw new JeroBootException("联系人无法添加到当前项目"); } } + //保存成员 this.save(safetyCenterSubitem); //保存成员单位联系人 String subitemId = safetyCenterSubitem.getId(); @@ -84,10 +108,31 @@ public class SafetyCenterSubitemService extends ServiceImpl contactsList = safetyCenterSubitem.getContactsList(); - if (!contactsList.isEmpty()){ - List collect = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); - if (collect.size() != contactsList.size()){ - throw new JeroBootException("企业联系人重复"); + if (contactsList.isEmpty()){ + throw new JeroBootException("企业联系人不能为空"); + } + List contactIdList = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (contactIdList.size() != contactsList.size()){ + throw new JeroBootException("企业联系人重复"); + } + //判断父级是否有所选企业和所选联系人 + Integer projectType = safetyCenter.getProjectType(); + if (SafetyCenterCommon.PROJECT_TYPE_3 != projectType){ + //判断企业 + String parentId = safetyCenter.getParentId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitem::getProjectId,parentId); + wrapper1.eq(SafetyCenterSubitem::getCompanyId,companyId); + SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper); + if (parentCenterSubitem == null){ + throw new JeroBootException("该成员单位无法添加到当前项目"); + } + //判断联系人 + String parentCenterSubitemId = parentCenterSubitem.getId(); + List parentContactList = contactsService.listBySubitemId(parentCenterSubitemId); + List parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + if (!parentContactIdList.containsAll(contactIdList)) { + throw new JeroBootException("联系人无法添加到当前项目"); } } this.updateById(safetyCenterSubitem); From 46544040768ba739246104993e777ca14fca449c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 17:41:43 +0800 Subject: [PATCH 16/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemContactsMapper.java | 4 ++++ .../xml/SafetyCenterSubitemContactsMapper.xml | 14 +++++++++++++ .../SafetyCenterSubitemContactsService.java | 3 +++ .../service/SafetyCenterSubitemService.java | 20 +++++++++++++++++++ 4 files changed, 41 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java index c90c9b10..e681f914 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemContactsMapper.java @@ -2,6 +2,9 @@ package com.jero.functionalsafetycenter.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -9,4 +12,5 @@ import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; *@date 2024-06-12 15:13 */ public interface SafetyCenterSubitemContactsMapper extends BaseMapper { + List listByParentIdAndContactIdList(@Param("parentId") String parentId, @Param("contactIdList") List contactIdList); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml index 692d7a22..4c9c14b0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemContactsMapper.xml @@ -21,4 +21,18 @@ id, project_id, subitem_id, company_id, contacts_id, remarks, order_num, create_by, create_time, update_by, update_time + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index f7de7294..41fd66e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -29,4 +29,7 @@ public class SafetyCenterSubitemContactsService extends ServiceImpl listByParentIdAndContactIdList(String parentId, List contactIdList){ + return baseMapper.listByParentIdAndContactIdList(parentId,contactIdList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 06d20cc2..4d64c455 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -134,6 +134,13 @@ public class SafetyCenterSubitemService extends ServiceImpl oldContactList = contactsService.listBySubitemId(subitemId); + List oldContactIdList = oldContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + //取差值，得到删除的联系人 + oldContactIdList.removeAll(contactIdList); + //删除子项目的联系人 + this.deleteChildrenByParentId(parentId,contactIdList); } this.updateById(safetyCenterSubitem); //先删除之前保存的 @@ -210,4 +217,17 @@ public class SafetyCenterSubitemService extends ServiceImpl listByParentIdAndCompanyId(String parentId,String companyId){ return baseMapper.listByParentIdAndCompanyId(parentId,companyId); } + + /** + * 删除子项目的联系人 + */ + public void deleteChildrenByParentId(String parentId, List contactIdList) { + List contactList = contactsService.listByParentIdAndContactIdList(parentId, contactIdList); + List collect = contactList.stream().map(SafetyCenterSubitemContacts::getId).collect(Collectors.toList()); + contactsService.removeByIds(collect); + List projectIdList = contactList.stream().map(SafetyCenterSubitemContacts::getProjectId).distinct().collect(Collectors.toList()); + for (String projectId : projectIdList) { + deleteChildrenByParentId(projectId,contactIdList); + } + } } From ac2d762e5974342842d2f3854b0468c63e8e2150 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 2 Jul 2024 17:42:26 +0800 Subject: [PATCH 17/64] =?UTF-8?q?fix=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 4d64c455..7378ed20 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -65,7 +65,7 @@ public class SafetyCenterSubitemService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SafetyCenterSubitem::getProjectId,parentId); wrapper1.eq(SafetyCenterSubitem::getCompanyId,companyId); - SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper); + SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper1); if (parentCenterSubitem == null){ throw new JeroBootException("该成员单位无法添加到当前项目"); } @@ -123,7 +123,7 @@ public class SafetyCenterSubitemService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SafetyCenterSubitem::getProjectId,parentId); wrapper1.eq(SafetyCenterSubitem::getCompanyId,companyId); - SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper); + SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper1); if (parentCenterSubitem == null){ throw new JeroBootException("该成员单位无法添加到当前项目"); } From dd53b327ebae7b1c7b2162dd54d63466d5d657b2 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Jul 2024 09:45:57 +0800 Subject: [PATCH 18/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E4=BC=9A=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/meeting/common/MeetingCommon.java | 10 +- .../SafetyCenterMeetingController.java | 234 ++++++++++++++++++ ...afetyCenterMeetingSituationController.java | 233 +++++++++++++++++ .../service/impl/PayMeetingServiceImpl.java | 10 + .../vo/excel/SafetyCenterMeetingExcel.java | 91 +++++++ 5 files changed, 577 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingExcel.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java index 47f05919..22921b30 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/common/MeetingCommon.java @@ -69,9 +69,17 @@ public class MeetingCommon { */ public final static String OVERSEAS_MEETING = "8"; /** - * 起草组会议 + * 海外会议 */ public final static Integer OVERSEAS_MEETING_INT = 8; + /** + * 安全中心会议 + */ + public final static String SAFETY_CENTER_MEETING = "9"; + /** + * 安全中心会议 + */ + public final static Integer SAFETY_CENTER_MEETING_INT = 9; /** * 标准宣贯 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java new file mode 100644 index 00000000..e6e281c1 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingController.java @@ -0,0 +1,234 @@ +package com.jero.meeting.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.AuthenticationUtils; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.ValidUtil; +import com.jero.company.service.IPayContactsManagementService; +import com.jero.data.service.IPayCaseCommitteeService; +import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.entity.PayMeeting; +import com.jero.meeting.entity.PayMeetingHotelContacts; +import com.jero.meeting.service.IPayMeetingHotelContactsService; +import com.jero.meeting.service.IPayMeetingService; +import com.jero.meeting.vo.PayMeetingVO; +import com.jero.meeting.vo.PublishReminderVO; +import com.jero.meeting.vo.UploadFileVO; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.system.volid.group.UpdateGroup; +import com.jero.project.service.IPayWorkingGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + + +/** + * @description: 会议管理 + * @author: jero-boot + * @date: 2021-09-02 + * @version: V1.0 + */ +@Api(tags = "会议管理-功能安全中心会议") +@RestController +@RequestMapping("/meeting/safetyCenterMeeting") +@Slf4j +public class SafetyCenterMeetingController extends JeroController { + @Resource + private IPayMeetingService payMeetingService; + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private IPayMeetingHotelContactsService meetingHotelContactsService; + @Resource + private IPayWorkingGroupService payWorkingGroupService; + @Resource + private AuthenticationUtils authenticationUtils; + @Resource + private IOSSFileService iossFileService; + @Resource + private IPayCaseCommitteeService payCaseCommitteeService; + @Resource + private IPayContactsManagementService payContactsManagementService; + + private final Integer MEETING_TYPE = MeetingCommon.SAFETY_CENTER_MEETING_INT; + /** + * 分页列表查询 + */ + @RequiresPermissions("otherMeeting:search") + @ApiOperation(value = "会议管理-分页列表查询", notes = "会议管理-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(PayMeeting payMeeting, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + payMeeting.setMeetingType(MEETING_TYPE); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); + + return Result.OK(pageList); + } + + /** + * 添加 + */ + @RequiresPermissions("otherMeeting:add") + @AutoLog(value = "会议管理-添加") + @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayMeetingVO payMeetingVO) { + String meetingType = payMeetingVO.getMeetingType(); + if (!Objects.equals(meetingType, MeetingCommon.OTHER_MEETING)) { + throw new RuntimeException(); + } + ValidUtil.validate(payMeetingVO); + payMeetingService.add(payMeetingVO); + return Result.OK("添加成功！"); + } + + private void extracted(String id) { + PayMeeting payMeeting = payMeetingService.getById(id); + Integer meetingType = payMeeting.getMeetingType(); + if (!Objects.equals(meetingType, MEETING_TYPE)) { + throw new RuntimeException(); + } + } + + /** + * 编辑 + */ + @RequiresPermissions("otherMeeting:edit") + @AutoLog(value = "会议管理-编辑") + @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayMeetingVO payMeetingVO) { + String id = payMeetingVO.getId(); + extracted(id); + ValidUtil.validate(payMeetingVO, UpdateGroup.class); + payMeetingService.editById(payMeetingVO); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + */ + @RequiresPermissions("otherMeeting:delete") + @AutoLog(value = "会议管理-通过id删除") + @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name = "id") String id) { + extracted(id); + payMeetingService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ + @RequiresPermissions("otherMeeting:batchDel") + @AutoLog(value = "会议管理-批量删除") + @ApiOperation(value = "会议管理-批量删除", notes = "会议管理-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids") String ids) { + List idList = Arrays.asList(ids.split(",")); + for (String id : idList) { + extracted(id); + } + this.payMeetingService.deleteByIds(idList); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + */ + @ApiOperation(value = "会议管理-通过id查询", notes = "会议管理-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + PayMeeting meeting = payMeetingService.queryById(id); + if (meeting == null || !Objects.equals(meeting.getMeetingType(), MEETING_TYPE)) { + return Result.error("未找到对应数据"); + } + //查询会议负责人 + LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId()); + + meeting.setDirectorName(user.getRealname()); + meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone())); + PayMeetingVO payMeetingVO = new PayMeetingVO(); + BeanUtils.copyProperties(meeting, payMeetingVO); + String meetingType = meeting.getMeetingType().toString(); + //String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType); + payMeetingVO.setMeetingType(meetingType); + payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString()); + //payMeetingVO.setHotelContactsList(new ArrayList<>()); + //会议查询酒店联系人列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + payMeetingVO.setHotelContactsList(payMeetingHotelContactsList); + return Result.OK(payMeetingVO); + } + + /** + * 导出excel + */ + @RequiresPermissions("otherMeeting:export") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMeeting payMeeting) { + payMeeting.setMeetingType(MEETING_TYPE); + IPage queryPageList = payMeetingService.queryPageList(payMeeting, -1, -1, request); + + List exportList = payMeetingService.getExportList(request, queryPageList); + Class aClass = payMeetingService.getaClass(MEETING_TYPE); + return super.exportListXls(exportList, aClass, "会议管理"); + } + + /** + * 上传资料 + */ + @AutoLog(value = "上传资料") + @RequiresPermissions("otherMeeting:upload") + @ApiOperation(value = "上传资料", notes = "上传资料") + @PostMapping(value = "/uploadFile") + public Result uploadFile(@RequestBody UploadFileVO uploadFileVO) { + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MEETING_TYPE, false); + return Result.OK("上传资料成功!",strings); + } + + /** + * 上传会议纪要 + */ + @AutoLog(value = "上传会议纪要") + @RequiresPermissions("otherMeeting:uploadCouncil") + @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要") + @PostMapping(value = "/uploadCouncilFile") + public Result uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MEETING_TYPE); + return Result.OK("上传会议纪要成功!"); + } + + /** + * 发布 + */ + @AutoLog("发布") + @RequiresPermissions("otherMeeting:release") + @ApiOperation(value = "发布") + @PostMapping(value = "/release") + public Result release(@RequestBody PublishReminderVO publishReminderVO) { + payMeetingService.release(publishReminderVO); + return Result.OK(); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java new file mode 100644 index 00000000..789b3c83 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/SafetyCenterMeetingSituationController.java @@ -0,0 +1,233 @@ +package com.jero.meeting.controller; + +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.aspect.annotation.CompanyNameTranslate; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.DictPoint; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.AuthenticationUtils; +import com.jero.common.util.ValidUtil; +import com.jero.company.service.IPayCompanyManagementService; +import com.jero.company.service.IPayContactsManagementService; +import com.jero.meeting.common.MeetingCommon; +import com.jero.meeting.entity.PayMeetingSituation; +import com.jero.meeting.service.IPayMeetingSituationService; +import com.jero.meeting.vo.CheckVO; +import com.jero.meeting.vo.MergePayBillVO; +import com.jero.meeting.vo.PayMeetingSituationVO; +import com.jero.meeting.vo.SetGuestsUploadFileVO; +import com.jero.project.common.PayProjectCommon; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + + +/** + * @description: 参会人员信息 + * @author: jero-boot + * @date: 2021-09-02 + * @version: V1.0 + */ +@Api(tags = "参会人员信息-功能安全中心会议") +@RestController +@RequestMapping("/meeting/safetyCenterMeetingSituation") +@Slf4j +public class SafetyCenterMeetingSituationController extends JeroController { + @Resource + private IPayMeetingSituationService payMeetingSituationService; + @Resource + private AuthenticationUtils authenticationUtils; + @Resource + private IPayContactsManagementService contactsManagementService; + @Resource + private IPayCompanyManagementService companyManagementService; + + private final Integer MEETING_TYPE = MeetingCommon.SAFETY_CENTER_MEETING_INT; + /** + * 分页列表查询 + */ + @CompanyNameTranslate + @RequiresPermissions("otherMeetingSituation:search") + @ApiOperation(value = "参会人员信息-分页列表查询", notes = "参会人员信息-分页列表查询") + @GetMapping(value = "/page") + public Result queryPageList(PayMeetingSituation payMeetingSituation, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { + String meetingId = payMeetingSituation.getMeetingId(); + if (StringUtils.isBlank(meetingId)) { + throw new JeroBootException("会议id不能为空"); + } + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, req.getParameterMap()); + String particularYear = req.getParameter("particularYear"); + if (StringUtils.isNotBlank(particularYear)){ + queryWrapper.eq("DATE_FORMAT( ppr.payment_date, '%Y' )",particularYear); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payMeetingSituationService.pageListContract(meetingId, page, queryWrapper,MEETING_TYPE); + List situationList = pageList.getRecords(); + for (PayMeetingSituation meetingSituation : situationList) { + Integer payMode = meetingSituation.getPayMode(); + //汇款并且缴费凭证为空 + if (Objects.equals(payMode,1) && StringUtils.isBlank(meetingSituation.getPaymentRecord())){ + meetingSituation.setIdentification(PayProjectCommon.YES); + }else { + meetingSituation.setIdentification(PayProjectCommon.NO); + } + } + return Result.OK(pageList); + } + + /** + * 添加参会人 + */ + @RequiresPermissions("otherMeetingSituation:add") + @AutoLog(value = "参会人员信息-添加参会人") + @ApiOperation(value = "参会人员信息-添加参会人", notes = "参会人员信息-添加参会人") + @PostMapping(value = "/add") + public Result add(@RequestBody PayMeetingSituation payMeetingSituation) { + payMeetingSituationService.add(payMeetingSituation, MEETING_TYPE); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + */ + @AutoLog(value = "参会人员信息-编辑") + @RequiresPermissions("otherMeetingSituation:edit") + @ApiOperation(value = "参会人员信息-编辑", notes = "参会人员信息-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayMeetingSituationVO payMeetingSituationVO) { + payMeetingSituationService.editById(payMeetingSituationVO, MEETING_TYPE); + return Result.OK("编辑成功!"); + } + + /** + * 通过id删除 + */ + @RequiresPermissions("otherMeetingSituation:delete") + @AutoLog(value = "参会人员信息-通过id删除") + @ApiOperation(value = "参会人员信息-通过id删除", notes = "参会人员信息-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name = "id") String id) { + payMeetingSituationService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ + @RequiresPermissions("otherMeetingSituation:batchDel") + @AutoLog(value = "参会人员信息-批量删除") + @ApiOperation(value = "参会人员信息-批量删除", notes = "参会人员信息-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids") String ids) { + this.payMeetingSituationService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + */ + @CompanyNameTranslate + @DictPoint + @ApiOperation(value = "参会人员信息-通过id查询", notes = "参会人员信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id") String id) { + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryById(id); + if (payMeetingSituation == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMeetingSituation); + } + + /** + * 通过会议id查询自己的参会人信息 + */ + @CompanyNameTranslate + @DictPoint + @ApiOperation(value = "参会人员信息-通过会议id查询自己的参会人信息") + @GetMapping(value = "/queryByMeetingId") + public Result queryByMeetingId(@RequestParam(name = "meetingId") String meetingId) { + PayMeetingSituation payMeetingSituation = payMeetingSituationService.queryByMeetingIdAndContactId(meetingId); + if (payMeetingSituation == null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payMeetingSituation); + } + + /** + * 导出excel + */ + @RequiresPermissions("otherMeetingSituation:export") + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) { + List objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE); + Class aClass = payMeetingSituationService.getaClass(MEETING_TYPE); + return super.exportListXls(objects, aClass, "参会人员信息"); + } + + /** + * 审核缴费凭证 + */ + @RequiresPermissions("otherMeetingSituation:auditCredentials") + @AutoLog(value = "审核缴费凭证") + @ApiOperation(value = "审核缴费凭证") + @PostMapping(value = "/check") + public Result check(@RequestBody CheckVO checkVO) { + payMeetingSituationService.check(checkVO); + return Result.OK("审核成功!"); + } + + /** + * 审核报名信息 + */ + @AutoLog(value = "审核报名信息") + @RequiresPermissions("otherMeetingSituation:auditSignUp") + @ApiOperation(value = "审核报名信息") + @PostMapping(value = "/checkRegister") + public Result checkRegister(@RequestBody CheckVO checkVO) { + payMeetingSituationService.checkRegister(checkVO); + return Result.OK("审核成功!"); + } + + /** + * 合并开票 + */ + @AutoLog(value = "合并开票") + @ApiOperation(value = "合并开票", notes = "合并开票") + @PostMapping(value = "/batchPayBill") + public Result mergePayBill(@RequestBody MergePayBillVO mergePayBillVO) { + ValidUtil.validate(mergePayBillVO); + payMeetingSituationService.mergePayBill(mergePayBillVO); + return Result.OK("合并开票成功!"); + } + /** + * 设置嘉宾上传文件 + */ + @RequiresPermissions("otherMeetingSituation:guestsUploadFileFlag") + @AutoLog(value = "设置嘉宾上传文件") + @ApiOperation(value = "设置嘉宾上传文件", notes = "设置嘉宾上传文件") + @PostMapping(value = "/setGuestsUploadFile") + public Result setGuestsUploadFile(@RequestBody SetGuestsUploadFileVO setGuestsUploadFileVO) { + ValidUtil.validate(setGuestsUploadFileVO); + payMeetingSituationService.setGuestsUploadFile(setGuestsUploadFileVO,MEETING_TYPE); + return Result.OK("设置嘉宾上传文件成功!"); + } + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 10695eac..618b0681 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -1045,6 +1045,8 @@ public class PayMeetingServiceImpl extends ServiceImpl hotelContactsList; + /** + * 会议联系人列表 + */ + @ExcelCollection(name = "会议联系人列表") + private List meetingContactsList; + + /**备注*/ + @Excel(name = "备注", width = 15) + private String remark; +} From 493af2fee8cb26285f88eace6b442dd94d8051a5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Jul 2024 14:34:00 +0800 Subject: [PATCH 19/64] =?UTF-8?q?add=20=E4=BC=9A=E8=AE=AE=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 6 +++++- .../src/main/java/com/jero/meeting/entity/PayMeeting.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql index da2cefb6..0c312a69 100644 --- a/db/24年6月功能安全中心变更.sql +++ b/db/24年6月功能安全中心变更.sql @@ -60,4 +60,8 @@ alter table pay_functional_safety_center_subitem_contacts add primary key (id); insert into sys_dict_item (id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time, update_by, update_time) -values ('1803314563741982722', '1432280766382727169', '功能安全中心会议', '9', '', 9.00, 1, 'LKGLZ', '2024-06-19 14:31:11', 'LKGLZ', '2024-06-25 10:40:33'); \ No newline at end of file +values ('1803314563741982722', '1432280766382727169', '功能安全中心会议', '9', '', 9.00, 1, 'LKGLZ', '2024-06-19 14:31:11', 'LKGLZ', '2024-06-25 10:40:33'); + +alter table pay_meeting + add safety_center_id varchar(50) null comment '功能安全中心id'; + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java index 596644d6..b921fb9a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java @@ -119,6 +119,10 @@ public class PayMeeting implements Serializable { @ApiModelProperty(value = "理事会名称") private String councilName; + /**安全中心项目id*/ + @ApiModelProperty(value = "安全中心项目id") + private String safetyCenterId; + /**开始时间*/ @Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") From d9abbcd8942f2990a59d15613a8d25b22f97434c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Wed, 3 Jul 2024 14:54:58 +0800 Subject: [PATCH 20/64] =?UTF-8?q?fix=20=E5=AE=89=E5=85=A8=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/company/mapper/xml/PayContactsManagementMapper.xml | 2 +- .../service/SafetyCenterSubitemService.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml index 932ac8a7..434d78a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayContactsManagementMapper.xml @@ -71,7 +71,7 @@ + select * + from pay_functional_safety_center pfsc + left join pay_functional_safety_center_subitem pfscs on pfsc.id = pfscs.project_id + left join pay_functional_safety_center_subitem_contacts pfscsc on pfscs.id = pfscsc.subitem_id + + + + pfsc.project_type = 3 + + + and pfsc.project_type in (1,2) + + + + and pfsc.parent_id = #{safetyCenter.parentId} + + + + and pfsc.project_name like #{likeSafetyCenter.projectName} + + and pfscsc.contacts_id = #{userId} + + order by pfsc.create_time desc + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java index a70bea4e..8a357fa0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterService.java @@ -1,8 +1,14 @@ package com.jero.functionalsafetycenter.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.api.ISysBaseAPI; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; import com.jero.functionalsafetycenter.common.SafetyCenterCommon; import com.jero.functionalsafetycenter.vo.SafetyCenterEditVO; +import org.apache.shiro.SecurityUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -10,6 +16,9 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.mapper.SafetyCenterMapper; + +import javax.annotation.Resource; + /** * *@author liJiaRao @@ -17,6 +26,8 @@ import com.jero.functionalsafetycenter.mapper.SafetyCenterMapper; */ @Service public class SafetyCenterService extends ServiceImpl { + @Resource + private ISysBaseAPI sysBaseAPI; public void add(SafetyCenter safetyCenter) { Integer projectType = safetyCenter.getProjectType(); if (projectType == null){ @@ -49,4 +60,17 @@ public class SafetyCenterService extends ServiceImpl queryCompanyPageList(Page page, SafetyCenter safetyCenter) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + IPage safetyCenterIPage = baseMapper.queryCompanyPageList(page, safetyCenter, sysUser.getId()); + List records = safetyCenterIPage.getRecords(); + for (SafetyCenter record : records) { + String principalId = record.getPrincipalId(); + LoginUser user = sysBaseAPI.getUserById(principalId); + record.setPrincipalPhone(PasswordUtil.decrypt(user.getPhone())); + record.setPrincipalEmail(PasswordUtil.decrypt(user.getEmail())); + } + return safetyCenterIPage; + } } From 429e7d293350c26fb58698c814a001d0c4428337 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 4 Jul 2024 17:20:35 +0800 Subject: [PATCH 27/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=AB=AF-=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemController.java | 24 ++++++++++++++++++- .../service/SafetyCenterSubitemService.java | 20 ++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 24f8108e..b640933e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.IdsMapBody; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; -import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; @@ -96,6 +96,28 @@ public class SafetyCenterSubitemController extends JeroController getItemByProjectId(@RequestParam(name = "projectId") String projectId) { + SafetyCenterSubitem subitem = safetyCenterSubitemService.getItemByProjectId(projectId); + return Result.OK(subitem); + } + /** + * 编辑 + */ + @AutoLog(value = "功能安全中心成员-企业端-编辑") + @ApiOperation(value = "功能安全中心成员-企业端-编辑") + @PostMapping(value = "/editByCompany") + public Result editByCompany(@Validated @RequestBody SafetyCenterSubitem safetyCenterSubitem) { + safetyCenterSubitemService.editById(safetyCenterSubitem); + return Result.OK(Result.EDIT_SUCCESS); + } + /** * 通过id删除 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 87791071..074b49b2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.LoginUser; import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; @@ -15,6 +16,7 @@ import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemContactsImport; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -353,4 +355,22 @@ public class SafetyCenterSubitemService extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitem::getProjectId,projectId); + wrapper1.eq(SafetyCenterSubitem::getCompanyId,sysUser.getCompanyId()); + SafetyCenterSubitem subitem = this.getOne(wrapper1); + //根据企业id获取所有联系人 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitem.getId()); + //根据orderNum排序 + wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum); + List contactsList = contactsService.list(wrapper); + //存入数据 + subitem.setContactsId(contactsList.get(0).getContactsId()); + subitem.setContactsList(contactsList); + return subitem; + } } From c29aa3f280b504b56420799ad1485f2cba0083e9 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 4 Jul 2024 17:51:40 +0800 Subject: [PATCH 28/64] =?UTF-8?q?add=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98-=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=8F=90=E9=86=92=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemController.java | 34 +++++++++++++++++++ .../entity/SafetyCenterSubitem.java | 19 +++++++++++ .../mapper/SafetyCenterSubitemMapper.java | 3 ++ .../mapper/xml/SafetyCenterSubitemMapper.xml | 28 +++++++++++++++ .../service/SafetyCenterSubitemService.java | 5 +++ 5 files changed, 89 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index b640933e..43bb5cf6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -10,13 +10,20 @@ import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oConvertUtils; +import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.functionalsafetycenter.service.SafetyCenterService; import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroupSubItem; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -27,6 +34,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Objects; /** * 功能安全中心成员(pay_functional_safety_center_subitem)表控制层 @@ -44,6 +52,9 @@ public class SafetyCenterSubitemController extends JeroController publishReminderList(SafetyCenterSubitem safetyCenterSubitem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + if (StringUtils.isBlank(safetyCenterSubitem.getProjectId())) { + return Result.error("功能安全中心id不能为空！"); + } + if(!StringUtils.isBlank(safetyCenterSubitem.getCompanyName())){ + safetyCenterSubitem.setCompanyName(oConvertUtils.replaceAllPercent(safetyCenterSubitem.getCompanyName())); + } + SafetyCenter safetyCenter = safetyCenterService.getById(safetyCenterSubitem.getProjectId()); + if(Objects.isNull(safetyCenter)){ + return Result.error("功能安全中心！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = safetyCenterSubitemService.publishReminderList(page, safetyCenterSubitem); + return Result.OK(pageList); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index c0c44cb1..c65e5444 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -60,6 +60,11 @@ public class SafetyCenterSubitem { @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String contactsId; + /**企业联系人姓名*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人姓名") + private String contactsName; + /**企业联系人列表*/ @TableField(exist = false) @ApiModelProperty(value = "企业联系人列表") @@ -101,4 +106,18 @@ public class SafetyCenterSubitem { @TableField(value = "update_time") @ApiModelProperty(value = "更新时间") private Date updateTime; + + /**已提醒*/ + @TableField(exist = false) + @Dict(dicCode = "yn") + private Integer remind; + + /**邮件提醒*/ + @TableField(exist = false) + @Dict(dicCode = "yn") + private Integer mailRemind; + + /**会议id*/ + @TableField(exist = false) + private String meetingId; } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java index 8617b415..793853e4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/SafetyCenterSubitemMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.project.entity.PayWorkingGroupSubItem; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +17,6 @@ public interface SafetyCenterSubitemMapper extends BaseMapper pageList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); List listByParentIdAndCompanyId(@Param("parentId") String parentId, @Param("companyId") String companyId); + + IPage publishReminderList(Page page, @Param("safetyCenterSubitem") SafetyCenterSubitem safetyCenterSubitem); } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml index c02750bf..07e49ad1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterSubitemMapper.xml @@ -40,4 +40,32 @@ and pfscs.company_id = #{companyId} + + \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 074b49b2..88628ac8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -15,6 +15,7 @@ import com.jero.functionalsafetycenter.entity.SafetyCenter; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemContactsImport; import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; +import com.jero.project.entity.PayWorkingGroupSubItem; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.springframework.stereotype.Service; @@ -373,4 +374,8 @@ public class SafetyCenterSubitemService extends ServiceImpl publishReminderList(Page page, SafetyCenterSubitem safetyCenterSubitem) { + return baseMapper.publishReminderList(page,safetyCenterSubitem); + } } From 8f9c8e46d12f5bc06dd2b95ba9301bd59b2e3b2a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 4 Jul 2024 18:00:06 +0800 Subject: [PATCH 29/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E5=85=B6=E4=BB=96=E8=B5=84?= =?UTF-8?q?=E6=96=99=E5=88=86=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/project/common/PayProjectCommon.java | 4 ++ .../PayWorkingGroupDataFileController.java | 16 ++---- .../jero/project/enums/ProjectTypeEnum.java | 53 +++++++++++++++++++ 3 files changed, 61 insertions(+), 12 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/project/enums/ProjectTypeEnum.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java index ce7ab5f8..bc777d53 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/common/PayProjectCommon.java @@ -113,6 +113,10 @@ public class PayProjectCommon { * 项目类型1:工作组，2：分标委, 3:理事会, 4：起草组 */ public final static Integer PROJECT_TYPE_FILE4 = 4; + /** + * 5功能安全中心 + */ + public final static Integer PROJECT_TYPE_FILE5 = 5; /** * 需要发票（1：增值税普通发票，2：增值税专用发票，0：否，3：需要发票（小程序需要）） */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java index 9714c766..de0951b1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDataFileController.java @@ -18,6 +18,7 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.PayWorkingGroup; import com.jero.project.entity.PayWorkingGroupDataFile; +import com.jero.project.enums.ProjectTypeEnum; import com.jero.project.service.IPayWorkingGroupDataFileService; import com.jero.project.service.IPayWorkingGroupService; import io.swagger.annotations.Api; @@ -86,10 +87,7 @@ public class PayWorkingGroupDataFileController extends JeroController Date: Thu, 4 Jul 2024 18:03:52 +0800 Subject: [PATCH 30/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E6=9F=A5=E8=AF=A2=E6=88=90?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 88628ac8..03c1cb15 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -225,6 +225,9 @@ public class SafetyCenterSubitemService extends ServiceImpl records = pageList.getRecords(); //根据企业id获取所有联系人 List subitemIdList = records.stream().map(SafetyCenterSubitem::getId).collect(Collectors.toList()); + if (subitemIdList.isEmpty()){ + return pageList; + } LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.in(SafetyCenterSubitemContacts::getSubitemId,subitemIdList); wrapper.orderByAsc(SafetyCenterSubitemContacts::getSubitemId); From 904319211bf9c9b1eafb0585e4c1efabd20785df Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Jul 2024 09:22:21 +0800 Subject: [PATCH 31/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E5=8F=91=E5=B8=83=E6=8F=90?= =?UTF-8?q?=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PayMeetingServiceImpl.java | 33 +++++++++++++++++++ .../jero/meeting/vo/PublishReminderVO.java | 2 ++ 2 files changed, 35 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 618b0681..5917c61a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -41,6 +41,10 @@ import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.service.SafetyCenterService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.common.MeetingSubitemCommon; import com.jero.meeting.entity.*; @@ -149,6 +153,10 @@ public class PayMeetingServiceImpl extends ServiceImpl contactsIdList = new ArrayList<>(); String workingGroupId = null; String draftingGroupId = null; + String safetyCenterId = null; //工作组项目直接是人 if (Objects.equals(projectType, 1)) { //把单位会员中所有的联系人取出 @@ -784,6 +793,23 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitemContacts::getProjectId, safetyCenterId); + wrapper1.in(SafetyCenterSubitemContacts::getContactsId,subitemIds); + List groupSubItemContactsList = safetyCenterSubitemContactsService.list(wrapper1); + for (SafetyCenterSubitemContacts payDraftingGroupSubItemContacts : groupSubItemContactsList) { + String subitemId = payDraftingGroupSubItemContacts.getSubitemId(); + String contactsId = payDraftingGroupSubItemContacts.getContactsId(); + contactsIdList.add(contactsId); + meetingRemindRecordList.add( + new PayMeetingRemindRecord() + .setSubitemId(subitemId) + .setContactId(contactsId) + ); + } } else { throw new JeroBootException("项目类型不正确"); } @@ -815,6 +841,13 @@ public class PayMeetingServiceImpl extends ServiceImpl Date: Fri, 5 Jul 2024 09:59:46 +0800 Subject: [PATCH 32/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=8A=A5=E5=90=8D=20=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemContactsService.java | 7 +++++++ .../impl/PayMeetingSituationServiceImpl.java | 20 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index 41fd66e3..fd158e09 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -32,4 +32,11 @@ public class SafetyCenterSubitemContactsService extends ServiceImpl listByParentIdAndContactIdList(String parentId, List contactIdList){ return baseMapper.listByParentIdAndContactIdList(parentId,contactIdList); } + + public boolean checkSafetyCenterSubitem(String projectId, String contactsId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getProjectId,projectId); + wrapper.eq(SafetyCenterSubitemContacts::getContactsId,contactsId); + return count(wrapper) > 0; + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index e2016d3c..2548a577 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -49,6 +49,7 @@ import com.jero.data.service.IPayCaseCouncilService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.mail.entity.PayMailBill; import com.jero.mail.service.IPayMailBillService; import com.jero.meeting.common.MeetingCommon; @@ -170,6 +171,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Fri, 5 Jul 2024 10:42:24 +0800 Subject: [PATCH 33/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E4=BC=81=E4=B8=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BC=96=E8=BE=91=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 03c1cb15..6cbfbaad 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -123,10 +123,17 @@ public class SafetyCenterSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.ne(SafetyCenterSubitem::getId,subitemId); wrapper.eq(SafetyCenterSubitem::getProjectId,projectId); From 285e58987eb0ac429efd4b0027f09a1abc16961f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Jul 2024 11:33:49 +0800 Subject: [PATCH 34/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E8=B5=84=E6=96=99=E5=88=86?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SafetyCenterSubitemContacts.java | 12 +++ .../SafetyCenterSubitemContactsService.java | 32 +++++++ ...kingGroupDistributionRecordController.java | 22 +++-- ...ingGroupDistributionRecordServiceImpl.java | 88 +++++++++++++++++++ 4 files changed, 149 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java index 34b4a2cb..549f86b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitemContacts.java @@ -46,6 +46,12 @@ public class SafetyCenterSubitemContacts { @TableField(value = "company_id") @ApiModelProperty(value="成员单位id") private String companyId; + /** + * 成员单位名称 + */ + @TableField(exist = false) + @ApiModelProperty(value="成员单位名称") + private String companyName; /** * 企业联系人id @@ -54,6 +60,12 @@ public class SafetyCenterSubitemContacts { @ApiModelProperty(value="企业联系人id") @Excel(name = "企业联系人",dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") private String contactsId; + /** + * 企业联系人姓名 + */ + @TableField(exist = false) + @ApiModelProperty(value="企业联系人姓名") + private String contactsName; /** * 备注 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java index fd158e09..6a8e12f7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemContactsService.java @@ -1,12 +1,18 @@ package com.jero.functionalsafetycenter.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.company.controller.PayContactsManagementController; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayContactsManagementService; +import com.jero.temporary.entity.PayContactsManagementTemporary; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; import com.jero.functionalsafetycenter.mapper.SafetyCenterSubitemContactsMapper; +import javax.annotation.Resource; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -16,6 +22,9 @@ import java.util.stream.Collectors; */ @Service public class SafetyCenterSubitemContactsService extends ServiceImpl { + @Resource + private IPayContactsManagementService contactsManagementService; + public void deleteBySubitemId(String subitemId){ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(SafetyCenterSubitemContacts::getSubitemId,subitemId); @@ -39,4 +48,27 @@ public class SafetyCenterSubitemContactsService extends ServiceImpl 0; } + + public List getContactsInfo(String projectId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getProjectId,projectId); + wrapper.orderByDesc(SafetyCenterSubitemContacts::getSubitemId); + wrapper.orderByAsc(SafetyCenterSubitemContacts::getOrderNum); + List contactsList = this.list(wrapper); + if (contactsList.isEmpty()){ + return contactsList; + } + List contactsIdList = contactsList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + List payContactsManagements = contactsManagementService.listByIds(contactsIdList); + Map collectMap = payContactsManagements.stream().collect(Collectors.toMap(PayContactsManagement::getId, payContactsManagement -> payContactsManagement)); + + for (SafetyCenterSubitemContacts contacts : contactsList) { + String contactsId = contacts.getContactsId(); + PayContactsManagement payContactsManagement = collectMap.get(contactsId); + contacts.setContactsName(payContactsManagement.getName()); + contacts.setCompanyName(payContactsManagement.getCompanyName()); + } + + return contactsList; + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java index a79c52a7..9100be83 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupDistributionRecordController.java @@ -19,12 +19,15 @@ import com.jero.data.service.IPayCaseCommitteeSubitemService; import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; import com.jero.project.entity.DownloadFileRecord; import com.jero.project.entity.PayWorkingGroupDistributionRecord; import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.enums.ProjectTypeEnum; import com.jero.project.service.IPayWorkingGroupDistributionRecordService; import com.jero.project.service.IPayWorkingGroupSubItemContactsService; import com.jero.project.service.IPayWorkingGroupSubItemService; @@ -70,6 +73,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService; @Resource private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; + @Resource + private SafetyCenterSubitemContactsService safetyCenterSubitemContactsService; @Resource private IOSSFileService iossFileService; @@ -209,10 +214,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< if(StringUtils.isBlank(projectId)){ throw new JeroBootException("项目id不能为空!"); } - if(!Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1) - && !Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2) - && !Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE3) - && !Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){ + if(!ProjectTypeEnum.hasValue(projectType)){ return Result.error("项目状态不正确！"); } List listData = new ArrayList<>(); @@ -267,7 +269,17 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< listData.add(payContactsManagement); }); } - + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE5)){ + List list = safetyCenterSubitemContactsService.getContactsInfo(projectId); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + PayContactsManagement payContactsManagement = new PayContactsManagement(); + payContactsManagement.setId(p.getContactsId()); + payContactsManagement.setName(p.getContactsName()); + payContactsManagement.setCompanyName(p.getCompanyName()); + listData.add(payContactsManagement); + }); + } }else { throw new JeroBootException("项目状态不正确！"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index edaf7bf3..3a1d26b7 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -30,6 +30,10 @@ import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.entity.SafetyCenter; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.service.SafetyCenterService; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -41,6 +45,7 @@ import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -97,6 +102,10 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PayContactsManagement::getId, Arrays.asList(s)); + List listContacts = payContactsManagementService.list(wrapper); + List listContactsTemporary = new ArrayList<>(); + for (PayContactsManagement contactsManagement : listContacts) { + PayContactsManagementTemporary temporary = new PayContactsManagementTemporary(); + BeanUtils.copyProperties(contactsManagement,temporary); + listContactsTemporary.add(temporary); + } + if(!CollectionUtils.isEmpty(listContactsTemporary)){ + list = listContactsTemporary; + } + msg = safetyCenter.getProjectName(); }else{ throw new JeroBootException("项目状态不正确！"); } @@ -484,6 +517,40 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ + OSSFile byId = iossFileService.getById(p.getFileId()); + if(Objects.isNull(byId)){ + throw new JeroBootException("没有找到文件!"); + } + // 文件路径 + String url = byId.getUrl(); + listFile.add(path + url); + payWorkingGroupDistributionRecord.setDataId(p.getId()); + setRecordByDrafting( payWorkingGroupDistributionRecord,s,listPayWorkingGroupDistributionRecord, byId); + }); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(PayContactsManagement::getId, Arrays.asList(s)); + List listContacts = payContactsManagementService.list(wrapper); + List listContactsTemporary = new ArrayList<>(); + for (PayContactsManagement contactsManagement : listContacts) { + PayContactsManagementTemporary temporary = new PayContactsManagementTemporary(); + BeanUtils.copyProperties(contactsManagement,temporary); + listContactsTemporary.add(temporary); + } + if(!CollectionUtils.isEmpty(listContactsTemporary)){ + list = listContactsTemporary; + } + msg = safetyCenter.getProjectName(); }else { throw new JeroBootException("项目状态不正确！"); } @@ -595,4 +662,25 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listPayWorkingGroupDistributionRecord,OSSFile byId){ + // 查询工作组成员 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitemContacts::getProjectId,payWorkingGroupDistributionRecord.getProjectId()); + wrapper.in(SafetyCenterSubitemContacts::getContactsId,Arrays.asList(s)); + List list = safetyCenterSubitemContactsService.list(wrapper); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); + payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); + payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); + payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); + payWorkingGroupDistributionRecordNew.setSubId(p.getSubitemId()); + payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); + //payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryName()); + //payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryId()); + listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); + }); + } + } } From aaf67e8d0cc62de6878e551a04e8353f83df8e2a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Jul 2024 13:42:34 +0800 Subject: [PATCH 35/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E4=BC=9A=E8=AE=AE=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/meeting/service/impl/PayMeetingServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index 5917c61a..52330481 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -794,11 +794,10 @@ public class PayMeetingServiceImpl extends ServiceImpl wrapper1 = new LambdaQueryWrapper<>(); wrapper1.eq(SafetyCenterSubitemContacts::getProjectId, safetyCenterId); - wrapper1.in(SafetyCenterSubitemContacts::getContactsId,subitemIds); + wrapper1.in(SafetyCenterSubitemContacts::getId,subitemIds); List groupSubItemContactsList = safetyCenterSubitemContactsService.list(wrapper1); for (SafetyCenterSubitemContacts payDraftingGroupSubItemContacts : groupSubItemContactsList) { String subitemId = payDraftingGroupSubItemContacts.getSubitemId(); From 891adffdef204cc893e0eb5c018c935872013d3e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 5 Jul 2024 14:56:21 +0800 Subject: [PATCH 36/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=20=E4=BC=81=E4=B8=9A=E7=AB=AF=20?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/common/ProjectCommon.java | 4 ++ .../common/mapper/xml/ProjectDetailMapper.xml | 45 +++++++++++++++++++ .../PayCommonProjectController.java | 22 +++++++++ 3 files changed, 71 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java index eed57f05..a6070c3d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/common/ProjectCommon.java @@ -41,6 +41,10 @@ public class ProjectCommon { * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,7: 起草组项目） */ public final static String PROJECT_TYPE7 = "7"; + /** + * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,7: 起草组项目,8: 功能安全中心项目） + */ + public final static String PROJECT_TYPE8 = "8"; /** * 来源（1:收入合同,2:打包管理） */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml index 094bae6c..385f6e80 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/mapper/xml/ProjectDetailMapper.xml @@ -133,6 +133,51 @@ AND ppc.id = #{projectId} + + UNION ALL + SELECT + g.id, + g.project_name, + '', + g.principal_id, + su.realname, + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + g.create_time, + 9, + '', + '', + g.remarks, + '', + '', + '', + '', + '', + '', + '', + '', + g.mission_and_objectives, + '', + '', + '', + '' + FROM + pay_functional_safety_center g + LEFT JOIN + sys_user su ON g.principal_id = su.id + + + AND g.id = #{projectId} + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java index 6cb9e1ae..8150e773 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java @@ -25,6 +25,8 @@ import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitemContacts; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemContactsService; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; @@ -55,6 +57,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -98,6 +101,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; @Resource private ITbMemberProjectSubitemService tbMemberProjectSubitemService; + @Resource + private SafetyCenterSubitemContactsService safetyCenterSubitemContactsService; @Override public ProjectDetailVO getProjectDetail(String projectId) { @@ -216,9 +221,10 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { if(!Objects.isNull(payCommonProject.getPack())){ projectDetailVO.setPack_dictText(sysBaseAPI.translateDict("yn",String.valueOf(payCommonProject.getPack()))); } - // 标协会员和会议，直接查询企业，联系人 + // 标协会员和会议，直接查询企业，联系人 加功能安全中心 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5) - || Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE3)){ + || Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE3) + || Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){ PayCompanyManagement payCompanyManagement = payCompanyManagementService.getById(payCommonProject.getChargeCompanyTemporaryId()); if(Objects.isNull(payCompanyManagement)){ throw new JeroBootException("企业不存在！"); @@ -236,25 +242,50 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setPostalCodeCompany(payCompanyManagement.getPostalCode()); projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress()); projectDetailVO.setLinkBankNumber(payCompanyManagement.getLinkBankNumber()); - PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId()); - if(Objects.isNull(payContactsManagement)){ - throw new JeroBootException("联系人不存在！"); + //功能安全中心添加企业联系人 + if (Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){ + List subitemContacts = safetyCenterSubitemContactsService.listBySubitemId(projectId); + List listPayWorkingGroupSubItemContacts = new ArrayList<>(); + for (SafetyCenterSubitemContacts subitemContact : subitemContacts) { + PayContactsManagement contactsManagement = payContactsManagementService.getById(subitemContact.getContactsId()); + PayWorkingGroupSubItemContacts p = new PayWorkingGroupSubItemContacts(); + p.setContactsTemporaryName(contactsManagement.getName()); + p.setGender(contactsManagement.getGender()); + if(!Objects.isNull(contactsManagement.getGender())){ + p.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(contactsManagement.getGender()))); + } + p.setPost(contactsManagement.getPost()); + if(!StringUtils.isBlank(contactsManagement.getPhone())){ + p.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone())); + } + if(!StringUtils.isBlank(contactsManagement.getEmail())){ + p.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail())); + } + p.setPostalCodeContacts(contactsManagement.getPostalCode()); + p.setContactAddress(contactsManagement.getContactAddress()); + listPayWorkingGroupSubItemContacts.add(p); + } + projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); + }else { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId()); + if(Objects.isNull(payContactsManagement)){ + throw new JeroBootException("联系人不存在！"); + } + projectDetailVO.setName(payContactsManagement.getName()); + projectDetailVO.setGender(payContactsManagement.getGender()); + if(!Objects.isNull(payContactsManagement.getGender())){ + projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagement.getGender()))); + } + projectDetailVO.setPost(payContactsManagement.getPost()); + if(!StringUtils.isBlank(payContactsManagement.getPhone())){ + projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); + } + if(!StringUtils.isBlank(payContactsManagement.getEmail())){ + projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); + } + projectDetailVO.setPostalCodeContacts(payContactsManagement.getPostalCode()); + projectDetailVO.setContactAddress(payContactsManagement.getContactAddress()); } - projectDetailVO.setName(payContactsManagement.getName()); - projectDetailVO.setGender(payContactsManagement.getGender()); - if(!Objects.isNull(payContactsManagement.getGender())){ - projectDetailVO.setGender_dictText(sysBaseAPI.translateDict("sex",String.valueOf(payContactsManagement.getGender()))); - } - projectDetailVO.setPost(payContactsManagement.getPost()); - if(!StringUtils.isBlank(payContactsManagement.getPhone())){ - projectDetailVO.setPhone(PasswordUtil.decrypt(payContactsManagement.getPhone())); - } - if(!StringUtils.isBlank(payContactsManagement.getEmail())){ - projectDetailVO.setEmail(PasswordUtil.decrypt(payContactsManagement.getEmail())); - } - projectDetailVO.setPostalCodeContacts(payContactsManagement.getPostalCode()); - projectDetailVO.setContactAddress(payContactsManagement.getContactAddress()); - }else{ PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyTemporaryId()); if(Objects.isNull(payCompanyManagementTemporary)){ From 939446f9a7de0027c608578809438974826ab0f5 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 8 Jul 2024 13:41:36 +0800 Subject: [PATCH 44/64] =?UTF-8?q?fix=2086912=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E5=8B=BE=E9=80=89=E5=90=8E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8D=B4=E5=AF=BC=E5=87=BA=E4=BA=86=E6=89=80=E6=9C=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyCenterSubitemController.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index ee7120e9..9da47bfd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 功能安全中心成员(pay_functional_safety_center_subitem)表控制层 @@ -200,8 +201,20 @@ public class SafetyCenterSubitemController extends JeroController page = new Page<>(-1, -1); IPage pageList = safetyCenterSubitemService.pageList(page, safetyCenterSubitem); - List list = pageList.getRecords(); - return super.exportListXls(list, SafetyCenterSubitem.class, "功能安全中心成员"); + List records = pageList.getRecords(); + List exportList; + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = records.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + }else { + exportList = records; + } + if (exportList.isEmpty()) { + throw new JeroBootException("没有数据"); + } + return super.exportListXls(exportList, SafetyCenterSubitem.class, "功能安全中心成员"); } /** From 1691149bedbf75fa638942b93927c0636140c928 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 8 Jul 2024 13:57:07 +0800 Subject: [PATCH 45/64] =?UTF-8?q?fix=2086933=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E5=AF=BC=E5=87=BA=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayMeetingSituationServiceImpl.java | 16 +++++ .../SafetyCenterMeetingSituationExcel.java | 70 +++++++++++++++++++ 2 files changed, 86 insertions(+) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/excel/SafetyCenterMeetingSituationExcel.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 2548a577..31fa3394 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1804,6 +1804,18 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl Date: Mon, 8 Jul 2024 14:01:54 +0800 Subject: [PATCH 46/64] =?UTF-8?q?fix=2086914=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E5=AF=BC=E5=85=A5-=E4=BC=81=E4=B8=9A=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E4=B8=8D=E4=B8=BA=E7=A9=BA=E5=8D=B4=E6=8A=A5?= =?UTF-8?q?=E4=BA=86=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 697dc3f8..412bdb5a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -356,6 +356,9 @@ public class SafetyCenterSubitemService extends ServiceImpl Date: Mon, 8 Jul 2024 14:11:24 +0800 Subject: [PATCH 47/64] =?UTF-8?q?fix=2086915=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E5=AF=BC=E5=85=A5-=E6=8C=89=E4=BB=A5=E4=B8=8B?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterSubitemController.java | 2 +- .../service/SafetyCenterSubitemService.java | 1 + .../functionalsafetycenter/vo/SafetyCenterSubitemImport.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 9da47bfd..3de1a93b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -246,7 +246,7 @@ public class SafetyCenterSubitemController extends JeroController Date: Mon, 8 Jul 2024 14:37:09 +0800 Subject: [PATCH 48/64] =?UTF-8?q?fix=2086923=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99--=E6=89=B9=E9=87=8F=E5=88=86=E5=8F=91=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=94=B6=E5=88=B0=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ingGroupDistributionRecordServiceImpl.java | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 3a1d26b7..43bab30e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -139,9 +139,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); String msg = ""; + String projectId = payWorkingGroupDistributionRecord.getProjectId(); + Integer projectType = payWorkingGroupDistributionRecord.getProjectType(); List listPayWorkingGroupDistributionRecord = new ArrayList<>(); - if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ - PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); + if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1)){ + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(projectId); if(Objects.isNull(payWorkingGroup)){ throw new JeroBootException("工作组不存在!"); } @@ -159,7 +161,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -169,15 +171,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); - queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId()); + queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId, projectId); queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s)); List listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem); if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){ listPayCaseCommitteeSubitem.forEach(p->{ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setProjectId(projectId); + payWorkingGroupDistributionRecordNew.setProjectType(projectType); payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); @@ -186,12 +188,12 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -201,15 +203,15 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId()); + queryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, projectId); queryWrapper.in(PayCaseCouncilSubitem::getContactsId,Arrays.asList(s)); List payCaseCouncilSubitems = payCaseCouncilSubitemService.list(queryWrapper); if(!CollectionUtils.isEmpty(payCaseCouncilSubitems)){ payCaseCouncilSubitems.forEach(p->{ PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord(); payWorkingGroupDistributionRecordNew.setDataId(payWorkingGroupDistributionRecord.getDataId()); - payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId()); - payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType()); + payWorkingGroupDistributionRecordNew.setProjectId(projectId); + payWorkingGroupDistributionRecordNew.setProjectType(projectType); payWorkingGroupDistributionRecordNew.setFileId(byId.getId()); payWorkingGroupDistributionRecordNew.setSubId(p.getId()); payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); @@ -217,13 +219,13 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ? + Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1) ? Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ continue; } json.put("id",listStr.get(0).getSubId()); - }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2)){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2)){ List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE2) ? + Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2) ? Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ continue; } json.put("id",listStr.get(0).getProjectId()); - }else if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4)){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){ List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ? + Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4) ? Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ @@ -536,7 +538,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayContactsManagement::getId, Arrays.asList(s)); From 9ddcdc1455e064405b5d750bb39cb71ac48a424f Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 8 Jul 2024 15:06:36 +0800 Subject: [PATCH 49/64] =?UTF-8?q?fix=2086927=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E5=8F=91=E5=B8=83=E9=A1=B5=E9=9D=A2-=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterSubitemController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java index 3de1a93b..532f9091 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterSubitemController.java @@ -257,12 +257,14 @@ public class SafetyCenterSubitemController extends JeroController publishReminderList(SafetyCenterSubitem safetyCenterSubitem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest request) { if (StringUtils.isBlank(safetyCenterSubitem.getProjectId())) { return Result.error("功能安全中心id不能为空！"); } - if(!StringUtils.isBlank(safetyCenterSubitem.getCompanyName())){ - safetyCenterSubitem.setCompanyName(oConvertUtils.replaceAllPercent(safetyCenterSubitem.getCompanyName())); + String chargeCompanyTemporaryName = request.getParameter("chargeCompanyTemporaryName"); + if(StringUtils.isNotBlank(chargeCompanyTemporaryName)){ + safetyCenterSubitem.setCompanyName(oConvertUtils.replaceAllPercent(chargeCompanyTemporaryName)); } SafetyCenter safetyCenter = safetyCenterService.getById(safetyCenterSubitem.getProjectId()); if(Objects.isNull(safetyCenter)){ From 8564e3a5236fada55d3cc2f0d1dc00229149ac5a Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 09:52:57 +0800 Subject: [PATCH 50/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 42 +++++++++++++++++-- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 350c4c07..2ce912df 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -309,9 +309,7 @@ public class SafetyCenterSubitemService extends ServiceImpl contactsList = subitemImport.getContactsList(); - if (errorRowNum != 4){ - errorRowNum += contactsList.size() -1; - } + PayCompanyManagement company = null; if (StringUtils.isBlank(companyName)){ errorMessage.add("第" + errorRowNum + "行：成员单位不能为空"); @@ -332,6 +330,35 @@ public class SafetyCenterSubitemService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SafetyCenterSubitem::getProjectId,projectId); + wrapper.eq(SafetyCenterSubitem::getCompanyId,companyId); + if (this.count(wrapper) > 0){ + errorMessage.add("第" + errorRowNum + "行：成员单位当前项目中已经存在"); + errorRowNum2 += contactsList.size(); + continue; + } + + Integer projectType = safetyCenter.getProjectType(); + List parentContactIdList = new ArrayList<>(); + if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) { + //判断企业 + String parentId = safetyCenter.getParentId(); + LambdaQueryWrapper wrapper1 = new LambdaQueryWrapper<>(); + wrapper1.eq(SafetyCenterSubitem::getProjectId, parentId); + wrapper1.eq(SafetyCenterSubitem::getCompanyId, companyId); + SafetyCenterSubitem parentCenterSubitem = this.getOne(wrapper1); + if (parentCenterSubitem == null) { + errorMessage.add("第" + errorRowNum + "行：成员单位不是当前项目成员"); + errorRowNum2 += contactsList.size(); + continue; + } + String parentCenterSubitemId = parentCenterSubitem.getId(); + List parentContactList = contactsService.listBySubitemId(parentCenterSubitemId); + parentContactIdList = parentContactList.stream().map(SafetyCenterSubitemContacts::getContactsId).distinct().collect(Collectors.toList()); + } + errorRowNum += contactsList.size() -1; + List distinctContactsList = new ArrayList<>(); List subitemContactsList = new ArrayList<>(); for (SafetyCenterSubitemContactsImport contactsImport : contactsList) { @@ -347,11 +374,18 @@ public class SafetyCenterSubitemService extends ServiceImpl Date: Tue, 9 Jul 2024 10:13:39 +0800 Subject: [PATCH 51/64] =?UTF-8?q?update=2086971=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83=E6=88=90=E5=91=98=20?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E6=97=B6=20=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E5=8D=95=E5=85=83=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SafetyCenterSubitem.java | 39 ++++++++++--------- .../vo/SafetyCenterSubitemImport.java | 16 ++++---- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java index c65e5444..bd8fcd92 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenterSubitem.java @@ -44,7 +44,7 @@ public class SafetyCenterSubitem { */ @TableField(value = "company_id") @ApiModelProperty(value = "成员单位id") - @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") + @Excel(name = "成员单位", width = 15, dictTable = "pay_company_management", dicText = "company_name", dicCode = "id", needMerge = true) @Dict(dictTable = "pay_company_management", dicText = "company_name", dicCode = "id") private String companyId; /** @@ -54,29 +54,12 @@ public class SafetyCenterSubitem { @ApiModelProperty(value = "成员单位名称") private String companyName; - /**企业联系人id*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人id") - @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") - private String contactsId; - - /**企业联系人姓名*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人姓名") - private String contactsName; - - /**企业联系人列表*/ - @TableField(exist = false) - @ApiModelProperty(value = "企业联系人列表") - @ExcelCollection(name = "企业联系人列表") - private List contactsList; - /** * 备注 */ @TableField(value = "remarks") @ApiModelProperty(value = "备注") - @Excel(name = "备注") + @Excel(name = "备注", needMerge = true) private String remarks; /** @@ -107,6 +90,24 @@ public class SafetyCenterSubitem { @ApiModelProperty(value = "更新时间") private Date updateTime; + /**企业联系人id*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人id") + @Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id") + private String contactsId; + + /**企业联系人姓名*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人姓名") + private String contactsName; + + /**企业联系人列表*/ + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人列表") + @ExcelCollection(name = "企业联系人列表") + private List contactsList; + + /**已提醒*/ @TableField(exist = false) @Dict(dicCode = "yn") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java index 883d80df..db9326c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/vo/SafetyCenterSubitemImport.java @@ -20,9 +20,17 @@ public class SafetyCenterSubitemImport { * 成员单位 */ @ApiModelProperty(value = "成员单位") - @Excel(name = "成员单位") + @Excel(name = "成员单位", needMerge = true) private String companyName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + @Excel(name = "备注", needMerge = true) + private String remarks; + /** * 企业联系人列表 */ @@ -30,11 +38,5 @@ public class SafetyCenterSubitemImport { @ExcelCollection(name = "企业联系人列表") private List contactsList; - /** - * 备注 - */ - @ApiModelProperty(value = "备注") - @Excel(name = "备注") - private String remarks; } \ No newline at end of file From 5f37408080f5a1585a70ba55c855c4219c7ee4cf Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 10:38:28 +0800 Subject: [PATCH 52/64] =?UTF-8?q?update=2086978=20=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83--=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=8E=88=E6=9D=83--=E4=B8=8D=E5=8B=BE=E9=80=89=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=83=E9=99=90--=E6=B2=A1=E6=9C=89=E5=BC=B9?= =?UTF-8?q?=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SafetyCenterController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java index 97e8cd68..1c0ab357 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/controller/SafetyCenterController.java @@ -21,6 +21,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -52,6 +53,7 @@ public class SafetyCenterController extends JeroController> queryPageList(SafetyCenter safetyCenter, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -72,6 +74,7 @@ public class SafetyCenterController extends JeroController> queryProjectGroupPageList(SafetyCenter safetyCenter, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -124,6 +127,7 @@ public class SafetyCenterController extends JeroController> queryList(SafetyCenter safetyCenter, HttpServletRequest req) { @@ -137,6 +141,7 @@ public class SafetyCenterController extends JeroController add(@Validated @RequestBody SafetyCenter safetyCenter) { safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_2); @@ -148,6 +153,7 @@ public class SafetyCenterController extends JeroController addProjectGroup(@Validated @RequestBody SafetyCenter safetyCenter) { safetyCenter.setProjectType(SafetyCenterCommon.PROJECT_TYPE_3); @@ -161,6 +167,7 @@ public class SafetyCenterController extends JeroController edit(@Validated @RequestBody SafetyCenterEditVO safetyCenter) { safetyCenterService.editById(safetyCenter); @@ -171,6 +178,7 @@ public class SafetyCenterController extends JeroController editProjectGroup(@Validated @RequestBody SafetyCenterEditVO safetyCenter) { safetyCenterService.editById(safetyCenter); @@ -182,6 +190,7 @@ public class SafetyCenterController extends JeroController delete(@RequestBody IdsMapBody map) { String id = map.getId(); @@ -197,6 +206,7 @@ public class SafetyCenterController extends JeroController deleteBatch(@RequestBody IdsMapBody map) { String ids = map.getIds(); @@ -213,6 +223,7 @@ public class SafetyCenterController extends JeroController queryById(@RequestParam(name = "id") String id) { SafetyCenter safetyCenter = safetyCenterService.queryById(id); @@ -226,6 +237,7 @@ public class SafetyCenterController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, request.getParameterMap()); @@ -257,6 +269,7 @@ public class SafetyCenterController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(safetyCenter, request.getParameterMap()); From a3f46ff0f11503393952f4c9e390a0e505867525 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 10:47:33 +0800 Subject: [PATCH 53/64] =?UTF-8?q?update=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83-=E4=BC=81=E4=B8=9A=E7=AB=AF-?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9EsubitemId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/functionalsafetycenter/entity/SafetyCenter.java | 7 +++++++ .../mapper/xml/SafetyCenterMapper.xml | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java index 2b657054..db74c077 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/entity/SafetyCenter.java @@ -117,4 +117,11 @@ public class SafetyCenter { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date updateTime; + + /** + * 成员id + */ + @TableField(exist = false) + @ApiModelProperty(value="成员id") + private String subitemId; } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml index f2511327..903452f1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/mapper/xml/SafetyCenterMapper.xml @@ -22,8 +22,8 @@ remarks, create_by, create_time, update_by, update_time - + select pfsc.*,pfscs.id as subitem_id from pay_functional_safety_center pfsc left join pay_functional_safety_center_subitem pfscs on pfsc.id = pfscs.project_id left join pay_functional_safety_center_subitem_contacts pfscsc on pfscs.id = pfscsc.subitem_id From a8ab4613c405d78330a9b02937e12d4dcbca4469 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 11:06:13 +0800 Subject: [PATCH 54/64] =?UTF-8?q?update=2024=E5=B9=B46=E6=9C=88=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83=E5=8F=98=E6=9B=B4?= =?UTF-8?q?.sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql index 0c312a69..9ca834c6 100644 --- a/db/24年6月功能安全中心变更.sql +++ b/db/24年6月功能安全中心变更.sql @@ -65,3 +65,5 @@ values ('1803314563741982722', '1432280766382727169', '功能安全中心会议 alter table pay_meeting add safety_center_id varchar(50) null comment '功能安全中心id'; +ALTER TABLE pay_meeting + MODIFY COLUMN `remind` tinyint(1) NULL DEFAULT 0 COMMENT '是否提醒'; \ No newline at end of file From ee4fcd16f131553b35a6e538090b173652e1a47d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 11:20:07 +0800 Subject: [PATCH 55/64] =?UTF-8?q?fix=2086984=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E6=B7=BB=E5=8A=A0=E5=8F=82=E4=BC=9A=E4=BA=BA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BB=BA=E8=AE=AE=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=9C=AC?= =?UTF-8?q?=E7=BA=A7=E7=9A=84=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayCompanyManagementController.java | 10 +++++++--- .../controller/PayContactsManagementController.java | 7 ++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java index fde30a7f..a5ac1aac 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayCompanyManagementController.java @@ -262,21 +262,25 @@ public class PayCompanyManagementController extends JeroController queryPageSafetyCenter(@RequestParam(name="projectId") String projectId, + @RequestParam(name="type",required = false) String type, @RequestParam(name="companyName",required = false) String companyName, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { SafetyCenter safetyCenter = safetyCenterService.getById(projectId); QueryWrapper queryWrapper = new QueryWrapper<>(); - - queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId()); + if ("2".equals(type)){ + queryWrapper.eq("pfscs.project_id",safetyCenter.getId()); + }else { + queryWrapper.eq("pfscs.project_id",safetyCenter.getParentId()); + } queryWrapper.like(StringUtils.isNotBlank(companyName),"pcm.company_name",companyName); Page page = new Page<>(pageNo, pageSize); IPage pageList = payCompanyManagementService.pageSafetyCenter(page, queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java index a43b0822..15f0ada4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java @@ -830,6 +830,7 @@ public class PayContactsManagementController extends JeroController queryBySafetyCenter(@RequestParam(name="projectId") String projectId, + @RequestParam(name="type",required = false) String type, @RequestParam(name="companyId",required = false) String companyId, @RequestParam(name="name",required = false) String name) { if (StringUtils.isBlank(companyId)||StringUtils.isBlank(projectId)){ @@ -838,7 +839,11 @@ public class PayContactsManagementController extends JeroController queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId()); + if ("2".equals(type)){ + queryWrapper.eq("pfscsc.project_id", safetyCenter.getId()); + }else { + queryWrapper.eq("pfscsc.project_id", safetyCenter.getParentId()); + } queryWrapper.eq("pfscsc.company_id", companyId); if(!StringUtils.isEmpty(name)){ queryWrapper.like("pcm.name", name); From 785ad72ba60c54e49bdb2148a6c7e29ffe88493b Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 14:23:33 +0800 Subject: [PATCH 56/64] =?UTF-8?q?fix=2086988=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E9=A1=B9=E7=9B=AE=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE--=E5=AF=BC=E5=87=BA=E5=90=8E=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=B8=8E=E5=88=97=E8=A1=A8=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/service/impl/PayMeetingSituationServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java index 31fa3394..90be29c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java @@ -1191,6 +1191,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl pageListContract = pageListContract(meetingId, new Page<>(-1, -1), queryWrapper,meetingType); List pageList = pageListContract.getRecords(); From 88c011562980fcb4cc0739c0192ee5a345e5527c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 14:32:11 +0800 Subject: [PATCH 57/64] =?UTF-8?q?fix=2086986=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E6=88=90=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4-=E5=AF=BC=E5=85=A5-=E4=B8=A4=E4=B8=AA=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E6=B2=A1=E6=9C=89=E5=81=9A=E4=BD=8D=E6=95=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/SafetyCenterSubitemService.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java index 2ce912df..5fbb1452 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/functionalsafetycenter/service/SafetyCenterSubitemService.java @@ -335,10 +335,11 @@ public class SafetyCenterSubitemService extends ServiceImpl 0){ errorMessage.add("第" + errorRowNum + "行：成员单位当前项目中已经存在"); - errorRowNum2 += contactsList.size(); - continue; } - + String remarks1 = subitemImport.getRemarks(); + if (remarks1 != null && remarks1.length() > 200){ + errorMessage.add("第" + errorRowNum + "行：成员单位备注最长为200字符"); + } Integer projectType = safetyCenter.getProjectType(); List parentContactIdList = new ArrayList<>(); if (SafetyCenterCommon.PROJECT_TYPE_1 != projectType) { @@ -386,9 +387,14 @@ public class SafetyCenterSubitemService extends ServiceImpl 50){ + errorMessage.add("第" + errorRowNum2 + "行：企业联系人备注最长为50字符"); + continue; + } SafetyCenterSubitemContacts contacts1 = new SafetyCenterSubitemContacts(); contacts1.setContactsId(payContactsManagement.getId()); - contacts1.setRemarks(contactsImport.getRemarks()); + contacts1.setRemarks(remarks); subitemContactsList.add(contacts1); } if (!errorMessage.isEmpty()){ @@ -397,7 +403,7 @@ public class SafetyCenterSubitemService extends ServiceImpl Date: Tue, 9 Jul 2024 14:57:59 +0800 Subject: [PATCH 58/64] =?UTF-8?q?add=20=E9=82=AE=E4=BB=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/service/impl/SendMessageServiceImpl.java | 1 + .../jero/modules/message/handle/impl/EmailSendMsgHandle.java | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index dd64f37c..dfa96187 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -107,6 +107,7 @@ public class SendMessageServiceImpl implements SendMessageService { Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag(); LoginUser loginUser = sysBaseAPI.getUserByName(fromUser); if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){ + log.info("开始发送邮件"); if(StringUtils.isEmpty(sendMessageDTO.getEmail())){ throw new JeroBootException("邮件发送，邮箱地址不能为空！"); } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java index 4f2bcfbe..933ee705 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java @@ -5,6 +5,7 @@ import com.jero.common.util.SpringContextUtils; import com.jero.common.util.oConvertUtils; import com.jero.config.StaticConfig; import com.jero.modules.message.handle.ISendMsgHandle; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -20,7 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Properties; - +@Slf4j public class EmailSendMsgHandle implements ISendMsgHandle { static String emailFrom; private String email; @@ -94,6 +95,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { // helper.addAttachment(attachmentsMailNameDispose(uploadEXECL), file); // helper.addAttachment(attachmentsMailNameDispose(uploadCAD), file); mailSender.send(message); + log.info("发送邮件成功"); } catch (MessagingException e) { e.printStackTrace(); } @@ -178,6 +180,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle { } } mailSender.send(message); + log.info("发送邮件和文件成功"); } } }catch (MessagingException e) { From 4fd108b9e6729152dd4fd03f7b09559e0bc7e4f8 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 15:24:13 +0800 Subject: [PATCH 59/64] =?UTF-8?q?fix=2086924=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupDistributionRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 43bab30e..a8a3cd91 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -602,7 +602,8 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl Date: Tue, 9 Jul 2024 15:31:46 +0800 Subject: [PATCH 60/64] =?UTF-8?q?fix=2086987=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99--=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E5=88=86?= =?UTF-8?q?=E5=8F=91=E5=8D=B4=E6=8A=A5=E8=B5=84=E6=96=99=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupDistributionRecordServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index a8a3cd91..0a871f24 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -525,8 +525,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ From 9968ecd27e00e278013cfca25d81e99b3bc0e9e7 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 15:56:27 +0800 Subject: [PATCH 61/64] =?UTF-8?q?fix=2086987=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99--=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E5=88=86?= =?UTF-8?q?=E5=8F=91=E5=8D=B4=E6=8A=A5=E8=B5=84=E6=96=99=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupDistributionRecordServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 0a871f24..27583fec 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -249,8 +249,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl Date: Tue, 9 Jul 2024 16:16:46 +0800 Subject: [PATCH 62/64] =?UTF-8?q?fix=2086998=20=E4=BC=81=E4=B8=9A=E7=AB=AF?= =?UTF-8?q?--=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E4=B8=80=E4=BA=8C=E4=B8=89=E7=BA=A7=E7=9A=84=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/PayCommonProjectController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java index 3e7caf31..9bda0d6f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java @@ -27,6 +27,9 @@ import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem; +import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService; +import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport; import com.jero.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; @@ -118,6 +121,8 @@ public class PayCommonProjectController extends JeroController queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); - queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getProjectId,id); + queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getProjectId,safetyCenterSubitem.getProjectId()); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId()); queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId); List listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord); From ee34e34553a6d86b5c82be63f0d85541da4463b3 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Tue, 9 Jul 2024 16:23:10 +0800 Subject: [PATCH 63/64] =?UTF-8?q?fix=2086987=20=E5=8A=9F=E8=83=BD=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=B8=AD=E5=BF=83--=E5=88=86=E5=8F=91=E8=B5=84?= =?UTF-8?q?=E6=96=99--=E9=9D=9E=E7=AE=A1=E7=90=86=E5=91=98=E5=88=86?= =?UTF-8?q?=E5=8F=91=E5=8D=B4=E6=8A=A5=E8=B5=84=E6=96=99=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayWorkingGroupDistributionRecordServiceImpl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java index 27583fec..ae182fd4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java @@ -249,9 +249,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.in(PayContactsManagement::getId, Arrays.asList(s)); @@ -524,9 +521,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl{ OSSFile byId = iossFileService.getById(p.getFileId()); if(Objects.isNull(byId)){ From 3d88faab1c3e129c76c6f41b2ce13bd7b61ab68c Mon Sep 17 00:00:00 2001 From: danshihao Date: Wed, 10 Jul 2024 11:04:47 +0800 Subject: [PATCH 64/64] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=8F=9C=E5=8D=95sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年6月功能安全中心变更.sql | 36 +++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/db/24年6月功能安全中心变更.sql b/db/24年6月功能安全中心变更.sql index 9ca834c6..cc83c117 100644 --- a/db/24年6月功能安全中心变更.sql +++ b/db/24年6月功能安全中心变更.sql @@ -66,4 +66,38 @@ alter table pay_meeting add safety_center_id varchar(50) null comment '功能安全中心id'; ALTER TABLE pay_meeting - MODIFY COLUMN `remind` tinyint(1) NULL DEFAULT 0 COMMENT '是否提醒'; \ No newline at end of file + MODIFY COLUMN `remind` tinyint(1) NULL DEFAULT 0 COMMENT '是否提醒'; + +-- 功能安全中心菜单权限 +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808322558888558593', '1802969401866113025', '资料状态（嘉宾是否可以在企业端上传）', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:guestsUploadFileFlag', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-03 10:11:10', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097862171545601', '1802969401866113025', '删除', '', NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:18:18', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097770144321537', '1802969401866113025', '编辑', '', NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:17:56', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097712564916226', '1802969401866113025', '批量删除', '', NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:17:42', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097643329540097', '1802969401866113025', '导出', '', NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:17:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097593895473153', '1802969401866113025', '添加参会人', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:17:14', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097528275587074', '1802969401866113025', '查询', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeetingSituation:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:16:58', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097135822950401', '1802967227660554241', '新增', '', NULL, NULL, NULL, 2, 'safetyCenterMember:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:15:25', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808097037156143105', '1802967227660554241', '编辑', NULL, NULL, NULL, NULL, 2, 'safetyCenterMember:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:15:01', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096969082589186', '1802967227660554241', '删除', NULL, NULL, NULL, NULL, 2, 'safetyCenterMember:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:14:45', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096803780874242', '1802967227660554241', '批量删除', '', NULL, NULL, NULL, 2, 'safetyCenterMember:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:14:05', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096742850220033', '1802967227660554241', '下载模板', '', NULL, NULL, NULL, 2, 'safetyCenterMember:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:13:51', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096637346697217', '1802967227660554241', '导出', NULL, NULL, NULL, NULL, 2, 'safetyCenterMember:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:13:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096551610929154', '1802967227660554241', '导入', '', NULL, NULL, NULL, 2, 'safetyCenterMember:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:13:05', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096433390276610', '1802967227660554241', '查询', NULL, NULL, NULL, NULL, 2, 'safetyCenterMember:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:12:37', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096164627664897', '1802970571397451777', '删除', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:11:33', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096100412870657', '1802970571397451777', '编辑', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:11:18', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808096041596145666', '1802970571397451777', '上传文件', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:upload', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:11:04', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095978861940737', '1802970571397451777', '会议纪要', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:uploadCouncil', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:10:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095827002970113', '1802970571397451777', '发布', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:publish', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:10:13', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095745981599745', '1802970571397451777', '批量删除', '', NULL, NULL, NULL, 2, 'safetyCenterMeeting:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:09:53', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095649277726722', '1802970571397451777', '导出', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeeting:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:09:30', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095579434176513', '1802970571397451777', '新增', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeeting:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:09:14', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095482008883201', '1802970571397451777', '查询', NULL, NULL, NULL, NULL, 2, 'safetyCenterMeeting:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:08:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095111647645697', '1802631077112610817', '在研项目', NULL, NULL, NULL, NULL, 2, 'safetyCenter:underStudyProject', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:07:22', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808095031213477890', '1802631077112610817', '删除', NULL, NULL, NULL, NULL, 2, 'safetyCenter:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:07:03', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094969842421761', '1802631077112610817', '基本信息维护', '', NULL, NULL, NULL, 2, 'safetyCenter:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:06:48', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094888670056450', '1802631077112610817', '功能安全中心会议', NULL, NULL, NULL, NULL, 2, 'safetyCenter:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:06:29', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094800346402817', '1802631077112610817', '其他资料分发', NULL, NULL, NULL, NULL, 2, 'safetyCenter:fileMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:06:08', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094623023812610', '1802631077112610817', '批量删除', NULL, NULL, NULL, NULL, 2, 'safetyCenter:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:05:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094527150411777', '1802631077112610817', '新增', NULL, NULL, NULL, NULL, 2, 'safetyCenter:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:05:03', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `external_terminal_show`) VALUES ('1808094461882847233', '1802631077112610817', '查询', '', NULL, NULL, NULL, 2, 'safetyCenter:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-07-02 19:04:47', NULL, NULL, 0, 0, '1', 0, 1);