From e594e5ba35979205ff5d9b1104965a6d496d75ff Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jan 2024 08:53:53 +0800 Subject: [PATCH 01/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86,=E4=BB=A5=E5=8F=8A=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E6=88=90=E5=91=98=E7=9A=84=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupController.java | 246 +++++++ ...raftingGroupSubItemContactsController.java | 27 + .../PayDraftingGroupSubItemController.java | 372 ++++++++++ .../drafting/entity/PayDraftingGroup.java | 150 ++++ .../entity/PayDraftingGroupSubItem.java | 415 +++++++++++ .../PayDraftingGroupSubItemContacts.java | 131 ++++ .../mapper/PayDraftingGroupMapper.java | 22 + ...PayDraftingGroupSubItemContactsMapper.java | 25 + .../mapper/PayDraftingGroupSubItemMapper.java | 26 + .../mapper/xml/PayDraftingGroupMapper.xml | 50 ++ .../PayDraftingGroupSubItemContactsMapper.xml | 16 + .../xml/PayDraftingGroupSubItemMapper.xml | 40 ++ .../service/IPayDraftingGroupService.java | 61 ++ ...ayDraftingGroupSubItemContactsService.java | 16 + .../IPayDraftingGroupSubItemService.java | 59 ++ .../impl/PayDraftingGroupServiceImpl.java | 219 ++++++ ...aftingGroupSubItemContactsServiceImpl.java | 24 + .../PayDraftingGroupSubItemServiceImpl.java | 645 ++++++++++++++++++ .../vo/PayDraftingGroupSubItemExcel.java | 257 +++++++ .../jero/drafting/vo/PayDraftingGroupVo.java | 29 + .../src/main/resources/application-dev.yml | 2 +- 21 files changed, 2831 insertions(+), 1 deletion(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemContactsController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItemContacts.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemContactsMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemContactsMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java new file mode 100644 index 00000000..efe2859e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java @@ -0,0 +1,246 @@ +package com.jero.drafting.controller; + +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.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.project.common.PayProjectCommon; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.service.IPayWorkingGroupService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 起草组表 前端控制器 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Api(tags = "起草组项目") +@RestController +@RequestMapping("/drafting/payDraftingGroup") +@Slf4j +public class PayDraftingGroupController extends JeroController { + + @Resource + private IPayDraftingGroupService payDraftingGroupService; + @Resource + private RolePermissionService rolePermissionService; + @Resource + private IPayWorkingGroupService payWorkingGroupService; + + /** + * 分页列表查询 + * + * @param payDraftingGroup 起草组项目 + * @param pageNo 页数 + * @param pageSize 条数 + */ +// @RequiresPermissions("draftingGroupProject:search") + @ApiOperation(value="起草组项目-分页列表查询", notes="起草组项目-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayDraftingGroup payDraftingGroup, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + // 校验参数 + if(!StringUtils.isBlank(payDraftingGroup.getDraftingGroupProject()) && payDraftingGroup.getDraftingGroupProject().length() > 50){ + return Result.error("起草组项目长度不能大于50个字符"); + } + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("draftingGroupProject:search")){ + payDraftingGroup.setPrincipalA(sysUser.getId()); + payDraftingGroup.setPrincipalB(sysUser.getId()); + } + + // 分页条件查询 + Page page = new Page<>(pageNo, pageSize); + if(!StringUtils.isBlank(payDraftingGroup.getDraftingGroupProject())){ + payDraftingGroup.setDraftingGroupProject(oConvertUtils.replaceAllPercent(payDraftingGroup.getDraftingGroupProject())); + } + + IPage pageList = payDraftingGroupService.queryPageList(page,payDraftingGroup); + if (!Objects.isNull(pageList)) { + List listPayDraftingGroupVo = pageList.getRecords(); + if (!CollectionUtils.isEmpty(listPayDraftingGroupVo)) { + listPayDraftingGroupVo.forEach(p->{ + if(!rolePermissionService.getRolePermission("generalProject:search") && Objects.equals(p.getPrincipalIdB(),sysUser.getId())){ + p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION2); + }else{ + p.setCheckoutOperation(PayProjectCommon.CHECKOUT_OPERATION1); + } + // 根据工作组id查询对应的工作组名称 + if (StringUtils.isNotBlank(p.getWorkingGroupId())) { + PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(p.getWorkingGroupId()); + if (!Objects.isNull(payWorkingGroup)) { + p.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject()); + } + } + }); + pageList.setRecords(listPayDraftingGroupVo); + } + } + + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payDraftingGroup 起草组项目 + * @return + */ + @AutoLog(value = "起草组项目-添加",operateType = 1) +// @RequiresPermissions("draftingGroupProject:add") + @ApiOperation(value="起草组项目-添加", notes="起草组项目-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayDraftingGroup payDraftingGroup) { + // 参数校验 + StringBuilder msg = ValidUtil.validateAll(payDraftingGroup); + if(!StringUtils.isBlank(msg)){ + return Result.error(msg.toString()); + } + try { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroup::getDraftingGroupProject,payDraftingGroup.getDraftingGroupProject()); + PayDraftingGroup payDraftingGroupDB = payDraftingGroupService.getOne(queryWrapper); + if(!Objects.isNull(payDraftingGroupDB)) { + return Result.error("起草组项目已存在！"); + } + }catch (Exception e){ + log.info("起草组项目-添加",e); + return Result.error("起草组项目已存在！"); + } + payDraftingGroupService.setPayDraftingGroup(payDraftingGroup); + payDraftingGroupService.save(payDraftingGroup); + return Result.OK("添加成功！"); + } + + /** + * 通过id删除 + * + * @param id 工作组项目id + * @return + */ + @AutoLog(value = "起草组项目-通过id删除",operateType = 2) +// @RequiresPermissions("draftingGroupProject:delete") + @ApiOperation(value="起草组项目-通过id删除", notes="起草组项目-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id") String id) { + if(StringUtils.isBlank(id)){ + return Result.error("id不能为空!"); + } + payDraftingGroupService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids 起草组项目ids 逗号分隔 + * @return + */ +// @RequiresPermissions("draftingGroupProject:batchDel") + @ApiOperation(value="起草组项目-批量删除", notes="起草组项目-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids") String ids) { + if(StringUtils.isBlank(ids)){ + return Result.error("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if(StringUtils.isBlank(s1)){ + return Result.error("id不能为空!"); + } + } + payDraftingGroupService.deleteByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 复制 + * + * @param payDraftingGroup 起草组项目 + * @return + */ + @AutoLog(value = "起草组项目-复制",operateType = 3) +// @RequiresPermissions("draftingGroupProject:copy") + @ApiOperation(value="起草组项目-复制", notes="起草组项目-复制") + @PostMapping(value = "/copy") + public Result copy(@RequestBody PayDraftingGroup payDraftingGroup) { + if(StringUtils.isBlank(payDraftingGroup.getId())){ + return Result.error("起草组id不能为空！"); + } + PayDraftingGroup payDraftingGroupOld = payDraftingGroupService.getById(payDraftingGroup.getId()); + if(Objects.isNull(payDraftingGroupOld)){ + return Result.error("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("draftingGroupProject:copy") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(),sysUser.getId())){ + return Result.error(payDraftingGroupOld.getDraftingGroupProject() + "数据权限不足！"); + } + payDraftingGroupService.copy(payDraftingGroup); + return Result.OK("复制成功！"); + } + + /** + * 通过id查询 + * + * @param id 起草组项目id + * @return + */ + @ApiOperation(value="起草组项目-通过id查询", notes="起草组项目-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id") String id) { + if (StringUtils.isBlank(id)) { + return Result.error("起草组id不能为空"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(id); + if(Objects.isNull(payDraftingGroup)) { + return Result.error("未找到对应数据"); + } + return Result.OK(payDraftingGroup); + } + + /** + * 查询所有工作组 + * @return + */ + @ApiOperation(value="工作组项目-查询所有工作组", notes="工作组项目-查询所有工作组") + @GetMapping(value = "/queryAllWorkingGroupsIdAndName") + public Result queryAllWorkingGroupsIdAndName() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.select("id","working_group_project"); + queryWrapper.lambda().groupBy(PayWorkingGroup::getWorkingGroupProject); + List payWorkingGroups = payWorkingGroupService.list(queryWrapper); + List> mapList = payWorkingGroups.stream().map(p -> { + HashMap map = new HashMap<>(); + map.put("id", p.getId()); + map.put("workingGroupProject", p.getWorkingGroupProject()); + return map; + }).collect(Collectors.toList()); + return Result.OK(mapList); + } +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemContactsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemContactsController.java new file mode 100644 index 00000000..40c10a14 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemContactsController.java @@ -0,0 +1,27 @@ +package com.jero.drafting.controller; + +import com.jero.common.system.base.controller.JeroController; +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 io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * 起草组成员企业联系人表 前端控制器 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Api(tags="起草组成员") +@RestController +@RequestMapping("/drafting/payDraftingGroupSubitemContacts") +@Slf4j +public class PayDraftingGroupSubItemContactsController extends JeroController { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java new file mode 100644 index 00000000..5bf2b149 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -0,0 +1,372 @@ +package com.jero.drafting.controller; + +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.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ProjectDetailService; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.ValidUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.common.vo.ProjectDetailVO; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import com.jero.drafting.vo.PayDraftingGroupSubItemExcel; +import com.jero.modules.system.service.ISysUserService; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import com.jero.project.vo.excel.PayWorkingGroupSubItemExcel; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +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.math.BigDecimal; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 起草组成员表 前端控制器 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Api(tags="起草组成员") +@RestController +@RequestMapping("/drafting/payDraftingGroupSubitem") +@Slf4j +public class PayDraftingGroupSubItemController extends JeroController { + + @Resource + private IPayDraftingGroupService payDraftingGroupService; + @Resource + private IPayDraftingGroupSubItemService payDraftingGroupSubItemService; + @Resource + private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; + @Resource + private RolePermissionService rolePermissionService; + @Resource + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + + /** + * 分页列表查询 + * + * @param payDraftingGroupSubItem 起草组成员 + * @param pageNo 页数 + * @param pageSize 条数 + * @param paymentDate 日期 + * @return + */ +// @RequiresPermissions("draftingGroupMember:search") + @ApiOperation(value = "起草组成员-分页列表查询", notes = "起草组成员-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayDraftingGroupSubItem payDraftingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName()) && payDraftingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getDraftingGroupId())) { + return Result.error("起草组id不能为空！"); + } + if(!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName())){ + payDraftingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payDraftingGroupSubItem.getChargeCompanyTemporaryName())); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if(Objects.isNull(payDraftingGroup)){ + return Result.error("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("draftingGroupMember:search") && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId())){ + return Result.error("数据权限不足！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param payDraftingGroupSubItem 起草组成员 + * @return + */ + @AutoLog(value = "起草组成员-添加",operateType = 2) +// @RequiresPermissions("draftingGroupMember:add") + @ApiOperation(value = "起草组成员-添加", notes = "起草组成员-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { + StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payDraftingGroupSubItemService.addPayDraftingGroupSubItem(payDraftingGroupSubItem); + return Result.OK("添加成功！"); + } + + /** + * 通过id删除 + * + * @param id 起草组成员id + * @return + */ + @AutoLog(value = "起草组成员-删除",operateType = 4) +// @RequiresPermissions("draftingGroupMember:delete") + @ApiOperation(value = "起草组成员-通过id删除", notes = "起草组成员-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name = "id") String id) { + payDraftingGroupSubItemService.delete(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids 起草组成员ids 逗号分隔 + * @return + */ +// @RequiresPermissions("draftingGroupMember:batchDel") + @ApiOperation(value = "起草组成员-批量删除", notes = "起草组成员-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name = "ids") String ids) { + payDraftingGroupSubItemService.deleteBatch(ids); + return Result.OK("批量删除成功!"); + } + + /** + * 编辑 + * + * @param payDraftingGroupSubItem 工作组成员 + * @return + */ + @AutoLog(value = "工作组成员-修改",operateType = 3) +// @RequiresPermissions("draftingGroupMember:edit") + @ApiOperation(value = "工作组成员-编辑", notes = "工作组成员-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { + StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payDraftingGroupSubItemService.editPayWorkingGroupSubItem(payDraftingGroupSubItem); + return Result.OK("编辑成功!"); + } + +// /** +// * 通过id查询 +// * +// * @param id 起草组成员 +// * @return +// */ +// @ApiOperation(value = "起草组成员-通过id查询", notes = "起草组成员-通过id查询") +// @GetMapping(value = "/queryById") +// public Result queryById(@RequestParam(name = "id") String id) { +// PayDraftingGroupSubItem payDraftingGroupSubitem = payDraftingGroupSubItemService.getById(id); +// if (payDraftingGroupSubitem == null) { +// return Result.error("未找到对应数据"); +// } +// ProjectDetailVO projectDetailVO = projectDetailService.getProjectDetail(payDraftingGroupSubitem.getId()); +// return Result.OK(projectDetailVO); +// } + + /** + * 模板下载 + * + * @return + */ +// @RequiresPermissions("draftingGroupMember:downTemplate") + @ApiOperation(value = "起草组成员-模板下载", notes = "起草组成员-模板下载") + @GetMapping(value = "/downloadExcelModel") + public ModelAndView downloadExcelModel() { + return super.exportTemplate(PayDraftingGroupSubItem.class, "起草组成员导入模板"); + } + + /** + * 通过excel导入数据 + * + * @param request + * @return + */ + @AutoLog(value = "起草组成员-excel导入数据",operateType = 5) +// @RequiresPermissions("draftingGroupMember:import") + @PostMapping(value = "/importExcel") + @ApiOperation(value = "起草组成员-通过excel导入数据", notes = "起草组成员-通过excel导入数据") + public Result importExcel(HttpServletRequest request) { + List excelData = super.getExcelData(request, PayDraftingGroupSubItem.class); + if (excelData.isEmpty()) { + throw new JeroBootException("导入数据为空，请填写数据之后重新导入！"); + } + payDraftingGroupSubItemService.importExcel(request); + return Result.OK("文件导入成功！"); + } + + /** + * 导出excel + * + * @param request + * @param payDraftingGroupSubItem 起草组成员 + */ + @AutoLog(value = "起草组成员-导出excel",operateType = 6) +// @RequiresPermissions("draftingGroupMember:export") + @GetMapping(value = "/exportXls") + @ApiOperation(value = "起草组成员-导出excel", notes = "起草组成员-导出excel") + public ModelAndView exportXls(HttpServletRequest request, + PayDraftingGroupSubItem payDraftingGroupSubItem, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if(Objects.isNull(payDraftingGroup)){ + throw new JeroBootException("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("draftingGroupMember:export") + && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId()) + && !Objects.equals(payDraftingGroup.getPrincipalIdB(),sysUser.getId())){ + throw new JeroBootException("数据权限不足！"); + } + // Step.2 获取导出数据 + Page page = new Page<>(-1, -1); + IPage payWorkingGroupSubItemIPage = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); + List pageList = payWorkingGroupSubItemIPage.getRecords(); + List exportList; + + // 过滤选中数据 + String selections = request.getParameter("selections"); + if (oConvertUtils.isNotEmpty(selections)) { + List selectionList = Arrays.asList(selections.split(",")); + exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList()); + } else { + exportList = pageList; + } + List excelList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(exportList)){ + // 拿到所有的起草组成员id的list + List listDGSIds = exportList.stream().map(PayDraftingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId,listDGSIds); + // 拿到所有起草组成员对应的起草组联系人信息 + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); + for (PayDraftingGroupSubItem draftingGroupSubItem : exportList) { + PayDraftingGroupSubItemExcel excel = new PayDraftingGroupSubItemExcel(); + BeanUtils.copyProperties(draftingGroupSubItem,excel); + // 拿到该成员对应联系人信息的list + List listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsList.stream().filter(o->Objects.equals(draftingGroupSubItem.getId(),o.getDraftingGroupSubId())).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)){ + listPayDraftingGroupSubItemContacts.sort(Comparator.comparing(PayDraftingGroupSubItemContacts::getOrderNum)); + // 拿到该名成员对应的联系人的id的list + List listIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + // 拿到所有联系人信息对应的详情信息 + List listPayContactsManagementTemporary = payContactsManagementTemporaryService.listByIds(listIds); + for (int i = 0; i < listPayDraftingGroupSubItemContacts.size(); i++) { + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = listPayDraftingGroupSubItemContacts.get(i); + // 拿到该联系人的详情信息 + List temporary = listPayContactsManagementTemporary.stream().filter(s->Objects.equals(s.getId(),payDraftingGroupSubItemContacts.getContactsTemporaryId())).collect(Collectors.toList()); + String email = ""; + String phone = ""; + String name = payDraftingGroupSubItemContacts.getContactsTemporaryName(); + String remark = payDraftingGroupSubItemContacts.getRemarks(); + if(!CollectionUtils.isEmpty(temporary)){ + email = temporary.get(0).getEmail(); + // 解密 + if (StringUtils.isNotBlank(email)){ + email = PasswordUtil.decrypt(email); + } + phone = temporary.get(0).getPhone(); + if (StringUtils.isNotBlank(phone)){ + phone = PasswordUtil.decrypt(phone); + } + } + switch (i){ + case 0: + excel.setContactsNameOne(name); + excel.setRemarksOne(remark); + excel.setContactsEmailOne(email); + excel.setContactsPhoneOne(phone); + break; + case 1: + excel.setContactsNameTwo(name); + excel.setRemarksTwo(remark); + excel.setContactsEmailTwo(email); + excel.setContactsPhoneTwo(phone); + break; + case 2: + excel.setContactsNameThree(name); + excel.setRemarksThree(remark); + excel.setContactsEmailThree(email); + excel.setContactsPhoneThree(phone); + break; + case 3: + excel.setContactsNameFour(name); + excel.setRemarksFour(remark); + excel.setContactsEmailFour(email); + excel.setContactsPhoneFour(phone); + break; + case 4: + excel.setContactsNameFive(name); + excel.setRemarksFive(remark); + excel.setContactsEmailFive(email); + excel.setContactsPhoneFive(phone); + break; + case 5: + excel.setContactsNameSix(name); + excel.setRemarksSix(remark); + excel.setContactsEmailSix(email); + excel.setContactsPhoneSix(phone); + break; + case 6: + excel.setContactsNameSeven(name); + excel.setRemarksSeven(remark); + excel.setContactsEmailSeven(email); + excel.setContactsPhoneSeven(phone); + break; + case 7: + excel.setContactsNameEight(name); + excel.setRemarksEight(remark); + excel.setContactsEmailEight(email); + excel.setContactsPhoneEight(phone); + break; + case 8: + excel.setContactsNameNine(name); + excel.setRemarksNine(remark); + excel.setContactsEmailNine(email); + excel.setContactsPhoneNine(phone); + break; + case 9: + excel.setContactsNameTen(name); + excel.setRemarksTen(remark); + excel.setContactsEmailTen(email); + excel.setContactsPhoneTen(phone); + break; + default:break; + } + } + } + excelList.add(excel); + System.err.println(excelList); + } + } + return super.exportListXls(excelList, PayDraftingGroupSubItemExcel.class, "起草组成员"); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java new file mode 100644 index 00000000..cd76a916 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroup.java @@ -0,0 +1,150 @@ +package com.jero.drafting.entity; + +import com.baomidou.mybatisplus.annotation.*; + +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +/** + *

+ * 起草组表 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@TableName("pay_drafting_group") +@ApiModel(value="PayDraftingGroup对象", description="起草组表") +public class PayDraftingGroup implements Serializable { + + private static final long serialVersionUID = 1L; + + /**主键*/ + @ApiModelProperty(value = "主键") + @TableId(value = "id", type = IdType.ASSIGN_ID) + private String id; + + /**起草组项目*/ + @Excel(name = "起草组项目", width = 15) + @ApiModelProperty(value = "起草组项目") + @NotEmpty(message = "起草组项目不能为空") + @Size(max = 50,message = "起草组项目长度不能大于50个字符") + private String draftingGroupProject; + + @ApiModelProperty(value = "工作组id") + @NotEmpty(message = "工作组id不能为空") + @Size(max = 50,message = "工作组id长度不能大于50个字符") + private String workingGroupId; + /**运行年份*/ + @Excel(name = "运行年份", width = 15) + @ApiModelProperty(value = "运行年份") + @NotEmpty(message = "运行年份不能为空") + @Pattern(regexp = "^\\d{4}$",message = "运行年份格式错误") + private String year; + + /**负责人Aid*/ + @Excel(name = "负责人Aid", width = 15) + @ApiModelProperty(value = "负责人Aid") + @NotEmpty(message = "负责人Aid不能为空") + @Size(max = 32,message = "负责人Aid长度不能大于32个字符") + private String principalIdA; + + /**负责人名称A*/ + @Excel(name = "负责人名称A", width = 15) + @ApiModelProperty(value = "负责人名称A") + private String principalNameA; + + /**负责人Aid*/ + @Excel(name = "负责人Bid", width = 15) + @ApiModelProperty(value = "负责人Bid") + @NotEmpty(message = "负责人Bid不能为空") + @Size(max = 32,message = "负责人Bid长度不能大于32个字符") + private String principalIdB; + + /**负责人名称A*/ + @Excel(name = "负责人名称N", width = 15) + @ApiModelProperty(value = "负责人名称B") + private String principalNameB; + + /**每年召开次数*/ + @Excel(name = "每年召开次数", width = 15) + @ApiModelProperty(value = "每年召开次数") + @Size(max = 50,message = "每年召开次数长度不能大于50个字符") + private String convokeNum; + + /**运行周期*/ + @Excel(name = "运行周期", width = 15) + @ApiModelProperty(value = "运行周期") + @Size(max = 50,message = "运行周期长度不能大于50个字符") + private String operationCycle; + + /**任务及目标*/ + @Excel(name = "任务及目标", width = 15) + @ApiModelProperty(value = "任务及目标") + @Size(max = 200,message = "任务及目标长度不能大于200个字符") + private String missionAndObjectives; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + @Size(max = 200,message = "备注长度不能大于200个字符") + private String remarks; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 负责人A(用于权限查询) + */ + @TableField(exist = false) + private String principalA; + + /** + * 负责人B(用于权限查询) + */ + @TableField(exist = false) + private String principalB; + + @TableField(exist = false) + @ApiModelProperty(value = "企业联系人") + private String companyContactName; + + @TableField(exist = false) + @ApiModelProperty(value = "企业名称") + private String companyName; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java new file mode 100644 index 00000000..30ef7f3a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java @@ -0,0 +1,415 @@ +package com.jero.drafting.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 com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import com.jero.contract.entity.PayIncomeContract; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.DecimalMax; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDate; +import java.util.Date; +import java.util.List; + +/** + * @Description: 起草组成员表 实体 + * @Author: sz + * @Date: 2024-01-02 + * @Version: V1.0 + */ +@Data +@TableName("pay_drafting_group_subitem") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_drafting_group_subitem对象", description="pay_drafting_group_subitem") +public class PayDraftingGroupSubItem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**来款项目*/ + @ApiModelProperty(value = "来款项目") + @TableField(exist = false) + private String chargeProject; + + /**起草组id*/ + @ApiModelProperty(value = "起草组id") + @Size(max = 32,message = "起草组id长度不能大于32个字符") + private String draftingGroupId; + + /**成员单位id*/ + @ApiModelProperty(value = "成员单位id") + @Size(max = 32,message = "成员单位id长度不能大于32个字符") + private String chargeCompanyId; + + /**临时成员单位id*/ + @ApiModelProperty(value = "临时成员单位id") + private String chargeCompanyTemporaryId; + + /**临时成员单位*/ + @Excel(name = "成员单位", width = 15) + @ApiModelProperty(value = "临时成员单位") + private String chargeCompanyTemporaryName; + + /**企业联系人1id*/ + @ApiModelProperty(value = "企业联系人1id") + @Size(max = 32,message = "企业联系人1id长度不能大于32个字符") + private String contactsIdOne; + + /**临时企业联系人1id*/ + @ApiModelProperty(value = "临时企业联系人1id") + private String contactsTemporaryIdOne; + + /**临时企业联系人1名称*/ + @ApiModelProperty(value = "临时企业联系人1名称") + private String contactsTemporaryNameOne; + + /**企业联系人2id*/ + @Size(max = 32,message = "企业联系人2id长度不能大于32个字符") + private String contactsIdTwo; + + /**临时企业联系人2id*/ + @ApiModelProperty(value = "临时企业联系人2id") + private String contactsTemporaryIdTwo; + + /**临时企业联系人2名称*/ + @ApiModelProperty(value = "临时企业联系人2名称") + private String contactsTemporaryNameTwo; + + /**企业联系人3id*/ + @Size(max = 32,message = "企业联系人3id长度不能大于32个字符") + private String contactsIdThree; + + /**临时企业联系人3id*/ + @ApiModelProperty(value = "临时企业联系人3id") + private String contactsTemporaryIdThree; + + /**临时企业联系人3名称*/ + @ApiModelProperty(value = "临时企业联系人3名称") + private String contactsTemporaryNameThree; + + /**备注*/ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + @Size(max = 200,message = "备注长度不能大于200个字符") + private String remarks; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 企业联系人列表 + */ + @ApiModelProperty(value = "企业联系人列表") + @TableField(exist = false) + private List payDraftingGroupSubItemContactsList; + + /**项目ids 多个以逗号分隔*/ + @TableField(exist = false) + @ApiModelProperty(value = "项目ids 多个以逗号分隔") + private String projectIds; + /**会议id*/ + @TableField(exist = false) + private String meetingId; + /** + * 负责人 + */ + @TableField(exist = false) + @ApiModelProperty(value = "负责人") + private String principalName; + /**负责人联系电话*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人联系电话") + private String principalPhone; + /**负责人邮箱*/ + @TableField(exist = false) + @ApiModelProperty(value = "负责人邮箱") + private String principalEmail; + /** + * 运行年份 + */ + @TableField(exist = false) + @ApiModelProperty(value = "运行年份") + private String year; + /**运行周期*/ + @ApiModelProperty(value = "运行周期") + @TableField(exist = false) + private String operationCycle; + /**任务及目标*/ + @ApiModelProperty(value = "任务及目标") + @TableField(exist = false) + private String missionAndObjectives; + + /**企业联系人1名称*/ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1") + @TableField(exist = false) + private String contactsNameOne; + /** + * 企业联系人1手机号 + */ + @Excel(name = "企业联系人1手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneOne; + /** + * 企业联系人1邮箱 + */ + @Excel(name = "企业联系人1邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailOne; + /**联系人1备注*/ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + @Size(max = 50,message = "联系人1备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksOne; + + /**企业联系人2名称*/ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2") + @TableField(exist = false) + private String contactsNameTwo; + /** + * 企业联系人2手机号 + */ + @Excel(name = "企业联系人2手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneTwo; + /** + * 企业联系人2邮箱 + */ + @Excel(name = "企业联系人2邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailTwo; + /**联系人2备注*/ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + @Size(max = 50,message = "联系人2备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTwo; + + /**企业联系人3名称*/ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3") + @TableField(exist = false) + private String contactsNameThree; + /** + * 企业联系人3手机号 + */ + @Excel(name = "企业联系人3手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneThree; + /** + * 企业联系人3邮箱 + */ + @Excel(name = "企业联系人3邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailThree; + /**联系人3备注*/ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + @Size(max = 50,message = "联系人3备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksThree; + + /**企业联系人4名称*/ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4") + @TableField(exist = false) + private String contactsNameFour; + /** + * 企业联系人4手机号 + */ + @Excel(name = "企业联系人4手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneFour; + /** + * 企业联系人4邮箱 + */ + @Excel(name = "企业联系人4邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailFour; + /**联系人4备注*/ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + @Size(max = 50,message = "联系人4备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFour; + + /**企业联系人5名称*/ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5") + @TableField(exist = false) + private String contactsNameFive; + /** + * 企业联系人5手机号 + */ + @Excel(name = "企业联系人5手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneFive; + /** + * 企业联系人5邮箱 + */ + @Excel(name = "企业联系人5邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailFive; + /**联系人5备注*/ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + @Size(max = 50,message = "联系人5备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksFive; + + /**企业联系人6名称*/ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6") + @TableField(exist = false) + private String contactsNameSix; + /** + * 企业联系人6手机号 + */ + @Excel(name = "企业联系人6手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneSix; + /** + * 企业联系人6邮箱 + */ + @Excel(name = "企业联系人6邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailSix; + /**联系人6备注*/ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + @Size(max = 50,message = "联系人6备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSix; + + /**企业联系人7名称*/ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7") + @TableField(exist = false) + private String contactsNameSeven; + /** + * 企业联系人7手机号 + */ + @Excel(name = "企业联系人7手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneSeven; + /** + * 企业联系人7邮箱 + */ + @Excel(name = "企业联系人7邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailSeven; + /**联系人7备注*/ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + @Size(max = 50,message = "联系人7备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksSeven; + + /**企业联系人8名称*/ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8") + @TableField(exist = false) + private String contactsNameEight; + /** + * 企业联系人8手机号 + */ + @Excel(name = "企业联系人8手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneEight; + /** + * 企业联系人8邮箱 + */ + @Excel(name = "企业联系人8邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailEight; + /**联系人8备注*/ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + @Size(max = 50,message = "联系人8备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksEight; + + /**企业联系人9名称*/ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9") + @TableField(exist = false) + private String contactsNameNine; + /** + * 企业联系人9手机号 + */ + @Excel(name = "企业联系人9手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneNine; + /** + * 企业联系人9邮箱 + */ + @Excel(name = "企业联系人9邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailNine; + /**联系人9备注*/ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + @Size(max = 50,message = "联系人9备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksNine; + + /**企业联系人10名称*/ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10") + @TableField(exist = false) + private String contactsNameTen; + /** + * 企业联系人10手机号 + */ + @Excel(name = "企业联系人10手机号", width = 15) + @TableField(exist = false) + private String contactsPhoneTen; + /** + * 企业联系人10邮箱 + */ + @Excel(name = "企业联系人10邮箱", width = 15) + @TableField(exist = false) + private String contactsEmailTen; + /**联系人10备注*/ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + @Size(max = 50,message = "联系人10备注长度不能大于50个字符") + @TableField(exist = false) + private String remarksTen; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItemContacts.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItemContacts.java new file mode 100644 index 00000000..110a9b66 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItemContacts.java @@ -0,0 +1,131 @@ +package com.jero.drafting.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 com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: 起草组企业联系人表 实体 + * @Author: sz + * @Date: 2024-01-02 + * @Version: V1.0 + */ +@Data +@TableName("pay_drafting_group_subitem_contacts") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_drafting_group_subitem_contacts", description="pay_drafting_group_subitem_contacts") +public class PayDraftingGroupSubItemContacts implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**起草组id*/ + @Excel(name = "起草组id", width = 15) + @ApiModelProperty(value = "起草组id") + private String draftingGroupId; + /**起草组成员id*/ + @Excel(name = "起草组成员id", width = 15) + @ApiModelProperty(value = "起草组成员id") + private String draftingGroupSubId; + /**企业联系人id*/ + @Excel(name = "企业联系人id", width = 15) + @ApiModelProperty(value = "企业联系人id") + private String contactsId; + /**临时企业联系人id*/ + @Excel(name = "临时企业联系人id", width = 15) + @ApiModelProperty(value = "临时企业联系人id") + private String contactsTemporaryId; + /**临时企业联系人名称*/ + @Excel(name = "临时企业联系人名称", width = 15) + @ApiModelProperty(value = "临时企业联系人名称") + private String contactsTemporaryName; + /**联系人备注*/ + @Excel(name = "联系人备注", width = 15) + @ApiModelProperty(value = "联系人备注") + private String remarks; + /**序号*/ + @Excel(name = "序号", width = 15) + @ApiModelProperty(value = "序号") + private Integer orderNum; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /** + * 企业联系人性别3 + */ + @ApiModelProperty(value = "企业联系人性别") + @TableField(exist = false) + private String gender; + /** + * 企业联系人性别3 + */ + @ApiModelProperty(value = "企业联系人性别") + @TableField(exist = false) + private String gender_dictText; + /** + * 企业联系人职务3 + */ + @ApiModelProperty(value = "企业联系人职务") + @TableField(exist = false) + private String post; + /** + * 企业联系人电话3 + */ + @ApiModelProperty(value = "企业联系人电话") + @TableField(exist = false) + private String phone; + /** + * 企业联系人邮箱3 + */ + @ApiModelProperty(value = "企业联系人邮箱") + @TableField(exist = false) + private String email; + /** + * 企业联系人邮编3 + */ + @ApiModelProperty(value = "企业联系人邮编") + @TableField(exist = false) + private String postalCodeContacts; + /** + * 企业联系人地址 + */ + @ApiModelProperty(value = "企业联系人地址") + @TableField(exist = false) + private String contactAddress; + + /** + * 企业名称 + */ + @TableField(exist = false) + @ApiModelProperty(value = "企业名称") + private String companyName; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupMapper.java new file mode 100644 index 00000000..73bced4c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupMapper.java @@ -0,0 +1,22 @@ +package com.jero.drafting.mapper; + + +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.drafting.entity.PayDraftingGroup; +import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.project.vo.PayWorkingGroupVO; + +/** + *

+ * 起草组表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface PayDraftingGroupMapper extends BaseMapper { + + IPage queryPageList(Page page, PayDraftingGroup payDraftingGroup); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemContactsMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemContactsMapper.java new file mode 100644 index 00000000..d669acc0 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemContactsMapper.java @@ -0,0 +1,25 @@ +package com.jero.drafting.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 起草组成员企业联系人表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface PayDraftingGroupSubItemContactsMapper extends BaseMapper { + List getSubItemContacts(@Param("draftingGroupSubId")String id); + + /** + * 根据成员id获得主联系人 + */ + String getMasterContactsId(String draftingGroupSubItemId); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemMapper.java new file mode 100644 index 00000000..ee243d49 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupSubItemMapper.java @@ -0,0 +1,26 @@ +package com.jero.drafting.mapper; + +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.drafting.entity.PayDraftingGroupSubItem; + +/** + *

+ * 起草组成员表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface PayDraftingGroupSubItemMapper extends BaseMapper { + + /** + * 分页查询 + * @param page + * @param payDraftingGroupSubItem + * @param paymentDate + * @return + */ + IPage queryPageList(Page page, PayDraftingGroupSubItem payDraftingGroupSubItem, String paymentDate); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml new file mode 100644 index 00000000..55667753 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -0,0 +1,50 @@ + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemContactsMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemContactsMapper.xml new file mode 100644 index 00000000..add1acce --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemContactsMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml new file mode 100644 index 00000000..e25b491c --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -0,0 +1,40 @@ + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupService.java new file mode 100644 index 00000000..65cde88b --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupService.java @@ -0,0 +1,61 @@ +package com.jero.drafting.service; + +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.drafting.entity.PayDraftingGroup; +import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.vo.PayWorkingGroupVO; + +import java.util.List; + +/** + *

+ * 起草组表 服务类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface IPayDraftingGroupService extends IService { + + /** + * 分页查询 + * @param page + * @param payDraftingGroup + * @return + */ + IPage queryPageList(Page page, PayDraftingGroup payDraftingGroup); + + /** + * 给PayDraftingGroup 属性赋值 + * @param payDraftingGroup + */ + void setPayDraftingGroup(PayDraftingGroup payDraftingGroup); + + /** + * 根据工作组的id拿到工作组的名称 + * @param payWorkingGroupId + * @return + */ + PayWorkingGroup getPayWorkingGroupNameById(String payWorkingGroupId); + + /** + * 根据id删除 + * @param id + */ + void deleteById(String id); + + /** + * 批量删除 + * @param ids + */ + void deleteByIds(List ids); + + /** + * 复制 + * @param payDraftingGroup + */ + void copy(PayDraftingGroup payDraftingGroup); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java new file mode 100644 index 00000000..632c9de8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java @@ -0,0 +1,16 @@ +package com.jero.drafting.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; + +/** + *

+ * 起草组成员企业联系人表 服务类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface IPayDraftingGroupSubItemContactsService extends IService { +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java new file mode 100644 index 00000000..6aa5d1cd --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java @@ -0,0 +1,59 @@ +package com.jero.drafting.service; + +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.drafting.entity.PayDraftingGroupSubItem; +import com.jero.project.entity.PayWorkingGroupSubItem; + +import javax.servlet.http.HttpServletRequest; + +/** + *

+ * 起草组成员表 服务类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface IPayDraftingGroupSubItemService extends IService { + + /** + * 分页查询 + * @param page + * @param payDraftingGroupSubItem + * @param paymentDate + * @return + */ + IPage queryPageList(Page page, PayDraftingGroupSubItem payDraftingGroupSubItem, String paymentDate); + + /** + * 添加 + * @param payDraftingGroupSubItem + */ + void addPayDraftingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem); + + /** + * 根据id删除 + * @param id + */ + void delete(String id); + + /** + * 批量删除 + * @param ids + */ + void deleteBatch(String ids); + + /** + * 编辑 + * @param payDraftingGroupSubItem + */ + void editPayWorkingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem); + + /** + * excel导入 + * @param request + */ + void importExcel(HttpServletRequest request); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java new file mode 100644 index 00000000..d5c1cf28 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -0,0 +1,219 @@ +package com.jero.drafting.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.api.vo.Result; +import com.jero.common.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.mapper.PayDraftingGroupMapper; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import com.jero.drafting.vo.PayDraftingGroupVo; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysUserServiceImpl; +import com.jero.project.entity.PayWorkingGroup; +import com.jero.project.entity.PayWorkingGroupSubItem; +import com.jero.project.service.IPayWorkingGroupService; +import com.jero.project.service.IPayWorkingGroupSubItemService; +import com.jero.project.vo.PayWorkingGroupVO; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + *

+ * 起草组表 服务实现类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Service +@Transactional +public class PayDraftingGroupServiceImpl extends ServiceImpl implements IPayDraftingGroupService { + + @Resource + private PayDraftingGroupMapper payDraftingGroupMapper; + @Resource + private ISysUserService sysUserService; + @Resource + private IPayWorkingGroupService payWorkingGroupService; + @Resource + private RolePermissionService rolePermissionService; + @Resource + private IPayDraftingGroupSubItemService payDraftingGroupSubItemService; + + + /** + * 分页查询 + * + * @param page + * @param payDraftingGroup + * @return + */ + @Override + public IPage queryPageList(Page page, PayDraftingGroup payDraftingGroup) { + return payDraftingGroupMapper.queryPageList(page, payDraftingGroup); + } + + /** + * 获取负责人A的名称 + * + * @param payDraftingGroup + */ + @Override + public void setPayDraftingGroup(PayDraftingGroup payDraftingGroup) { + // 负责人A名称 + SysUser principalIdA = sysUserService.getById(payDraftingGroup.getPrincipalIdA()); + if (Objects.isNull(principalIdA)) { + throw new JeroBootException("负责人A不存在！"); + } + payDraftingGroup.setPrincipalNameA(principalIdA.getRealname()); + // 负责人B名称 + SysUser principalIdB = sysUserService.getById(payDraftingGroup.getPrincipalIdB()); + if (Objects.isNull(principalIdB)) { + throw new JeroBootException("负责人B不存在！"); + } + payDraftingGroup.setPrincipalNameB(principalIdB.getRealname()); + + } + + /** + * 根据工作组的id拿到工作组的名称 + * + * @param payWorkingGroupId + * @return + */ + @Override + public PayWorkingGroup getPayWorkingGroupNameById(String payWorkingGroupId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayWorkingGroup::getId, payWorkingGroupId); + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getOne(queryWrapper); + return payWorkingGroup; + } + + /** + * 根据id删除 + * + * @param id + */ + @Override + public void deleteById(String id) { + PayDraftingGroup payDraftingGroupOld = getById(id); + if (Objects.isNull(payDraftingGroupOld)) { + throw new JeroBootException("该起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("draftingGroupProject:delete") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) { + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组项目不可操作！"); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); + List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); + } + + removeById(id); + LambdaUpdateWrapper updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayDraftingGroupSubItem.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); + payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem); + } + + /** + * 批量删除 + * + * @param ids + */ + @Override + public void deleteByIds(List ids) { + StringBuilder sb = new StringBuilder(); + StringBuilder sb1 = new StringBuilder(); + ids.forEach(p -> { + PayDraftingGroup payDraftingGroupOld = getById(p); + if (Objects.isNull(payDraftingGroupOld)) { + throw new JeroBootException("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("draftingGroupProject:batchDel") && !Objects.equals(payDraftingGroupOld.getPrincipalIdA(), sysUser.getId())) { + sb.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组项目不可操作！
"); + } + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p); + List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { + sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayDraftingGroupSubItem.in(PayDraftingGroupSubItem::getDraftingGroupId, ids); + payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem); + } + + /** + * 复制 + * + * @param payDraftingGroup + */ + @Override + public void copy(PayDraftingGroup payDraftingGroup) { + PayDraftingGroup payDraftingGroupOld = getById(payDraftingGroup.getId()); + if(Objects.isNull(payDraftingGroupOld)){ + throw new JeroBootException("起草组不存在！"); + } + if(payDraftingGroup.getDraftingGroupProject().length() == 50){ + throw new JeroBootException("起草组名称长度为50位，不可复制，请修改之后再复制！"); + } + String str = payDraftingGroup.getDraftingGroupProject() + "-副本"; + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(PayDraftingGroup::getDraftingGroupProject,str); + List listPayDraftingGroup = list(queryWrapper); + if(!CollectionUtils.isEmpty(listPayDraftingGroup)){ + String rex = "^[0-9]*[1-9][0-9]*$"; + List list = new ArrayList<>(); + String finalStr = str; + listPayDraftingGroup.forEach(p->{ + String project = p.getDraftingGroupProject(); + if(!StringUtils.isEmpty(project) && !Objects.equals(p.getId(),payDraftingGroupOld.getId())){ + String projectNew = project.substring(finalStr.length()); + Pattern pa = Pattern.compile(rex); + Matcher m = pa.matcher(projectNew); + if (m.find()){ + list.add(Integer.parseInt(projectNew)); + } + } + }); + if(!CollectionUtils.isEmpty(list)){ + int m = list.stream().max(Comparator.comparing(Integer::intValue)).get(); + str = str + (m + 1); + } + }else{ + str = str + 1; + } + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java new file mode 100644 index 00000000..43047b91 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java @@ -0,0 +1,24 @@ +package com.jero.drafting.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.mapper.PayDraftingGroupSubItemContactsMapper; +import com.jero.drafting.mapper.PayDraftingGroupSubItemMapper; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + *

+ * 起草组成员企业联系人表 服务实现类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Service +public class PayDraftingGroupSubItemContactsServiceImpl extends ServiceImpl implements IPayDraftingGroupSubItemContactsService { +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java new file mode 100644 index 00000000..7040d13a --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -0,0 +1,645 @@ +package com.jero.drafting.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.exception.JeroBootException; +import com.jero.common.service.RolePermissionService; +import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.ImportExcelUtil; +import com.jero.common.util.ValidUtil; +import com.jero.company.entity.PayCompanyManagement; +import com.jero.company.entity.PayContactsManagement; +import com.jero.company.service.IPayCompanyManagementService; +import com.jero.company.service.IPayContactsManagementService; +import com.jero.contract.service.IPayIncomeContractService; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.mapper.PayDraftingGroupSubItemContactsMapper; +import com.jero.drafting.mapper.PayDraftingGroupSubItemMapper; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import com.jero.meeting.service.IPayMeetingRemindRecordService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.pack.entity.PayPackCompanyProject; +import com.jero.pack.service.IPayPackCompanyProjectService; +import com.jero.temporary.entity.PayCompanyManagementTemporary; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayCompanyManagementTemporaryService; +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.jeecgframework.poi.excel.ExcelImportCheckUtil; +import org.jeecgframework.poi.excel.ExcelImportUtil; +import org.jeecgframework.poi.excel.entity.ImportParams; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import org.springframework.web.multipart.MultipartHttpServletRequest; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.*; +import java.util.stream.Collectors; + +/** + *

+ * 起草组成员表 服务实现类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Service +@Transactional +public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl implements IPayDraftingGroupSubItemService { + + @Resource + private PayDraftingGroupSubItemMapper payDraftingGroupSubItemMapper; + @Resource + private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; + @Resource + private IPayDraftingGroupService payDraftingGroupService; + @Resource + private IPayDraftingGroupSubItemService payDraftingGroupSubItemService; + @Resource + private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService; + @Resource + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + @Resource + private ISysUserService sysUserService; + @Resource + private IPayCompanyManagementService payCompanyManagementService; + @Resource + private IPayContactsManagementService payContactsManagementService; + @Resource + private RolePermissionService rolePermissionService; + @Resource + private PayDraftingGroupSubItemContactsMapper payDraftingGroupSubItemContactsMapper; + + /** + * 分页查询 + * + * @param page + * @param payDraftingGroupSubItem + * @param paymentDate + * @return + */ + @Override + public IPage queryPageList(Page page, PayDraftingGroupSubItem payDraftingGroupSubItem, String paymentDate) { + IPage payDraftingGroupSubItemIPage = payDraftingGroupSubItemMapper.queryPageList(page, payDraftingGroupSubItem, paymentDate); + List records = payDraftingGroupSubItemIPage.getRecords(); + if (!CollectionUtils.isEmpty(records)) { + // 获取企业联系人 + List listIds = records.stream().map(PayDraftingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, listIds); + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryDraftingGroupSubItemContacts); + + for (PayDraftingGroupSubItem draftingGroupSubItem : records) { + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + List pdg = payDraftingGroupSubItemContactsList.stream().filter(p -> Objects.equals(p.getDraftingGroupSubId(), draftingGroupSubItem.getId())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(pdg)) { + pdg.sort(Comparator.comparing(PayDraftingGroupSubItemContacts::getOrderNum)); + draftingGroupSubItem.setContactsTemporaryNameOne(pdg.get(0).getContactsTemporaryName()); + draftingGroupSubItem.setPayDraftingGroupSubItemContactsList(pdg); + } else { + draftingGroupSubItem.setContactsTemporaryNameOne(""); + draftingGroupSubItem.setPayDraftingGroupSubItemContactsList(null); + } + } else { + draftingGroupSubItem.setContactsTemporaryNameOne(""); + draftingGroupSubItem.setPayDraftingGroupSubItemContactsList(null); + } + } + } + return payDraftingGroupSubItemIPage; + } + + /** + * 添加 + * + * @param payDraftingGroupSubItem + */ + @Override + public void addPayDraftingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem) { + // 验证企业联系人list中是否有重复的联系人 + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + long oldNum = payDraftingGroupSubItemContactsList.size(); + long newNum = payDraftingGroupSubItemContactsList.stream().map(PayDraftingGroupSubItemContacts::getContactsId).collect(Collectors.toList()).stream().distinct().count(); + if (oldNum != newNum) { + throw new JeroBootException("企业联系人重复"); + } + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if (Objects.isNull(payDraftingGroup)) { + throw new JeroBootException("起草组不存在！"); + } + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, payDraftingGroupSubItem.getDraftingGroupId()); + queryWrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, payDraftingGroupSubItem.getChargeCompanyId()); + PayDraftingGroupSubItem payDraftingGroupSubItemNew = payDraftingGroupSubItemService.getOne(queryWrapper); + // 企业和联系人同时存在，则校验不通过 + if (!Objects.isNull(payDraftingGroupSubItemNew)) { + throw new JeroBootException("起草组成员单位已存在！"); + } + } catch (Exception e) { + throw new JeroBootException("起草组成员单位已存在！"); + } + setPayDraftingGroupSubItemAdd(payDraftingGroupSubItem); + payDraftingGroupSubItemService.save(payDraftingGroupSubItem); + List listPayDraftingGroupSubItemContactsNew = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + // 添加联系人表 + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) { + for (int i = 0; i < listPayDraftingGroupSubItemContactsNew.size(); i++) { + listPayDraftingGroupSubItemContactsNew.get(i).setOrderNum(i + 1); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupId(payDraftingGroupSubItem.getDraftingGroupId()); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupSubId(payDraftingGroupSubItem.getId()); + } + payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContactsNew); + } + SysUser sysUserInfo = sysUserService.getById(payDraftingGroup.getPrincipalIdA()); + if (Objects.isNull(sysUserInfo)) { + throw new JeroBootException("负责人不存在!"); + } + } + + /** + * 插入企业信息，联系人信息到临时表，更新项目记录 + * + * @param payDraftingGroupSubItem + */ + private void setPayDraftingGroupSubItemAdd(PayDraftingGroupSubItem payDraftingGroupSubItem) { + // 企业 + PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payDraftingGroupSubItem.getChargeCompanyId()); + if (Objects.isNull(chargeCompanyName)) { + throw new JeroBootException("企业名称为空！"); + } + payDraftingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId()); + payDraftingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName()); + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + for (int i = 0; i < payDraftingGroupSubItemContactsList.size(); i++) { + // 企业联系人 + PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payDraftingGroupSubItemContactsList.get(i).getContactsId()); + if (Objects.isNull(contactsName)) { + throw new JeroBootException("企业联系人" + (i + 1) + "名称为空！"); + } + payDraftingGroupSubItemContactsList.get(i).setContactsTemporaryId(contactsName.getId()); + payDraftingGroupSubItemContactsList.get(i).setContactsTemporaryName(contactsName.getName()); + } + } + } + + /** + * 根据id删除 + * + * @param id + */ + @Override + public void delete(String id) { + if (StringUtils.isBlank(id)) { + throw new JeroBootException("id不能为空!"); + } + deleteProject(id, "draftingGroupMember:delete"); + payDraftingGroupSubItemService.removeById(id); + // 删除成员企业联系人 + LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, id); + payDraftingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); + } + + /** + * 删除联系信息 + * + * @param id + * @param perm + */ + private void deleteProject(String id, String perm) { + PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(id); + if (Objects.isNull(payDraftingGroupSubItem)) { + throw new JeroBootException("该成员不存在!"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if (Objects.isNull(payDraftingGroup)) { + throw new JeroBootException("起草组不存在!"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission(perm) + && !Objects.equals(payDraftingGroup.getPrincipalIdA(), sysUser.getId()) + && !Objects.equals(payDraftingGroup.getPrincipalIdB(), sysUser.getId())) { + throw new JeroBootException("起草组成员不可操作！"); + } + // 删除企业联系人临时数据 + payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItem.getChargeCompanyTemporaryId()); + List subItemContacts = payDraftingGroupSubItemContactsMapper.getSubItemContacts(id); + List temporaryIds = subItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + payContactsManagementTemporaryService.removeByIds(temporaryIds); + } + + /** + * 批量删除 + * + * @param ids + */ + @Override + public void deleteBatch(String ids) { + if (StringUtils.isBlank(ids)) { + throw new JeroBootException("id不能为空!"); + } + String[] s = ids.split(","); + for (String s1 : s) { + if (StringUtils.isBlank(s1)) { + throw new JeroBootException("id不能为空!"); + } + deleteProject(s1, "draftingGroupMember:batchDel"); + } + payDraftingGroupSubItemService.removeByIds(Arrays.asList(ids.split(","))); + // 删除成员企业联系人 + LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, Arrays.asList(ids.split(","))); + payDraftingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); + } + + /** + * 编辑 + * + * @param payDraftingGroupSubItem + */ + @Override + public void editPayWorkingGroupSubItem(PayDraftingGroupSubItem payDraftingGroupSubItem) { + String draftingGroupSubItemId = payDraftingGroupSubItem.getId(); + PayDraftingGroupSubItem payDraftingGroupSubItemOld = payDraftingGroupSubItemService.getById(draftingGroupSubItemId); + if (Objects.isNull(payDraftingGroupSubItemOld)) { + throw new JeroBootException("项目不存在！"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItemOld.getDraftingGroupId()); + if (Objects.isNull(payDraftingGroup)) { + throw new JeroBootException("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if (!rolePermissionService.getRolePermission("draftingGroupMember:edit") + && !Objects.equals(payDraftingGroup.getPrincipalIdA(), sysUser.getId()) + && !Objects.equals(payDraftingGroup.getPrincipalIdB(), sysUser.getId())) { + throw new JeroBootException("起草组成员不可操作！"); + } + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, payDraftingGroupSubItem.getDraftingGroupId()); + queryWrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, payDraftingGroupSubItem.getChargeCompanyId()); + PayDraftingGroupSubItem payDraftingGroupSubItemNew = payDraftingGroupSubItemService.getOne(queryWrapper); + // 企业和联系人同时存在，则校验不通过 + if (!Objects.isNull(payDraftingGroupSubItemNew) && !Objects.equals(payDraftingGroupSubItemNew.getId(), draftingGroupSubItemId)) { + throw new JeroBootException("起草组成员单位已存在！"); + } + } catch (Exception e) { + throw new JeroBootException("起草组成员单位已存在！"); + } + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, payDraftingGroupSubItemOld.getId()); + List listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)) { + payDraftingGroupSubItemOld.setPayDraftingGroupSubItemContactsList(listPayDraftingGroupSubItemContacts); + } + setPayDraftingGroupSubItemEdit(payDraftingGroupSubItem, payDraftingGroupSubItemOld); + List listPayDraftingGroupSubItemContactsNew = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + // 添加联系人表 + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) { + // 先删除之前的企业联系人 + LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubItemId); + payDraftingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); + // 添加新的企业联系人 + for (int i = 0; i < listPayDraftingGroupSubItemContactsNew.size(); i++) { + listPayDraftingGroupSubItemContactsNew.get(i).setOrderNum(i + 1); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupSubId(draftingGroupSubItemId); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupId(payDraftingGroupSubItem.getDraftingGroupId()); + } + payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContactsNew); + } + payDraftingGroupSubItemService.updateById(payDraftingGroupSubItem); + } + + /** + * 插入企业信息，联系人信息到临时表，更新项目记录 + * + * @param payDraftingGroupSubItem + * @param payDraftingGroupSubItemOld + */ + private void setPayDraftingGroupSubItemEdit(PayDraftingGroupSubItem payDraftingGroupSubItem, PayDraftingGroupSubItem payDraftingGroupSubItemOld) { + if (!Objects.equals(payDraftingGroupSubItemOld.getChargeCompanyTemporaryId(), payDraftingGroupSubItem.getChargeCompanyId())) { + // 企业信息 + PayCompanyManagementTemporary chargeCompanyName = payCompanyManagementTemporaryService.insertCompanyManagementTemporary(payDraftingGroupSubItem.getChargeCompanyId()); + if (Objects.isNull(chargeCompanyName)) { + throw new JeroBootException("企业名称为空！"); + } + payDraftingGroupSubItem.setChargeCompanyTemporaryId(chargeCompanyName.getId()); + payDraftingGroupSubItem.setChargeCompanyTemporaryName(chargeCompanyName.getCompanyName()); + payCompanyManagementTemporaryService.removeById(payDraftingGroupSubItemOld.getChargeCompanyTemporaryId()); + } else { + payDraftingGroupSubItem.setChargeCompanyId(payDraftingGroupSubItemOld.getChargeCompanyId()); + } + // 企业联系人信息 + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + // 删除临时表历史记录 + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList())) { + List list = payDraftingGroupSubItemOld.getPayDraftingGroupSubItemContactsList().stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + payContactsManagementTemporaryService.removeByIds(list); + } + // 删除联系人记录 + LambdaUpdateWrapper updatePayDraftingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, payDraftingGroupSubItem.getId()); + payDraftingGroupSubItemContactsService.remove(updatePayDraftingGroupSubItemContacts); + // 新增 + for (int i = 0; i < payDraftingGroupSubItemContactsList.size(); i++) { + // 企业联系人 + PayContactsManagementTemporary contactsName = payContactsManagementTemporaryService.insertContactsManagementTemporary(payDraftingGroupSubItemContactsList.get(i).getContactsId()); + if (Objects.isNull(contactsName)) { + throw new JeroBootException("企业联系人" + (i + 1) + "名称为空！"); + } + payDraftingGroupSubItemContactsList.get(i).setContactsTemporaryId(contactsName.getId()); + payDraftingGroupSubItemContactsList.get(i).setContactsTemporaryName(contactsName.getName()); + } + } + } + + /** + * excel导入 + * + * @param request + */ + @Override + public void importExcel(HttpServletRequest request) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + String draftGroupId; + try { + draftGroupId = multipartRequest.getParameter("draftGroupId"); + }catch (Exception e){ + log.error("获取起草组id异常",e); + throw new JeroBootException("起草组id不能为空 ！"); + } + if(StringUtils.isBlank(draftGroupId)){ + throw new JeroBootException("起草组id不能为空 ！"); + } + StringBuilder msg = new StringBuilder(); + Map fileMap = multipartRequest.getFileMap(); + for (Map.Entry entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue();// 获取上传文件对象 + // 校验文件是否为excel + if(!ImportExcelUtil.checkExcelFile(file)){ + throw new JeroBootException("请导入excel文件！"); + } + ImportParams params = new ImportParams(); + params.setTitleRows(1); + params.setHeadRows(1); + try { + Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), PayDraftingGroupSubItem.class, params); + if(!t){ + throw new JeroBootException("文件格式有误,请下载模板后上传！"); + } + } catch (Exception e) { + e.printStackTrace(); + throw new JeroBootException("文件格式有误,请下载模板后上传！"); + } + try { + List list = ExcelImportUtil.importExcel(file.getInputStream(), PayDraftingGroupSubItem.class, params); + if(!CollectionUtils.isEmpty(list)){ + // 校验重复成员的集合 + List listCompanyAndContacts = new ArrayList<>(); + // 获取excel中的企业名称 + List listCompanyName = list.stream().map(PayDraftingGroupSubItem::getChargeCompanyTemporaryName).collect(Collectors.toList()); + // 获取excel企业信息 + LambdaQueryWrapper companyWrapper = new LambdaQueryWrapper<>(); + companyWrapper.in(PayCompanyManagement::getCompanyName,listCompanyName); + List listCompanyInfo = payCompanyManagementService.list(companyWrapper); + List listContactsName = new ArrayList<>(); + // 获取excel中联系人1名称 + List listContactsName1 = list.stream().map(PayDraftingGroupSubItem::getContactsNameOne).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName1)){ + listContactsName.addAll(listContactsName1); + } + // 获取excel中联系人2名称 + List listContactsName2 = list.stream().map(PayDraftingGroupSubItem::getContactsNameTwo).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName2)){ + listContactsName.addAll(listContactsName2); + } + // 获取excel中联系人3名称 + List listContactsName3 = list.stream().map(PayDraftingGroupSubItem::getContactsNameThree).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName3)){ + listContactsName.addAll(listContactsName3); + } + // 获取excel中联系人4名称 + List listContactsName4 = list.stream().map(PayDraftingGroupSubItem::getContactsNameFour).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName4)){ + listContactsName.addAll(listContactsName4); + } + // 获取excel中联系人5名称 + List listContactsName5 = list.stream().map(PayDraftingGroupSubItem::getContactsNameFive).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName5)){ + listContactsName.addAll(listContactsName5); + } + // 获取excel中联系人6名称 + List listContactsName6 = list.stream().map(PayDraftingGroupSubItem::getContactsNameSix).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName6)){ + listContactsName.addAll(listContactsName6); + } + // 获取excel中联系人7名称 + List listContactsName7 = list.stream().map(PayDraftingGroupSubItem::getContactsNameSeven).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName7)){ + listContactsName.addAll(listContactsName7); + } + // 获取excel中联系人8名称 + List listContactsName8 = list.stream().map(PayDraftingGroupSubItem::getContactsNameEight).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName8)){ + listContactsName.addAll(listContactsName8); + } + // 获取excel中联系人9名称 + List listContactsName9 = list.stream().map(PayDraftingGroupSubItem::getContactsNameNine).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName9)){ + listContactsName.addAll(listContactsName9); + } + // 获取excel中联系人10名称 + List listContactsName10 = list.stream().map(PayDraftingGroupSubItem::getContactsNameTen).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(listContactsName10)){ + listContactsName.addAll(listContactsName10); + } + // 获取excel联系人信息 + LambdaQueryWrapper contactsWrapper = new LambdaQueryWrapper<>(); + contactsWrapper.in(PayContactsManagement::getName,listContactsName); + List listContactsInfo = payContactsManagementService.list(contactsWrapper); + + // 获取起草组信息 + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftGroupId); + if(Objects.isNull(payDraftingGroup)){ + msg.append("起草组不存在 ！"); + } + if(StringUtils.isBlank(msg)) { + // 获取工作组成员 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(PayDraftingGroupSubItem::getDraftingGroupId, draftGroupId); + List listData = payDraftingGroupSubItemService.list(query); + list.forEach(p -> { + p.setDraftingGroupId(draftGroupId); + int count = list.indexOf(p); + // 校验企业名称 + List listCompany = new ArrayList<>(); + if (StringUtils.isBlank(p.getChargeCompanyTemporaryName())) { + msg.append("第").append(count + 3).append("行:企业名称不能为空，请修改。
"); + } else { + // 通过企业名称获取企业id + listCompany = listCompanyInfo.stream().filter(item -> + Objects.equals(item.getCompanyName(), p.getChargeCompanyTemporaryName())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(listCompany)) { + msg.append("第").append(count + 3).append("行:企业名称不存在，请修改。
"); + } else { + p.setChargeCompanyId(listCompany.get(0).getId()); + } + } + // 校验工作组成员单位是否已存在(是否重复) + if (!StringUtils.isBlank(p.getChargeCompanyId())) { + List listDateNew = listData.stream().filter(item -> Objects.equals(p.getChargeCompanyId(), item.getChargeCompanyId())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(listDateNew)) { + msg.append("第").append(count + 3).append("行:工作组成员单位已存在，请修改。
"); + } + } + // 校验重复 + List listPayDraftingGroupSubItemContacts = checkRepeat(p,msg,count,listCompany,listContactsInfo); + p.setPayDraftingGroupSubItemContactsList(listPayDraftingGroupSubItemContacts); + // 校验成员唯一性 + List listCompanyAndContactsNew = listCompanyAndContacts.stream().filter(item -> Objects.equals(p.getChargeCompanyTemporaryName(), item.getChargeCompanyTemporaryName())).collect(Collectors.toList()); + if (!CollectionUtils.isEmpty(listCompanyAndContactsNew)) { + msg.append("第").append(count + 3).append("行:工作组成员单位重复出现，请修改。
"); + } + listCompanyAndContacts.add(p); + // 校验字段值 + StringBuilder s = ValidUtil.validateExcel(p, (count + 3)); + if (!StringUtils.isBlank(s)) { + msg.append(s); + } + }); + if (StringUtils.isBlank(msg)) { + // 拷贝企业，联系人 + list.forEach(this::setPayDraftingGroupSubItemAdd); + // 更新数据 + payDraftingGroupSubItemService.saveBatch(list); + list.forEach(p->{ + String draftingGroupSubItemId = p.getId(); + List listPayDraftingGroupSubItemContacts = p.getPayDraftingGroupSubItemContactsList(); + if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)){ + for (int i = 0; i < listPayDraftingGroupSubItemContacts.size(); i++) { + listPayDraftingGroupSubItemContacts.get(i).setDraftingGroupId(p.getDraftingGroupId()); + listPayDraftingGroupSubItemContacts.get(i).setDraftingGroupSubId(draftingGroupSubItemId); + listPayDraftingGroupSubItemContacts.get(i).setOrderNum(i + 1); + } + payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContacts); + } + }); + } + } + } + }catch (Exception e){ + log.error(e.getMessage(),e); + throw new JeroBootException("文件导入失败！"); + } finally { + try { + file.getInputStream().close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + if(!StringUtils.isBlank(msg)){ + throw new JeroBootException(msg.toString()); + } + } + } + + /** + * 验证重复 + * @param p + * @param msg + * @param count 行数 + * @param listCompany 企业集合 + * @param listContactsInfo 联系人集合 + * @return + */ + private List checkRepeat(PayDraftingGroupSubItem p, StringBuilder msg, int count, List listCompany, List listContactsInfo) { + List list = new ArrayList<>(); + HashMap map = new HashMap<>(); + if(!StringUtils.isBlank(p.getContactsNameOne())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameOne(),1,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + }else{ + msg.append("第").append(count + 3).append("行:企业联系人1不能为空，请修改。
"); + } + + if(!StringUtils.isBlank(p.getContactsNameTwo())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTwo(),2,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameThree())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameThree(),3,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFour())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFour(),4,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameFive())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameFive(),5,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSix())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSix(),6,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameSeven())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameSeven(),7,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameEight())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameEight(),8,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameNine())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameNine(),9,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + if(!StringUtils.isBlank(p.getContactsNameTen())){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = setContactsId(msg,p.getContactsNameTen(),10,count,listCompany,listContactsInfo,map); + list.add(payDraftingGroupSubItemContacts); + } + return list; + } + + private PayDraftingGroupSubItemContacts setContactsId(StringBuilder msg,String name,int num,int count,List listCompany,List listContactsInfo,HashMap map){ + PayDraftingGroupSubItemContacts payDraftingGroupSubItemContacts = new PayDraftingGroupSubItemContacts(); + if(map.containsKey(name)){ + int c = map.get(name); + msg.append("第").append(count + 3).append("行:企业联系人").append(c).append("与企业联系人").append(num).append("重复，请修改。
"); + }else{ + map.put(name,num); + } + if (!CollectionUtils.isEmpty(listCompany)) { + // 通过联系人获取联系人id + List listContacts = listContactsInfo.stream().filter(item -> + Objects.equals(item.getName(), name) + && Objects.equals(item.getCompanyId(), listCompany.get(0).getId())).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(listContacts)) { + msg.append("第").append(count + 3).append("行:该企业下不存在企业联系人").append(num).append("，请修改。
"); + } else { + payDraftingGroupSubItemContacts.setContactsId(listContacts.get(0).getId()); + } + } + return payDraftingGroupSubItemContacts; + } +} \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java new file mode 100644 index 00000000..89a8e75e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupSubItemExcel.java @@ -0,0 +1,257 @@ +package com.jero.drafting.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.math.BigDecimal; + + +@Data +public class PayDraftingGroupSubItemExcel implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 临时成员单位 + */ + @Excel(name = "成员单位", width = 15) + @ApiModelProperty(value = "临时成员单位") + private String chargeCompanyTemporaryName; + + /** + * 备注 + */ + @Excel(name = "备注", width = 15) + @ApiModelProperty(value = "备注") + private String remarks; + /** + * 企业联系人1名称 + */ + @Excel(name = "企业联系人1", width = 15) + @ApiModelProperty(value = "企业联系人1名称") + private String contactsNameOne; + + /** + * 企业联系人1手机号 + */ + @Excel(name = "企业联系人1手机号", width = 17) + private String contactsPhoneOne; + + /** + * 企业联系人1邮箱 + */ + @Excel(name = "企业联系人1邮箱", width = 15) + private String contactsEmailOne; + + /** + * 联系人1备注 + */ + @Excel(name = "联系人1备注", width = 15) + @ApiModelProperty(value = "联系人1备注") + private String remarksOne; + /** + * 企业联系人2名称 + */ + @Excel(name = "企业联系人2", width = 15) + @ApiModelProperty(value = "企业联系人2名称") + private String contactsNameTwo; + /** + * 企业联系人2手机号 + */ + @Excel(name = "企业联系人2手机号", width = 17) + private String contactsPhoneTwo; + /** + * 企业联系人2邮箱 + */ + @Excel(name = "企业联系人2邮箱", width = 15) + private String contactsEmailTwo; + /** + * 联系人2备注 + */ + @Excel(name = "联系人2备注", width = 15) + @ApiModelProperty(value = "联系人2备注") + private String remarksTwo; + /** + * 企业联系人3名称 + */ + @Excel(name = "企业联系人3", width = 15) + @ApiModelProperty(value = "企业联系人3名称") + private String contactsNameThree; + /** + * 企业联系人3手机号 + */ + @Excel(name = "企业联系人3手机号", width = 17) + private String contactsPhoneThree; + /** + * 企业联系人3邮箱 + */ + @Excel(name = "企业联系人3邮箱", width = 15) + private String contactsEmailThree; + /** + * 联系人3备注 + */ + @Excel(name = "联系人3备注", width = 15) + @ApiModelProperty(value = "联系人3备注") + private String remarksThree; + /** + * 企业联系人4名称 + */ + @Excel(name = "企业联系人4", width = 15) + @ApiModelProperty(value = "企业联系人4名称") + private String contactsNameFour; + /** + * 企业联系人4手机号 + */ + @Excel(name = "企业联系人4手机号", width = 17) + private String contactsPhoneFour; + /** + * 企业联系人4邮箱 + */ + @Excel(name = "企业联系人4邮箱", width = 15) + private String contactsEmailFour; + /** + * 联系人4备注 + */ + @Excel(name = "联系人4备注", width = 15) + @ApiModelProperty(value = "联系人4备注") + private String remarksFour; + /** + * 企业联系人5名称 + */ + @Excel(name = "企业联系人5", width = 15) + @ApiModelProperty(value = "企业联系人5名称") + private String contactsNameFive; + /** + * 企业联系人5手机号 + */ + @Excel(name = "企业联系人5手机号", width = 17) + private String contactsPhoneFive; + /** + * 企业联系人5邮箱 + */ + @Excel(name = "企业联系人5邮箱", width = 15) + private String contactsEmailFive; + /** + * 联系人5备注 + */ + @Excel(name = "联系人5备注", width = 15) + @ApiModelProperty(value = "联系人5备注") + private String remarksFive; + /** + * 企业联系人6名称 + */ + @Excel(name = "企业联系人6", width = 15) + @ApiModelProperty(value = "企业联系人6名称") + private String contactsNameSix; + /** + * 企业联系人6手机号 + */ + @Excel(name = "企业联系人6手机号", width = 17) + private String contactsPhoneSix; + /** + * 企业联系人6邮箱 + */ + @Excel(name = "企业联系人6邮箱", width = 15) + private String contactsEmailSix; + /** + * 联系人6备注 + */ + @Excel(name = "联系人6备注", width = 15) + @ApiModelProperty(value = "联系人6备注") + private String remarksSix; + /** + * 企业联系人7名称 + */ + @Excel(name = "企业联系人7", width = 15) + @ApiModelProperty(value = "企业联系人7名称") + private String contactsNameSeven; + /** + * 企业联系人7手机号 + */ + @Excel(name = "企业联系人7手机号", width = 17) + private String contactsPhoneSeven; + /** + * 企业联系人7邮箱 + */ + @Excel(name = "企业联系人7邮箱", width = 15) + private String contactsEmailSeven; + /** + * 联系人7备注 + */ + @Excel(name = "联系人7备注", width = 15) + @ApiModelProperty(value = "联系人7备注") + private String remarksSeven; + /** + * 企业联系人8名称 + */ + @Excel(name = "企业联系人8", width = 15) + @ApiModelProperty(value = "企业联系人8名称") + private String contactsNameEight; + /** + * 企业联系人8手机号 + */ + @Excel(name = "企业联系人8手机号", width = 17) + private String contactsPhoneEight; + /** + * 企业联系人8邮箱 + */ + @Excel(name = "企业联系人8邮箱", width = 15) + private String contactsEmailEight; + /** + * 联系人8备注 + */ + @Excel(name = "联系人8备注", width = 15) + @ApiModelProperty(value = "联系人8备注") + private String remarksEight; + /** + * 企业联系人9名称 + */ + @Excel(name = "企业联系人9", width = 15) + @ApiModelProperty(value = "企业联系人9名称") + private String contactsNameNine; + /** + * 企业联系人9手机号 + */ + @Excel(name = "企业联系人9手机号", width = 17) + private String contactsPhoneNine; + /** + * 企业联系人9邮箱 + */ + @Excel(name = "企业联系人9邮箱", width = 15) + private String contactsEmailNine; + /** + * 联系人9备注 + */ + @Excel(name = "联系人9备注", width = 15) + @ApiModelProperty(value = "联系人9备注") + private String remarksNine; + /** + * 企业联系人10名称 + */ + @Excel(name = "企业联系人10", width = 15) + @ApiModelProperty(value = "企业联系人10名称") + private String contactsNameTen; + /** + * 企业联系人10手机号 + */ + @Excel(name = "企业联系人10手机号", width = 17) + private String contactsPhoneTen; + /** + * 企业联系人10邮箱 + */ + @Excel(name = "企业联系人10邮箱", width = 15) + private String contactsEmailTen; + /** + * 联系人10备注 + */ + @Excel(name = "联系人10备注", width = 15) + @ApiModelProperty(value = "联系人10备注") + private String remarksTen; + + @Excel(name = "标签名称", width = 15) + @ApiModelProperty(value = "标签") + private String label; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java new file mode 100644 index 00000000..af998ed1 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java @@ -0,0 +1,29 @@ +package com.jero.drafting.vo; + +import com.jero.drafting.entity.PayDraftingGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +public class PayDraftingGroupVo extends PayDraftingGroup { + /** + * 打包（1：是，0：否） + */ + private String pack; + /** + * 项目id + */ + private String projectId; + /** + * 当前登录人是否可以操作(1为可操作，2为不可操作) + */ + private Integer checkoutOperation; + + /** + * 工作组名称 + */ + private String workingGroupName; +} diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 75ce7650..f9b4c0fd 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -158,7 +158,7 @@ spring: min-idle: 0 #最小等待连接中的数量,设 0 为没有限制 shutdown-timeout: 100ms # password: hzwlsoft.com - password: 123456 +# password: 123456 # port: 4780 port: 6379 From da941fef86dc41530dfca6831f295a91c9192a9f Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jan 2024 11:34:02 +0800 Subject: [PATCH 02/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84-=E5=9C=A8=E7=A0=94=E9=A1=B9=E7=9B=AE=E7=9A=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4=E7=AD=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...raftingGroupResearchProjectController.java | 215 ++++++++++++++++++ .../PayDraftingGroupResearchProject.java | 84 +++++++ .../entity/PayDraftingGroupSubItem.java | 7 - ...PayDraftingGroupResearchProjectMapper.java | 27 +++ .../PayDraftingGroupResearchProjectMapper.xml | 35 +++ ...ayDraftingGroupResearchProjectService.java | 42 ++++ ...aftingGroupResearchProjectServiceImpl.java | 65 ++++++ 7 files changed, 468 insertions(+), 7 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupResearchProject.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupResearchProjectMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupResearchProjectService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupResearchProjectServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java new file mode 100644 index 00000000..3ad28620 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java @@ -0,0 +1,215 @@ +package com.jero.drafting.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.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.util.ValidUtil; +import com.jero.drafting.entity.PayDraftingGroupResearchProject; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.service.IPayDraftingGroupResearchProjectService; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import com.jero.modules.oss.service.IOSSFileService; +import com.jero.project.entity.PayResearchProject; +import com.jero.project.service.IPayResearchProjectService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.UUID; + +/** + *

+ * 起草组 在研项目表 前端控制器 + *

+ * + * @author sz + * @since 2024-01-05 + */ +@Api(tags="起草组 在研项目") +@RestController +@RequestMapping("/drafting/payDraftingGroupResearchProject") +@Slf4j +public class PayDraftingGroupResearchProjectController extends JeroController { + @Autowired + private IPayDraftingGroupResearchProjectService payDraftingGroupResearchProjectService; + + @Autowired + private IOSSFileService iossFileService; + + /** + * 分页列表查询 + * + * @param payResearchProject + * @param pageNo + * @param pageSize + * @param + * @return + */ + @AutoLog(value = "起草组-在研项目-分页列表查询") + @ApiOperation(value="起草组-在研项目-分页列表查询", notes="起草组-在研项目-分页列表查询") + @GetMapping(value = "/list") + public Result queryPageList(PayDraftingGroupResearchProject payResearchProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotBlank(payResearchProject.getDraftingGroupId())){ + queryWrapper.eq("drafting_group_id",payResearchProject.getDraftingGroupId()); + }else { + return Result.error("起草组id为空！"); + } + if(StringUtils.isNotBlank(payResearchProject.getProjectName())){ + queryWrapper.like("project_name",payResearchProject.getProjectName()); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupResearchProjectService.pageList(page,queryWrapper); + return Result.OK(pageList); + } + + /** + * 新增 + * + * @param payResearchProject + * @return + */ + @Transactional + @AutoLog(value = "起草组-在研项目-新增") + @ApiOperation(value="起草组-在研项目-新增", notes="起草组-在研项目-新增") + @PostMapping(value = "/add") + public Result add(@RequestBody PayDraftingGroupResearchProject payResearchProject) { + StringBuilder msg = ValidUtil.validateAll(payResearchProject); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("drafting_group_id",payResearchProject.getDraftingGroupId()); + queryWrapper.eq("project_name",payResearchProject.getProjectName()); + int count = payDraftingGroupResearchProjectService.count(queryWrapper); + if (count>0) { + return Result.error("项目名称已存在"); + } + payDraftingGroupResearchProjectService.save(payResearchProject); + if(StringUtils.isNotBlank(payResearchProject.getFiles())){ + String files = payResearchProject.getFiles(); + List filesList = Arrays.asList(files.split(",")); + for(String s:filesList){ + if(StringUtils.isBlank(s)){ + throw new JeroBootException("文件id不能为空!"); + } + UUID uuid = UUID.randomUUID(); + payDraftingGroupResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId()); + } + } + return Result.OK("新增成功!"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @Transactional + @AutoLog(value = "起草组-在研项目-通过id删除") + @ApiOperation(value="起草组-在研项目-通过id删除", notes="起草组-在研项目-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + if (StringUtils.isBlank(id)) { + return Result.error("id不能为空"); + } + //删除关联文件表 + payDraftingGroupResearchProjectService.deleteFile(id); + //删除文件表 + PayDraftingGroupResearchProject payResearchProject = payDraftingGroupResearchProjectService.getById(id); + if (Objects.isNull(payResearchProject)) { + return Result.error("对象不存在"); + } + if(StringUtils.isNotBlank(payResearchProject.getFiles())){ + List filesList = Arrays.asList(payResearchProject.getFiles().split(",")); + iossFileService.removeByIds(filesList); + } + payDraftingGroupResearchProjectService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "起草组-在研项目-批量删除") + @ApiOperation(value="起草组-在研项目-批量删除", notes="起草组-在研项目-批量删除") + @GetMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if (StringUtils.isBlank(ids)) { + return Result.error("id不能为空"); + } + List strings = Arrays.asList(ids.split(",")); + for(String s:strings){ + delete(s); + } + return Result.OK("批量删除成功!"); + } + + /** + * 编辑 + * + * @param payResearchProject + * @return + */ + @Transactional + @AutoLog(value = "起草组-在研项目-编辑") + @ApiOperation(value="起草组-在研项目-编辑", notes="起草组-在研项目-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayDraftingGroupResearchProject payResearchProject) { + StringBuilder msg = ValidUtil.validateAll(payResearchProject); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + if (StringUtils.isBlank(payResearchProject.getId())) { + return Result.error("在研项目的id不能为空"); + } + PayDraftingGroupResearchProject dbPayResearchProject = payDraftingGroupResearchProjectService.getById(payResearchProject.getId()); + if (Objects.isNull(dbPayResearchProject)) { + return Result.error("该项目不存在"); + } + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("project_name",payResearchProject.getProjectName()); + queryWrapper.eq("drafting_group_id",payResearchProject.getDraftingGroupId()); + queryWrapper.ne("id",payResearchProject.getId()); + int count = payDraftingGroupResearchProjectService.count(queryWrapper); + if (count>0) { + return Result.error("项目名称已存在,请修改"); + } + //删除关联文件表 + payDraftingGroupResearchProjectService.deleteFile(payResearchProject.getId()); + //重新加入关系表 + if(StringUtils.isNotBlank(payResearchProject.getFiles())){ + String files = payResearchProject.getFiles(); + List filesList = Arrays.asList(files.split(",")); + for(String s:filesList){ + if(StringUtils.isBlank(s)){ + throw new JeroBootException("文件id不能为空!"); + } + UUID uuid = UUID.randomUUID(); + payDraftingGroupResearchProjectService.saveFile(uuid.toString(),s,payResearchProject.getId()); + } + } + //更新 + payDraftingGroupResearchProjectService.updateById(payResearchProject); + return Result.OK("编辑成功!"); + } +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupResearchProject.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupResearchProject.java new file mode 100644 index 00000000..7d5d12d3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupResearchProject.java @@ -0,0 +1,84 @@ +package com.jero.drafting.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 com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.data.entity.Files; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.List; + +@Data +@TableName("pay_drafting_group_research_project") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_drafting_group_research_project对象", description="pay_drafting_group_research_project") +public class PayDraftingGroupResearchProject { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**起草组id*/ + @NotNull(message ="起草组id不能为空") + @ApiModelProperty(value = "起草组id") + private String draftingGroupId; + + /**项目名称*/ + @Excel(name = "项目名称", width = 15) + @NotNull(message ="项目名称不能为空") + @Size(max = 50,message = "项目名称长度不超过50个字符") + @ApiModelProperty(value = "项目名称") + private String projectName; + /**主要起草单位*/ + @Excel(name = "主要起草单位", width = 15) + @ApiModelProperty(value = "主要起草单位") + @NotEmpty(message = "主要起草单位不能为空") + private String draftCompany; + /**过程文件*/ + @Excel(name = "过程文件", width = 15) + @ApiModelProperty(value = "过程文件（多个都好隔开）") + @NotEmpty(message = "过程文件不能为空") + private String files; + + /**文件集合*/ + @TableField(exist = false) + @Excel(name = "文件集合", width = 15) + @ApiModelProperty(value = "文件集合") + private List filesList; + + /**项目进度*/ + @Excel(name = "项目进度", width = 15) + @ApiModelProperty(value = "项目进度") + @NotEmpty(message = "项目进度不能为空") + private java.lang.String projectSchedule; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private java.lang.String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private java.lang.String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java index 30ef7f3a..d3c07945 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupSubItem.java @@ -5,9 +5,6 @@ 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 com.jero.contract.entity.PayIncomeContract; -import com.jero.project.entity.PayWorkingGroupSubItemContacts; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,12 +12,8 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.DecimalMax; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; -import java.math.BigDecimal; -import java.time.LocalDate; import java.util.Date; import java.util.List; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupResearchProjectMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupResearchProjectMapper.java new file mode 100644 index 00000000..ad91ef74 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupResearchProjectMapper.java @@ -0,0 +1,27 @@ +package com.jero.drafting.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.drafting.entity.PayDraftingGroupResearchProject; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import org.apache.ibatis.annotations.Param; + +/** + *

+ * 起草组 在研项目表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-01-05 + */ +public interface PayDraftingGroupResearchProjectMapper extends BaseMapper { + + IPage pageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + void saveFile(@Param("id")String id,@Param("fileId")String fileId,@Param("projectId") String projectId); + + void deleteFile(@Param("id")String id); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml new file mode 100644 index 00000000..dfb90df8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + insert into pay_drafting_group_research_project_file (id,project_id,file_id) value (#{id},#{projectId},#{fileId}) + + + + + + delete from pay_drafting_group_research_project_file ppf where ppf.project_id=#{id} + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupResearchProjectService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupResearchProjectService.java new file mode 100644 index 00000000..e6803146 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupResearchProjectService.java @@ -0,0 +1,42 @@ +package com.jero.drafting.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.drafting.entity.PayDraftingGroupResearchProject; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.project.entity.PayResearchProject; + +/** + *

+ * 起草组 在研项目表 服务类 + *

+ * + * @author sz + * @since 2024-01-05 + */ +public interface IPayDraftingGroupResearchProjectService extends IService { + + /** + * 分页条件查询 + * @param page + * @param queryWrapper + * @return + */ + IPage pageList(Page page, QueryWrapper queryWrapper); + + /** + * 新增 + * @param id + * @param fileId + * @param projectId + */ + void saveFile(String id, String fileId, String projectId); + + /** + * 通过id删除 + * @param id + */ + void deleteFile(String id); +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupResearchProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupResearchProjectServiceImpl.java new file mode 100644 index 00000000..d02f14d3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupResearchProjectServiceImpl.java @@ -0,0 +1,65 @@ +package com.jero.drafting.service.impl; + +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.impl.ServiceImpl; +import com.jero.drafting.entity.PayDraftingGroupResearchProject; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.mapper.PayDraftingGroupResearchProjectMapper; +import com.jero.drafting.mapper.PayDraftingGroupSubItemContactsMapper; +import com.jero.drafting.service.IPayDraftingGroupResearchProjectService; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.ResponseBody; + +import javax.annotation.Resource; + +/** + *

+ * 起草组 在研项目表 服务实现类 + *

+ * + * @author sz + * @since 2024-01-05 + */ +@Service +@Transactional +public class PayDraftingGroupResearchProjectServiceImpl extends ServiceImpl implements IPayDraftingGroupResearchProjectService { + + @Resource + private PayDraftingGroupResearchProjectMapper researchProjectMapper; + + /** + * 分页条件查询 + * @param page + * @param queryWrapper + * @return + */ + @Override + public IPage pageList(Page page, QueryWrapper queryWrapper) { + return researchProjectMapper.pageList(page,queryWrapper); + } + + /** + * 新增 + * @param id + * @param fileId + * @param projectId + */ + @Override + public void saveFile(String id, String fileId, String projectId) { + researchProjectMapper.saveFile(id,fileId,projectId); + } + + /** + * 通过id删除 + * + * @param id + */ + @Override + public void deleteFile(String id) { + researchProjectMapper.deleteFile(id); + } +} From 2b19ac2c3825a220149bc9db84f7bf63f0437f0d Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 5 Jan 2024 16:35:24 +0800 Subject: [PATCH 03/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84-=E4=BC=9A=E8=AE=AE-CRUD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tingGroupDistributionRecordController.java | 42 +++++ .../PayDraftingGroupDistributionRecord.java | 104 +++++++++++ ...DraftingGroupDistributionRecordMapper.java | 15 ++ ...yDraftingGroupDistributionRecordMapper.xml | 5 + ...raftingGroupDistributionRecordService.java | 16 ++ ...ingGroupDistributionRecordServiceImpl.java | 22 +++ .../jero/meeting/common/MeetingCommon.java | 8 + .../DraftGroupMeetingController.java | 172 ++++++++++++++++++ .../com/jero/meeting/entity/PayMeeting.java | 9 + .../jero/meeting/mapper/PayMeetingMapper.java | 3 + .../meeting/mapper/xml/PayMeetingMapper.xml | 10 + .../service/impl/PayMeetingServiceImpl.java | 29 +++ .../valid/group/DraftingGroupMeeting.java | 9 + .../com/jero/meeting/vo/PayMeetingVO.java | 9 + 14 files changed, 453 insertions(+) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupDistributionRecordService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupDistributionRecordServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/meeting/valid/group/DraftingGroupMeeting.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java new file mode 100644 index 00000000..c4bbde4d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java @@ -0,0 +1,42 @@ +package com.jero.drafting.controller; + +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.DictPoint; +import com.jero.common.exception.JeroBootException; +import com.jero.common.system.base.controller.JeroController; +import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; +import com.jero.drafting.service.IPayDraftingGroupDistributionRecordService; +import com.jero.modules.oss.service.IOSSFileService; +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.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + *

+ * 起草组成员企业联系人表 前端控制器 + *

+ * + * @author sz + * @since 2024-01-02 + */ +@Api(tags = "起草组-分发记录") +@RestController +@RequestMapping("/drafting/payDraftingGroupDistributionRecord") +@Slf4j +public class PayDraftingGroupDistributionRecordController extends JeroController { + @Resource + private IOSSFileService iossFileService; + @Value("${jero.path.upload}") + private String upLoadPath; + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java new file mode 100644 index 00000000..c782adc8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java @@ -0,0 +1,104 @@ +package com.jero.drafting.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 com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description: pay_drafting_group_distribution_record + * @Author: jeecg-boot + * @Date: 2024-01-05 + * @Version: V1.0 + */ +@Data +@TableName("pay_drafting_group_distribution_record") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_drafting_group_distribution_record", description="pay_drafting_group_distribution_record") +public class PayDraftingGroupDistributionRecord implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + /**资料id*/ + @Excel(name = "资料id", width = 15) + @ApiModelProperty(value = "资料id") + private String dataId; + /**起草组id或者分标委id*/ + @Excel(name = "起草组id或者分标委id", width = 15) + @ApiModelProperty(value = "起草组id或者分标委id") + private String projectId; + /**工作组成员id或者分标委成员id*/ + @Excel(name = "工作组成员id或者分标委成员id", width = 15) + @ApiModelProperty(value = "工作组成员id或者分标委成员id") + private String subId; + /**文件id*/ + @Excel(name = "文件id", width = 15) + @ApiModelProperty(value = "文件id") + private String fileId; + /**联系人id*/ + @Excel(name = "联系人id", width = 15) + @ApiModelProperty(value = "联系人id") + private String contactsId; + /**联系人名称*/ + @Excel(name = "联系人名称", width = 15) + @ApiModelProperty(value = "联系人名称") + private String contactsName; + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + /**创建时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建时间") + private Date createTime; + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + /**更新时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private Date updateTime; + + /**资料ids 多个以逗号分隔*/ + @Excel(name = "资料ids 多个以逗号分隔", width = 15) + @ApiModelProperty(value = "资料ids 多个以逗号分隔") + @TableField(exist = false) + private String dataIds; + + /**项目类型1:起草组，2：分标委*/ + @ApiModelProperty(value = "项目类型1:起草组，2：分标委") + private Integer projectType; + + /**联系人ids 多个以逗号分隔*/ + @TableField(exist = false) + @ApiModelProperty(value = "联系人ids 多个以逗号分隔") + private String contactsIds; + /** + * 联系人临时id + */ + @TableField(exist = false) + @ApiModelProperty(value = "联系人临时id") + private String temporaryContactsId; + + /** + * 是否发送邮件 + */ + @TableField(exist = false) + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java new file mode 100644 index 00000000..ad520f9f --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java @@ -0,0 +1,15 @@ +package com.jero.drafting.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; + +/** + *

+ * 起草组-分发记录表 Mapper 接口 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface PayDraftingGroupDistributionRecordMapper extends BaseMapper { +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml new file mode 100644 index 00000000..690830da --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupDistributionRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupDistributionRecordService.java new file mode 100644 index 00000000..3a798380 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupDistributionRecordService.java @@ -0,0 +1,16 @@ +package com.jero.drafting.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; + +/** + *

+ * 起草组 分发记录表 服务类 + *

+ * + * @author sz + * @since 2024-01-02 + */ +public interface IPayDraftingGroupDistributionRecordService extends IService { +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupDistributionRecordServiceImpl.java new file mode 100644 index 00000000..d087e204 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupDistributionRecordServiceImpl.java @@ -0,0 +1,22 @@ +package com.jero.drafting.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; +import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import com.jero.drafting.mapper.PayDraftingGroupDistributionRecordMapper; +import com.jero.drafting.mapper.PayDraftingGroupSubItemContactsMapper; +import com.jero.drafting.service.IPayDraftingGroupDistributionRecordService; +import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; +import org.springframework.stereotype.Service; + +/** + *

+ * 起草组 分发记录表 服务实现类 + *

+ * + * @author sz + * @since 2024-01-05 + */ +@Service +public class PayDraftingGroupDistributionRecordServiceImpl extends ServiceImpl implements IPayDraftingGroupDistributionRecordService { +} 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 53fe038e..bf37341b 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 @@ -56,6 +56,14 @@ public class MeetingCommon { * 理事会会议 */ public final static Integer COUNCIL_MEETING_INT = 6; + /** + * 起草组会议 + */ + public final static String DRAFTING_GROUP_MEETING = "7"; + /** + * 起草组会议 + */ + public final static Integer DRAFTING_GROUP_MEETING_INT = 7; /** * 标准宣贯 */ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java new file mode 100644 index 00000000..e06b576d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java @@ -0,0 +1,172 @@ +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.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.common.util.ValidUtil; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.service.IPayDraftingGroupService; +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.modules.system.volid.group.UpdateGroup; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +@Api(tags = "会议管理-起草组会议") +@RestController +@RequestMapping("/meeting/draftGroupMeeting") +@Slf4j +public class DraftGroupMeetingController { + @Resource + private IPayMeetingService payMeetingService; + @Resource + private ISysBaseAPI sysBaseAPI; + @Resource + private IPayMeetingHotelContactsService meetingHotelContactsService; + @Resource + private IPayDraftingGroupService payDraftingGroupService; + + /** + * 分页列表查询 + */ +// @RequiresPermissions("draftGroupMeeting: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(MeetingCommon.DRAFTING_GROUP_MEETING_INT); + IPage pageList = payMeetingService.queryPageList(payMeeting, pageNo, pageSize, req); + return Result.OK(pageList); + } + + /** + * 添加 + */ +// @RequiresPermissions("draftGroupMeeting:add") + @AutoLog(value = "会议管理-添加") + @ApiOperation(value = "会议管理-添加", notes = "会议管理-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody PayMeetingVO payMeetingVO) { + String meetingType = payMeetingVO.getMeetingType(); + if (!Objects.equals(meetingType, MeetingCommon.DRAFTING_GROUP_MEETING)) { + throw new RuntimeException(); + } + ValidUtil.validate(payMeetingVO); + payMeetingService.add(payMeetingVO); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + */ +// @RequiresPermissions("draftGroupMeeting:edit") + @AutoLog(value = "会议管理-编辑") + @ApiOperation(value = "会议管理-编辑", notes = "会议管理-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody PayMeetingVO payMeetingVO) { + String id = payMeetingVO.getId(); + verifyMeetingType(id); + ValidUtil.validate(payMeetingVO, UpdateGroup.class); + payMeetingService.editById(payMeetingVO); + return Result.OK("编辑成功!"); + } + + /** + * 验证会议类型 + * @param id + */ + private void verifyMeetingType(String id) { + if (StringUtils.isBlank(id)) { + throw new JeroBootException("会议id不能为空"); + } + PayMeeting payMeeting = payMeetingService.getById(id); + if (Objects.isNull(payMeeting)) { + throw new JeroBootException("该会议不存在"); + } + Integer meetingType = payMeeting.getMeetingType(); + if (!Objects.equals(meetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT)) { + throw new RuntimeException(); + } + } + + /** + * 通过id删除 + */ +// @RequiresPermissions("draftGroupMeeting:delete") + @AutoLog(value = "会议管理-通过id删除") + @ApiOperation(value = "会议管理-通过id删除", notes = "会议管理-通过id删除") + @GetMapping(value = "/delete") + public Result delete(@RequestParam(name = "id") String id) { + verifyMeetingType(id); + payMeetingService.deleteById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + */ +// @RequiresPermissions("draftGroupMeeting: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) { + verifyMeetingType(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(), MeetingCommon.DRAFTING_GROUP_MEETING_INT)) { + 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(); + payMeetingVO.setMeetingType(meetingType); + payMeetingVO.setTbMeetingType(meeting.getMeetingType().toString()); + //会议查询酒店联系人列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PayMeetingHotelContacts::getMeetingId, meeting.getId()); + List payMeetingHotelContactsList = meetingHotelContactsService.list(wrapper); + payMeetingVO.setHotelContactsList(payMeetingHotelContactsList); + // 起草组项目查询起草组项目名 + String draftingGroupId = meeting.getDraftingGroupId(); + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupId); + payMeetingVO.setDirectorName(payDraftingGroup.getDraftingGroupProject()); + return Result.OK(payMeetingVO); + + } +} 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 a37e16a9..6aef4774 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 @@ -397,4 +397,13 @@ public class PayMeeting implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "征集截止日期") private java.util.Date endTimeAddQuestion; + + /**起草组id*/ + @Excel(name = "起草组名称", width = 15, dictTable = "pay_drafting_group",dicText = "drafting_group_project",dicCode = "id") + @ApiModelProperty(value = "起草id") + private String draftingGroupId; + + /**起草组名称*/ + @ApiModelProperty(value = "起草组名称") + private String draftingGroupName; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index 80ef82e2..abc029d2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -35,6 +35,9 @@ public interface PayMeetingMapper extends BaseMapper { IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage draftGroupPage(Page page, QueryWrapper queryWrapper); + + IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage basePage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml index debb2bee..34ac71c2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/xml/PayMeetingMapper.xml @@ -230,6 +230,16 @@ ${ew.customSqlSegment} + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java index 6aa5d1cd..3034f3c8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java @@ -56,4 +56,12 @@ public interface IPayDraftingGroupSubItemService extends IService publishReminderList(Page page, PayDraftingGroupSubItem payDraftingGroupSubItem); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index 7040d13a..dcb992f8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -642,4 +642,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl publishReminderList(Page page, PayDraftingGroupSubItem payDraftingGroupSubItem) { + return payDraftingGroupSubItemMapper.publishReminderList(page,payDraftingGroupSubItem); + } } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java index e06b576d..29d39a46 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingController.java @@ -4,6 +4,7 @@ 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.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; @@ -17,11 +18,14 @@ 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.system.volid.group.UpdateGroup; 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.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -167,6 +171,41 @@ public class DraftGroupMeetingController { PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupId); payMeetingVO.setDirectorName(payDraftingGroup.getDraftingGroupProject()); return Result.OK(payMeetingVO); + } + /** + * 上传文件 + */ + @AutoLog(value = "上传文件") +// @RequiresPermissions("draftGroupMeeting:upload") + @ApiOperation(value = "上传资料", notes = "上传文件") + @PostMapping(value = "/uploadFile") + public Result uploadFile(@RequestBody UploadFileVO uploadFileVO) { + List strings = payMeetingService.uploadFileSendMsg(uploadFileVO, MeetingCommon.DRAFTING_GROUP_MEETING_INT, false); + return Result.OK("上传资料成功!",strings); + } + + /** + * 上传会议纪要 + */ + @AutoLog(value = "上传会议纪要") +// @RequiresPermissions("draftGroupMeeting:uploadCouncil") + @ApiOperation(value = "上传会议纪要", notes = "上传会议纪要") + @PostMapping(value = "/uploadCouncilFile") + public Result uploadCouncilFile(@RequestBody UploadFileVO uploadFileVO) { + payMeetingService.uploadFile(uploadFileVO, MeetingCommon.DRAFTING_GROUP_MEETING_INT); + return Result.OK("上传会议纪要成功!"); + } + + /** + * 发布提醒 + */ + @AutoLog("发布提醒") + @RequiresPermissions("workGroupMeeting:publish") + @ApiOperation(value = "发布提醒", notes = "发布提醒") + @PostMapping(value = "/publishReminder") + public Result publishReminder(@RequestBody PublishReminderVO publishReminderVO) { + List strings = payMeetingService.publishReminder(publishReminderVO, CompanyMessageEnums.MSG1, "C_OPEN_TYPE1"); + return Result.OK("发布成功",strings); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java index 95ef1ac2..3a72764f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/DraftGroupMeetingSituationController.java @@ -8,9 +8,16 @@ 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.service.RolePermissionService; 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.ValidUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.drafting.entity.PayDraftingGroup; +import com.jero.drafting.entity.PayDraftingGroupSubItem; +import com.jero.drafting.service.IPayDraftingGroupService; +import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.meeting.common.MeetingCommon; import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.entity.PayMeetingSituation; @@ -19,10 +26,13 @@ import com.jero.meeting.vo.CheckVO; import com.jero.meeting.vo.PayMeetingSituationVO; import com.jero.meeting.vo.SetGuestsUploadFileVO; import com.jero.project.common.PayProjectCommon; +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.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -44,6 +54,12 @@ import java.util.Objects; public class DraftGroupMeetingSituationController extends JeroController { @Resource private IPayMeetingSituationService payMeetingSituationService; + @Resource + private IPayDraftingGroupService payDraftingGroupService; + @Resource + private IPayDraftingGroupSubItemService payDraftingGroupSubItemService; + @Resource + private RolePermissionService rolePermissionService; private final Integer MEETING_TYPE = MeetingCommon.DRAFTING_GROUP_MEETING_INT; @@ -201,4 +217,44 @@ public class DraftGroupMeetingSituationController extends JeroController aClass = payMeetingSituationService.getaClass(MEETING_TYPE); return super.exportListXls(objects, aClass, "参会人员信息"); } + + /** + * 分页列表查询 + * + * @param payDraftingGroupSubItem 起草组成员 + * @param pageNo 页数 + * @param pageSize 条数 + * @param paymentDate 日期 + * @return + */ +// @RequiresPermissions("draftingGroupMember:search") + @ApiOperation(value = "起草组成员-发布提醒列表查询") + @GetMapping(value = "/publishReminderList") + public Result publishReminderList(PayDraftingGroupSubItem payDraftingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName()) && payDraftingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getDraftingGroupId())) { + return Result.error("起草组id不能为空！"); + } + if(!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName())){ + payDraftingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payDraftingGroupSubItem.getChargeCompanyTemporaryName())); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if(Objects.isNull(payDraftingGroup)){ + return Result.error("起草组不存在！"); + } + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + if(!rolePermissionService.getRolePermission("draftingGroupMember:search") + && !Objects.equals(payDraftingGroup.getPrincipalIdA(),sysUser.getId()) + && !Objects.equals(payDraftingGroup.getPrincipalIdB(),sysUser.getId())){ + return Result.error("数据权限不足！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupSubItemService.publishReminderList(page, payDraftingGroupSubItem); + return Result.OK(pageList); + } } \ No newline at end of file diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java index 9dc9200d..101b1858 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PublishReminderVO.java @@ -19,8 +19,10 @@ public class PublishReminderVO { private List meetingIds; @ApiModelProperty(value = "成员id列表") private List subitemIds; - @ApiModelProperty(value = "项目类型1:工作组，2：分标委") + @ApiModelProperty(value = "项目类型1:工作组, 2：分标委, 3:起草组") private Integer projectType; @ApiModelProperty(value = "是否发送邮件") private Integer sendEmailFlag; + @ApiModelProperty(value = "起草组id") + private java.lang.String draftingGroupId; } From 3c279e0a62bc5aafbc5f6a8f82b3c344b0257ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 8 Jan 2024 15:43:26 +0800 Subject: [PATCH 08/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ayDraftingGroupSubItemContactsService.java | 5 +- ...aftingGroupSubItemContactsServiceImpl.java | 29 ++++- ...kingGroupDistributionRecordController.java | 46 ++++--- ...ingGroupDistributionRecordServiceImpl.java | 114 ++++++++++++++++-- 4 files changed, 161 insertions(+), 33 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java index 632c9de8..14895ce2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemContactsService.java @@ -1,9 +1,10 @@ package com.jero.drafting.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; +import java.util.List; + /** *

* 起草组成员企业联系人表 服务类 @@ -13,4 +14,6 @@ import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; * @since 2024-01-02 */ public interface IPayDraftingGroupSubItemContactsService extends IService { + + List getContactsInfo(String projectId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java index 43047b91..90f40a06 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java @@ -1,15 +1,18 @@ package com.jero.drafting.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; import com.jero.drafting.mapper.PayDraftingGroupSubItemContactsMapper; -import com.jero.drafting.mapper.PayDraftingGroupSubItemMapper; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; -import com.jero.drafting.service.IPayDraftingGroupSubItemService; +import com.jero.temporary.entity.PayContactsManagementTemporary; +import com.jero.temporary.service.IPayContactsManagementTemporaryService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -21,4 +24,24 @@ import javax.annotation.Resource; */ @Service public class PayDraftingGroupSubItemContactsServiceImpl extends ServiceImpl implements IPayDraftingGroupSubItemContactsService { + @Resource + private IPayContactsManagementTemporaryService payContactsManagementTemporaryService; + + @Override + public List getContactsInfo(String projectId){ + //1.获取成员信息 + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,projectId); + List listPayDraftingGroupSubItemContacts = this.list(queryPayDraftingGroupSubItemContacts); + //2.根据成员id获取用户信息 + List temporaryIds = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getContactsTemporaryId).collect(Collectors.toList()); + List contactsManagementTemporaryList = payContactsManagementTemporaryService.listByIds(temporaryIds); + Map collectMap = contactsManagementTemporaryList.stream().collect(Collectors.toMap(PayContactsManagementTemporary::getId, PayContactsManagementTemporary -> PayContactsManagementTemporary)); + for (PayDraftingGroupSubItemContacts subItemContacts : listPayDraftingGroupSubItemContacts) { + String contactsTemporaryId = subItemContacts.getContactsTemporaryId(); + PayContactsManagementTemporary payContactsManagementTemporary = collectMap.get(contactsTemporaryId); + subItemContacts.setCompanyName(payContactsManagementTemporary.getCompanyName()); + } + return listPayDraftingGroupSubItemContacts; + } } 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 b8052077..91171183 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 @@ -17,6 +17,8 @@ import com.jero.data.entity.PayCaseCouncilSubitem; import com.jero.data.mapper.PayFileEmailRemindRecordMapper; 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.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -41,10 +43,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -69,6 +68,8 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; @Resource private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService; + @Resource + private IPayDraftingGroupSubItemContactsService payDraftingGroupSubItemContactsService; @Resource private IOSSFileService iossFileService; @@ -166,13 +167,13 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< //这里，防止要下载的文件有重名的导致下载失败 zipos.putNextEntry(new ZipEntry(ossFile.getFileName())); os = new DataOutputStream(zipos); - InputStream is = new FileInputStream(file); - byte[] b = new byte[1024]; - int length = 0; - while((length = is.read(b))!= -1){ - os.write(b, 0, length); + try(InputStream is = new FileInputStream(file);){ + byte[] b = new byte[1024]; + int length = 0; + while((length = is.read(b))!= -1){ + os.write(b, 0, length); + } } - is.close(); zipos.closeEntry(); }catch (Exception e){ e.printStackTrace(); @@ -208,13 +209,14 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< if(StringUtils.isBlank(projectId)){ throw new JeroBootException("项目id不能为空!"); } - if(projectType != PayProjectCommon.PROJECT_TYPE_FILE1 - && projectType != PayProjectCommon.PROJECT_TYPE_FILE2 - && projectType != PayProjectCommon.PROJECT_TYPE_FILE3){ + 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)){ return Result.error("项目状态不正确！"); } List listData = new ArrayList<>(); - if(projectType == PayProjectCommon.PROJECT_TYPE_FILE1){ + if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE1)){ //LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); //queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupId,projectId); //List list = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); @@ -228,7 +230,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< listData.add(payContactsManagement); }); } - }else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE2){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE2)){ LambdaQueryWrapper queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,projectId); List list = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem); @@ -241,7 +243,7 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< listData.add(payContactsManagement); }); } - }else if(projectType == PayProjectCommon.PROJECT_TYPE_FILE3){ + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE3)){ LambdaQueryWrapper queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); queryPayCaseCommitteeSubitem.eq(PayCaseCouncilSubitem::getCouncilId,projectId); List list = payCaseCouncilSubitemService.list(queryPayCaseCommitteeSubitem); @@ -255,6 +257,18 @@ public class PayWorkingGroupDistributionRecordController extends JeroController< }); } + }else if(Objects.equals(projectType,PayProjectCommon.PROJECT_TYPE_FILE4)){ + List list = payDraftingGroupSubItemContactsService.getContactsInfo(projectId); + if(!CollectionUtils.isEmpty(list)){ + list.forEach(p->{ + PayContactsManagement payContactsManagement = new PayContactsManagement(); + payContactsManagement.setId(p.getContactsTemporaryId()); + payContactsManagement.setName(p.getContactsTemporaryName()); + 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 30f9de62..d6501d70 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 @@ -17,9 +17,19 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; -import com.jero.data.entity.*; -import com.jero.data.service.*; +import com.jero.data.entity.PayCaseCommittee; +import com.jero.data.entity.PayCaseCommitteeSubitem; +import com.jero.data.entity.PayCaseCouncil; +import com.jero.data.entity.PayCaseCouncilSubitem; +import com.jero.data.service.IPayCaseCommitteeService; +import com.jero.data.service.IPayCaseCommitteeSubitemService; +import com.jero.data.service.IPayCaseCouncilService; +import com.jero.data.service.IPayCaseCouncilSubitemService; import com.jero.data.service.impl.PayFileEmailRemindRecordService; +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.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.project.common.PayProjectCommon; @@ -34,6 +44,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.core.env.Environment; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.io.File; import java.util.*; @@ -82,6 +93,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); String msg = ""; List listPayWorkingGroupDistributionRecord = new ArrayList<>(); - if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payWorkingGroup)){ throw new JeroBootException("工作组不存在!"); @@ -134,7 +150,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -166,7 +182,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagement = new LambdaQueryWrapper<>(); queryPayContactsManagement.in(PayContactsManagement::getId, Arrays.asList(contactsIds.split(","))); List listContacts = payContactsManagementService.list(queryPayContactsManagement); @@ -197,6 +213,26 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayContactsManagementTemporary = new LambdaQueryWrapper<>(); + queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s)); + List listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary); + if(!CollectionUtils.isEmpty(listContacts)){ + list = listContacts; + } + msg = payDraftingGroup.getDraftingGroupProject(); }else{ throw new JeroBootException("项目状态不正确！"); } @@ -239,9 +275,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl list = new ArrayList<>(); List listPayWorkingGroupDistributionRecord = new ArrayList<>(); - if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1){ + if(Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1)){ PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupDistributionRecord.getProjectId()); if(Objects.isNull(payWorkingGroup)){ throw new JeroBootException("工作组不存在!"); @@ -321,7 +357,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>(); queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId()); @@ -362,7 +398,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId,payWorkingGroupDistributionRecord.getProjectId()); @@ -403,6 +439,36 @@ 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 queryPayContactsManagementTemporary = new LambdaQueryWrapper<>(); + queryPayContactsManagementTemporary.in(PayContactsManagementTemporary::getId, Arrays.asList(s)); + List listContacts = payContactsManagementTemporaryService.list(queryPayContactsManagementTemporary); + if(!CollectionUtils.isEmpty(listContacts)){ + list = listContacts; + } + msg = payDraftingGroup.getDraftingGroupProject(); }else { throw new JeroBootException("项目状态不正确！"); } @@ -419,7 +485,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE1) ? Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ @@ -444,9 +510,9 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listPayWorkingGroupDistributionRecord,OSSFile byId){ + // 查询工作组成员 + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,payWorkingGroupDistributionRecord.getProjectId()); + queryPayDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getContactsTemporaryId,Arrays.asList(s)); + List list = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); + 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.getDraftingGroupSubId()); + payWorkingGroupDistributionRecordNew.setContactsId(p.getContactsId()); + payWorkingGroupDistributionRecordNew.setContactsName(p.getContactsTemporaryName()); + payWorkingGroupDistributionRecordNew.setTemporaryContactsId(p.getContactsTemporaryId()); + listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew); + }); + } + } } From 6b1e77be08fb1cdd92987c065aa5f3f3bd32cf2c Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 8 Jan 2024 16:01:50 +0800 Subject: [PATCH 09/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=8E=A5?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=87=BA=E7=8E=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDraftingGroupController.java | 17 ++++++++++------- .../jero/drafting/entity/PayDraftingGroup.java | 5 +++++ .../mapper/xml/PayDraftingGroupMapper.xml | 14 +++++++++++--- .../jero/drafting/vo/PayDraftingGroupVo.java | 5 ----- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java index 0ac6e1bf..ff1c9866 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java @@ -81,6 +81,9 @@ public class PayDraftingGroupController extends JeroController pageList = payDraftingGroupService.queryPageList(page,payDraftingGroup); if (!Objects.isNull(pageList)) { @@ -92,13 +95,6 @@ public class PayDraftingGroupController extends JeroController left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id @@ -33,10 +35,16 @@ AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) - AND principal_id_a = #{payDraftingGroup.principalIdA} + AND pdg.principal_id_a = #{payDraftingGroup.principalIdA} - AND year = #{payDraftingGroup.year} + AND pdg.year = #{payDraftingGroup.year} + + + AND working_group_id = #{payDraftingGroup.workingGroupId} + + + AND pwg.working_group_project like concat('%', #{payDraftingGroup.workingGroupName}, '%') and pdgsc.contacts_temporary_name like concat('%', #{payDraftingGroup.companyContactName}, '%') diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java index af998ed1..b90a6c15 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/vo/PayDraftingGroupVo.java @@ -21,9 +21,4 @@ public class PayDraftingGroupVo extends PayDraftingGroup { * 当前登录人是否可以操作(1为可操作，2为不可操作) */ private Integer checkoutOperation; - - /** - * 工作组名称 - */ - private String workingGroupName; } From 201ba42b9c1e2b2de0a020ecc727f84eb3111542 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 8 Jan 2024 16:03:21 +0800 Subject: [PATCH 10/52] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayDraftingGroupSubItemContactsServiceImpl.java | 5 ++++- .../PayWorkingGroupDistributionRecordController.java | 1 - .../impl/PayWorkingGroupSubItemContactsServiceImpl.java | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java index 90f40a06..953c2ce5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemContactsServiceImpl.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -40,7 +41,9 @@ public class PayDraftingGroupSubItemContactsServiceImpl extends ServiceImpl list = payDraftingGroupSubItemContactsService.getContactsInfo(projectId); if(!CollectionUtils.isEmpty(list)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java index 670c86c1..38e2433a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemContactsServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.project.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.project.entity.PayWorkingGroupSubItemContacts; @@ -13,6 +12,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; @@ -40,7 +40,10 @@ public class PayWorkingGroupSubItemContactsServiceImpl extends ServiceImpl Date: Tue, 9 Jan 2024 09:42:03 +0800 Subject: [PATCH 11/52] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 20 ++-- ...tingGroupDistributionRecordController.java | 37 ------- .../PayDraftingGroupDistributionRecord.java | 104 ------------------ ...DraftingGroupDistributionRecordMapper.java | 15 --- ...yDraftingGroupDistributionRecordMapper.xml | 5 - .../mapper/xml/PayDraftingGroupMapper.xml | 2 +- ...raftingGroupDistributionRecordService.java | 16 --- ...ingGroupDistributionRecordServiceImpl.java | 22 ---- .../DraftGroupMeetingController.java | 2 +- .../service/impl/PayMeetingServiceImpl.java | 31 +++++- .../jero/meeting/vo/PublishReminderVO.java | 1 + 11 files changed, 43 insertions(+), 212 deletions(-) delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupDistributionRecordService.java delete mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupDistributionRecordServiceImpl.java 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 369cacc9..7e096513 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 @@ -123,16 +123,16 @@ public class SendMessageServiceImpl implements SendMessageService { emailPassword = PasswordUtil.decrypt(emailPassword); //EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); //// 发送带附件邮箱 - //if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ - // emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); - //}else{ - // //如果有通知内容就替换 - // if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); - // }else { - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); - // } - //} +// if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ +// emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); +// }else{ +// //如果有通知内容就替换 +// if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ +// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); +// }else { +// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); +// } +// } }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java deleted file mode 100644 index 048acf54..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupDistributionRecordController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.drafting.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.DictPoint; -import com.jero.common.exception.JeroBootException; -import com.jero.common.system.base.controller.JeroController; -import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; -import com.jero.drafting.service.IPayDraftingGroupDistributionRecordService; -import com.jero.modules.oss.service.IOSSFileService; -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.springframework.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - *

- * 起草组成员企业联系人表 前端控制器 - *

- * - * @author sz - * @since 2024-01-02 - */ -//@Api(tags = "起草组-分发记录") -@RestController -@RequestMapping("/drafting/payDraftingGroupDistributionRecord") -@Slf4j -public class PayDraftingGroupDistributionRecordController extends JeroController { - -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java deleted file mode 100644 index c782adc8..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/entity/PayDraftingGroupDistributionRecord.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.jero.drafting.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 com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; -import java.util.Date; - -/** - * @Description: pay_drafting_group_distribution_record - * @Author: jeecg-boot - * @Date: 2024-01-05 - * @Version: V1.0 - */ -@Data -@TableName("pay_drafting_group_distribution_record") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) -@ApiModel(value="pay_drafting_group_distribution_record", description="pay_drafting_group_distribution_record") -public class PayDraftingGroupDistributionRecord implements Serializable { - private static final long serialVersionUID = 1L; - - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value = "主键") - private String id; - /**资料id*/ - @Excel(name = "资料id", width = 15) - @ApiModelProperty(value = "资料id") - private String dataId; - /**起草组id或者分标委id*/ - @Excel(name = "起草组id或者分标委id", width = 15) - @ApiModelProperty(value = "起草组id或者分标委id") - private String projectId; - /**工作组成员id或者分标委成员id*/ - @Excel(name = "工作组成员id或者分标委成员id", width = 15) - @ApiModelProperty(value = "工作组成员id或者分标委成员id") - private String subId; - /**文件id*/ - @Excel(name = "文件id", width = 15) - @ApiModelProperty(value = "文件id") - private String fileId; - /**联系人id*/ - @Excel(name = "联系人id", width = 15) - @ApiModelProperty(value = "联系人id") - private String contactsId; - /**联系人名称*/ - @Excel(name = "联系人名称", width = 15) - @ApiModelProperty(value = "联系人名称") - private String contactsName; - /**创建人*/ - @ApiModelProperty(value = "创建人") - private String createBy; - /**创建时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private Date createTime; - /**更新人*/ - @ApiModelProperty(value = "更新人") - private String updateBy; - /**更新时间*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private Date updateTime; - - /**资料ids 多个以逗号分隔*/ - @Excel(name = "资料ids 多个以逗号分隔", width = 15) - @ApiModelProperty(value = "资料ids 多个以逗号分隔") - @TableField(exist = false) - private String dataIds; - - /**项目类型1:起草组，2：分标委*/ - @ApiModelProperty(value = "项目类型1:起草组，2：分标委") - private Integer projectType; - - /**联系人ids 多个以逗号分隔*/ - @TableField(exist = false) - @ApiModelProperty(value = "联系人ids 多个以逗号分隔") - private String contactsIds; - /** - * 联系人临时id - */ - @TableField(exist = false) - @ApiModelProperty(value = "联系人临时id") - private String temporaryContactsId; - - /** - * 是否发送邮件 - */ - @TableField(exist = false) - @ApiModelProperty(value = "是否发送邮件") - private Integer sendEmailFlag; -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java deleted file mode 100644 index ad520f9f..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/PayDraftingGroupDistributionRecordMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jero.drafting.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.jero.drafting.entity.PayDraftingGroupDistributionRecord; - -/** - *

- * 起草组-分发记录表 Mapper 接口 - *

- * - * @author sz - * @since 2024-01-02 - */ -public interface PayDraftingGroupDistributionRecordMapper extends BaseMapper { -} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml deleted file mode 100644 index 690830da..00000000 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupDistributionRecordMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index 06e5fba3..fd3940c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -4,7 +4,7 @@ SELECT pdgs.id, @@ -38,7 +38,7 @@ GROUP BY pdgs.id ORDER BY pdgs.create_time desc - + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java index 0976258d..cba977d2 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/IPayDraftingGroupSubItemService.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.vo.CheckVo; -import com.jero.project.entity.PayWorkingGroupSubItem; import javax.servlet.http.HttpServletRequest; +import java.util.List; /** *

@@ -71,4 +71,19 @@ public interface IPayDraftingGroupSubItemService extends IService queryCompanyPageList(Page page, PayDraftingGroupSubItem payWorkingGroupSubItem, List listNeedInvoice, List listProjectIds); + + /** + * 企业端-管理员-我的工作组分页查询 + */ + IPage queryCompanyPageListByCompanyManager(Page page, PayDraftingGroupSubItem payWorkingGroupSubItem, List listNeedInvoice, String companyId); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index fd6d64e2..e2ceb5a4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -14,7 +14,6 @@ import com.jero.company.entity.PayCompanyManagement; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayCompanyManagementService; import com.jero.company.service.IPayContactsManagementService; -import com.jero.contract.service.IPayIncomeContractService; import com.jero.drafting.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; @@ -25,15 +24,8 @@ import com.jero.drafting.service.IPayDraftingGroupService; import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.CheckVo; -import com.jero.meeting.common.MeetingCommon; -import com.jero.meeting.entity.PayMeeting; -import com.jero.meeting.entity.PayMeetingContacts; -import com.jero.meeting.entity.PayMeetingSituation; -import com.jero.meeting.service.IPayMeetingRemindRecordService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.pack.entity.PayPackCompanyProject; -import com.jero.pack.service.IPayPackCompanyProjectService; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -48,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.*; @@ -703,4 +696,14 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl queryCompanyPageList(Page page, PayDraftingGroupSubItem payWorkingGroupSubItem, List listNeedInvoice, List listProjectIds) { + return payDraftingGroupSubItemMapper.queryCompanyPageList( page, payWorkingGroupSubItem,listNeedInvoice, listProjectIds); + } + + @Override + public IPage queryCompanyPageListByCompanyManager(Page page, PayDraftingGroupSubItem payWorkingGroupSubItem, List listNeedInvoice, String companyId) { + return payDraftingGroupSubItemMapper.queryCompanyPageListByCompanyManager( page, payWorkingGroupSubItem,listNeedInvoice,companyId); + } +} 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 d6501d70..cf593ebe 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 @@ -219,7 +219,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl Date: Thu, 11 Jan 2024 10:15:33 +0800 Subject: [PATCH 23/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayDraftingGroupMapper.xml | 9 ++- .../impl/PayDraftingGroupServiceImpl.java | 79 ++++++++++++------- 2 files changed, 57 insertions(+), 31 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index fd3940c6..16d4d12c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -25,12 +25,18 @@ left join sys_user su on pdg.principal_id_a = su.id left join sys_user su1 on pdg.principal_id_b = su1.id left join pay_working_group pwg on pwg.id = pdg.working_group_id + + or (payDraftingGroup.companyName != null and payDraftingGroup.companyName != '')"> left join pay_drafting_group_subitem pdgs on pdg.id = pdgs.drafting_group_id left JOIN pay_drafting_group_subitem_contacts pdgsc on pdgsc.drafting_group_sub_id = pdgs.id + + + AND pdgs.check_result != 3 + AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) @@ -55,4 +61,5 @@ ORDER BY pdg.create_time DESC + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index efe83b30..2c35b4aa 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -16,6 +16,7 @@ import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; import com.jero.company.entity.PayContactsManagement; import com.jero.company.service.IPayContactsManagementService; +import com.jero.drafting.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupResearchProject; import com.jero.drafting.entity.PayDraftingGroupSubItem; @@ -125,12 +126,13 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); + for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { + if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); + } + } } LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); @@ -182,6 +188,11 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayDraftingGroupSubItem.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem); + + LambdaUpdateWrapper updatePayDraftingGroupContacts = new LambdaUpdateWrapper<>(); + updatePayDraftingGroupContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,id); + payDraftingGroupSubItemContactsMapper.delete(updatePayDraftingGroupContacts); + } /** @@ -206,7 +217,12 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); + for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { + if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { + sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); + break; + } + } } LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); meetingQuery.eq(PayMeeting::getDraftingGroupId,p); @@ -226,6 +242,9 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl updatePayDraftingGroupSubItem = new LambdaUpdateWrapper<>(); updatePayDraftingGroupSubItem.in(PayDraftingGroupSubItem::getDraftingGroupId, ids); payDraftingGroupSubItemService.remove(updatePayDraftingGroupSubItem); + LambdaUpdateWrapper updatePayDraftingGroupContacts = new LambdaUpdateWrapper<>(); + updatePayDraftingGroupContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupId,ids); + payDraftingGroupSubItemContactsMapper.delete(updatePayDraftingGroupContacts); } /** @@ -348,29 +367,29 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl{ -// JSONObject json = new JSONObject(); -// json.put("type", ProjectCommon.PROJECT_TYPE7); -// json.put("DraftingGroupId",p.getDraftingGroupId()); -// json.put("projectId",p.getId()); -// json.put("path","/workTeam/WorkTeamDetail"); -// //新建项目 给企业联系人发消息 -// List itemContactsList = p.getPayDraftingGroupSubItemContactsList(); -// for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) { -// PayContactsManagement payContactsManagement = payContactsManagementService.getById(subItemContacts.getContactsId()); -// if (!Objects.isNull(payContactsManagement)) { -// PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); -// paySendContactsMessageDTO.setProjectName(payDraftingGroupOld.getDraftingGroupProject()); -// paySendContactsMessageDTO.setProjectId(p.getId()); -// paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); -// paySendContactsMessageDTO.setUserId(payDraftingGroupOld.getPrincipalIdA()); -// paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); -// paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0); -// paySendContactsMessageDTO.setJson(json); -// contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); -// } -// } -// }); + listPayDraftGroupSubItem.forEach(p->{ + JSONObject json = new JSONObject(); + json.put("type", ProjectCommon.PROJECT_TYPE7); + json.put("DraftingGroupId",p.getDraftingGroupId()); + json.put("projectId",p.getId()); + json.put("path","/workTeam/WorkTeamDetail"); + //新建项目 给企业联系人发消息 + List itemContactsList = p.getPayDraftingGroupSubItemContactsList(); + for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) { + PayContactsManagement payContactsManagement = payContactsManagementService.getById(subItemContacts.getContactsId()); + if (!Objects.isNull(payContactsManagement)) { + PaySendContactsMessageDTO paySendContactsMessageDTO = new PaySendContactsMessageDTO(); + paySendContactsMessageDTO.setProjectName(payDraftingGroupOld.getDraftingGroupProject()); + paySendContactsMessageDTO.setProjectId(p.getId()); + paySendContactsMessageDTO.setEmail(payContactsManagement.getEmail()); + paySendContactsMessageDTO.setUserId(payDraftingGroupOld.getPrincipalIdA()); + paySendContactsMessageDTO.setPhone(payContactsManagement.getPhone()); + paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0); + paySendContactsMessageDTO.setJson(json); + contractCreateProjectSendMessageService.createProjectSendMessageToContactsService(paySendContactsMessageDTO); + } + } + }); } } } From b3b48a452011c479fbeed2ed8fffb0eb27fe7efb Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 11 Jan 2024 13:47:36 +0800 Subject: [PATCH 24/52] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=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 --- .../PayDraftingGroupSubItemController.java | 75 ++----------------- .../xml/PayDraftingGroupSubItemMapper.xml | 18 ----- .../PayDraftingGroupSubItemServiceImpl.java | 31 ++++++++ 3 files changed, 37 insertions(+), 87 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index 7f2bde48..e2840b93 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -132,7 +132,7 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); List listNeedInvoice = new ArrayList<>(); -// if(!Objects.isNull(payDraftingGroupSubItem.getNeedInvoice())){ -// // 需要发票 ： 3为 需要发票，小程序需要 -// if(Objects.equals(payDraftingGroupSubItem.getNeedInvoice(), PayProjectCommon.NEED_INVOICE3)){ -// listNeedInvoice.add(1); -// listNeedInvoice.add(2); -// }else{ -// listNeedInvoice.add(payDraftingGroupSubItem.getNeedInvoice()); -// } -// } if(!StringUtils.isBlank(payDraftingGroupSubItem.getChargeProject())){ payDraftingGroupSubItem.setChargeProject(oConvertUtils.replaceAllPercent(payDraftingGroupSubItem.getChargeProject())); } @@ -167,7 +158,7 @@ public class PayDraftingGroupSubItemController extends JeroController listProjectIds = new ArrayList<>(); - // 工作组的企业联系人 + // 起草组的企业联系人 LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getContactsId,sysUser.getId()); List listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); @@ -175,52 +166,6 @@ public class PayDraftingGroupSubItemController extends JeroController listProjectId = listPayDraftingGroupSubItemContacts.stream().map(PayDraftingGroupSubItemContacts::getDraftingGroupSubId).collect(Collectors.toList()); listProjectIds.addAll(listProjectId); } - - // 邮寄联系人 - LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); - queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId()); - List listPayMailBill = payMailBillService.list(queryPayMailBill); - if(!CollectionUtils.isEmpty(listPayMailBill)){ - List listId = listPayMailBill.stream().map(PayMailBill::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayMailBillProject = new LambdaQueryWrapper<>(); - queryPayMailBillProject.in(PayMailBillProject::getBillId,listId); - List listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject); - if(!CollectionUtils.isEmpty(listPayMailBillProject)){ - List listProjectId = listPayMailBillProject.stream().map(PayMailBillProject::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listProjectId); - } - } - // 打包的企业联系人和打包联系人 - LambdaQueryWrapper queryPayPackCompany = new LambdaQueryWrapper<>(); - queryPayPackCompany.eq(PayPackCompany::getCompanyContactId,sysUser.getId()).or() - .eq(PayPackCompany::getPackContactId,sysUser.getId()); - List listPayPackCompany = payPackCompanyService.list(queryPayPackCompany); - if(!CollectionUtils.isEmpty(listPayPackCompany)){ - List listPayPackCompanyId = listPayPackCompany.stream().map(PayPackCompany::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayPackCompanyProject = new LambdaQueryWrapper<>(); - queryPayPackCompanyProject.in(PayPackCompanyProject::getPackId,listPayPackCompanyId); - queryPayPackCompanyProject.eq(PayPackCompanyProject::getProjectType, PayProjectCommon.PROJECT_TYPE2); - List listPayPackCompanyProject = payPackCompanyProjectService.list(queryPayPackCompanyProject); - if(!CollectionUtils.isEmpty(listPayPackCompanyProject)){ - List listId = listPayPackCompanyProject.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listId); - } - } - // 关联合同的签订单位联系人 - LambdaQueryWrapper queryPayIncomeContract = new LambdaQueryWrapper<>(); - queryPayIncomeContract.eq(PayIncomeContract::getSignedContactsId,sysUser.getId()); - List listPayIncomeContract = payIncomeContractService.list(queryPayIncomeContract); - if(!CollectionUtils.isEmpty(listPayIncomeContract)){ - List listId = listPayIncomeContract.stream().map(PayIncomeContract::getId).collect(Collectors.toList()); - LambdaQueryWrapper queryPayIncomeContractAssociated = new LambdaQueryWrapper<>(); - queryPayIncomeContractAssociated.in(PayIncomeContractAssociated::getContractId,listId); - queryPayIncomeContractAssociated.eq(PayIncomeContractAssociated::getProjectType,PayProjectCommon.PROJECT_TYPE2); - List listPayIncomeContractAssociated = payIncomeContractAssociatedService.list(queryPayIncomeContractAssociated); - if(!CollectionUtils.isEmpty(listPayIncomeContractAssociated)){ - List listProjectId = listPayIncomeContractAssociated.stream().map(PayIncomeContractAssociated::getProjectId).collect(Collectors.toList()); - listProjectIds.addAll(listProjectId); - } - } List listProjectIdsNew = new ArrayList<>(); if(!CollectionUtils.isEmpty(listProjectIds)){ listProjectIdsNew = listProjectIds.stream().distinct().collect(Collectors.toList()); @@ -232,8 +177,6 @@ public class PayDraftingGroupSubItemController extends JeroController list = pageList.getRecords(); List listIds = list.stream().map(PayDraftingGroupSubItem::getDraftingGroupId).collect(Collectors.toList()); @@ -241,7 +184,7 @@ public class PayDraftingGroupSubItemController extends JeroController listPayDraftingGroup = payDraftingGroupService.list(queryPayDraftingGroup); if(CollectionUtils.isEmpty(listPayDraftingGroup)){ - return Result.error("工作组不存在"); + return Result.error("起草组不存在"); } List listString = listPayDraftingGroup.stream().map(PayDraftingGroup::getPrincipalIdA).collect(Collectors.toList()); LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); @@ -249,12 +192,6 @@ public class PayDraftingGroupSubItemController extends JeroController listSysUser = sysUserService.list(querySysUser); list.forEach(p->{ -// if(Objects.isNull(p.getReceivableAmount())){ -// p.setReceivableAmount(new BigDecimal("0.00")); -// } -// if(Objects.isNull(p.getPaidAmount())){ -// p.setPaidAmount(new BigDecimal("0.00")); -// } List listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPrincipalIdA)){ if(!CollectionUtils.isEmpty(listSysUser)){ @@ -331,12 +268,12 @@ public class PayDraftingGroupSubItemController extends JeroController edit(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index 4594047e..e96a25a5 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -73,18 +73,9 @@ AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%')) - - AND pwgs.pack = #{payDraftingGroupSubItem.pack} - AND pwg.year = #{payDraftingGroupSubItem.year} - - AND pwgs.need_invoice in - - #{item} - - AND pwgs.id in @@ -103,18 +94,9 @@ AND pwg.drafting_group_project like concat('%',concat(#{payDraftingGroupSubItem.chargeProject},'%')) - - AND pwgs.pack = #{payDraftingGroupSubItem.pack} - AND pwg.year = #{payDraftingGroupSubItem.year} - - AND pwgs.need_invoice in - - #{item} - - and pwgs.charge_company_id = #{companyId} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index e2ceb5a4..edb0f73d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -1,11 +1,15 @@ package com.jero.drafting.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.dto.PaySendContactsMessageDTO; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.ContractCreateProjectSendMessageService; import com.jero.common.service.RolePermissionService; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.ImportExcelUtil; @@ -26,6 +30,7 @@ import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.CheckVo; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.project.entity.PayWorkingGroupSubItemContacts; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; @@ -43,6 +48,7 @@ import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -80,6 +86,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl Date: Thu, 11 Jan 2024 14:30:29 +0800 Subject: [PATCH 25/52] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E5=88=97=E8=A1=A8,=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDraftingGroupSubItemController.java | 11 +++++++++++ .../impl/PayDraftingGroupSubItemServiceImpl.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index e2840b93..fa03d042 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -191,7 +191,18 @@ public class PayDraftingGroupSubItemController extends JeroController listSysUser = sysUserService.list(querySysUser); + // 获取企业联系人 + List subItemIds = list.stream().map(PayDraftingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, subItemIds); + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryDraftingGroupSubItemContacts); list.forEach(p->{ + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + List payDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsList + .stream().filter(item -> Objects.equals(item.getDraftingGroupSubId(), p.getId())).collect(Collectors.toList()); + p.setPayDraftingGroupSubItemContactsList(payDraftingGroupSubItemContacts); + } + List listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPrincipalIdA)){ if(!CollectionUtils.isEmpty(listSysUser)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index edb0f73d..d4cbd7d0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -179,7 +179,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl Date: Thu, 11 Jan 2024 15:24:51 +0800 Subject: [PATCH 26/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E7=AB=AF=E6=9F=A5=E8=AF=A2=E8=B5=B7=E8=8D=89=E7=BB=84=E6=88=90?= =?UTF-8?q?=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemController.java | 45 +++++++++++++------ .../xml/PayDraftingGroupSubItemMapper.xml | 3 ++ 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index fa03d042..c7f61c6f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -78,19 +78,7 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); @@ -502,4 +490,35 @@ public class PayDraftingGroupSubItemController extends JeroController query(PayDraftingGroupSubItem payDraftingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payDraftingGroupSubItem.getChargeCompanyTemporaryName()) && payDraftingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getDraftingGroupId())) { + return Result.error("起草组id不能为空！"); + } + if (StringUtils.isBlank(payDraftingGroupSubItem.getId())) { + return Result.error("起草组成员id不能为空！"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(payDraftingGroupSubItem.getDraftingGroupId()); + if(Objects.isNull(payDraftingGroup)){ + return Result.error("起草组不存在！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); + PayDraftingGroupSubItem item = pageList.getRecords().get(0); + return Result.OK(item); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index e96a25a5..bf073555 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -34,6 +34,9 @@ AND pcm.company_name LIKE concat('%',concat(#{payDraftingGroupSubItem.chargeCompanyTemporaryName},'%')) + + AND pdgs.id = #{payDraftingGroupSubItem.id} + GROUP BY pdgs.id ORDER BY pdgs.create_time desc From ce7f37fb964ffd32f4b9d3b82fa40e74940917ae Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 11 Jan 2024 16:45:06 +0800 Subject: [PATCH 27/52] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E4=BF=A1=E6=81=AF(=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E6=88=90=E5=91=98id)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...raftingGroupResearchProjectController.java | 30 ++++++++++++ .../PayDraftingGroupSubItemController.java | 29 ++++++++++- .../PayDraftingGroupSubItemServiceImpl.java | 11 ++++- .../PayWorkingGroupSubItemController.java | 49 +++++++++++++++++++ .../xml/PayWorkingGroupSubItemMapper.xml | 3 ++ 5 files changed, 118 insertions(+), 4 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java index 40b5b0a8..5998d472 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupResearchProjectController.java @@ -80,6 +80,36 @@ public class PayDraftingGroupResearchProjectController extends JeroController enterpriseQueryPageList(PayDraftingGroupResearchProject payResearchProject, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + if(StringUtils.isNotBlank(payResearchProject.getDraftingGroupId())){ + queryWrapper.eq("drafting_group_id",payResearchProject.getDraftingGroupId()); + }else { + return Result.error("起草组id为空！"); + } + if(StringUtils.isNotBlank(payResearchProject.getProjectName())){ + queryWrapper.like("project_name",payResearchProject.getProjectName()); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payDraftingGroupResearchProjectService.pageList(page,queryWrapper); + return Result.OK(pageList); + } + /** * 新增 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index c7f61c6f..d945191d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -16,6 +16,7 @@ import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; import com.jero.contract.service.IPayIncomeContractAssociatedService; import com.jero.contract.service.IPayIncomeContractService; +import com.jero.drafting.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; import com.jero.drafting.entity.PayDraftingGroupSubItemContacts; @@ -167,6 +168,9 @@ public class PayDraftingGroupSubItemController extends JeroController list = pageList.getRecords(); + // 过滤数据，只要审核通过的数据 + list = list.stream().filter(item -> Objects.equals(item.getCheckResult(), DraftingConstant.CHECK_PASS)).collect(Collectors.toList()); + List listIds = list.stream().map(PayDraftingGroupSubItem::getDraftingGroupId).collect(Collectors.toList()); LambdaQueryWrapper queryPayDraftingGroup = new LambdaQueryWrapper<>(); queryPayDraftingGroup.in(PayDraftingGroup::getId,listIds); @@ -497,7 +501,7 @@ public class PayDraftingGroupSubItemController extends JeroController query(PayDraftingGroupSubItem payDraftingGroupSubItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -518,7 +522,28 @@ public class PayDraftingGroupSubItemController extends JeroController page = new Page<>(pageNo, pageSize); IPage pageList = payDraftingGroupSubItemService.queryPageList(page, payDraftingGroupSubItem, paymentDate); - PayDraftingGroupSubItem item = pageList.getRecords().get(0); + List records = pageList.getRecords(); + if (CollectionUtils.isEmpty(records)) { + return Result.error("该成员不存在！"); + } + PayDraftingGroupSubItem item = records.get(0); return Result.OK(item); } + + /** + * 企业端-起草组成员添加(不带权限) + * + * @param payDraftingGroupSubItem 起草组成员 + * @return + */ + @ApiOperation(value = "企业端-起草组成员添加", notes = "企业端-起草组成员添加") + @PostMapping(value = "/addByQRCode") + public Result addByQRCode(@RequestBody PayDraftingGroupSubItem payDraftingGroupSubItem) { + StringBuilder msg = ValidUtil.validateAll(payDraftingGroupSubItem); + if (!StringUtils.isBlank(msg)) { + return Result.error(msg.toString()); + } + payDraftingGroupSubItemService.addPayDraftingGroupSubItem(payDraftingGroupSubItem); + return Result.OK("添加成功！"); + } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index d4cbd7d0..624a1afb 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -178,10 +178,17 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listPayDraftingGroupSubItemContactsNew) { JSONObject json = new JSONObject(); json.put("type",ProjectCommon.PROJECT_TYPE7); - json.put("draftGroupId",payDraftingGroupSubItem.getDraftingGroupId()); - json.put("projectId",payDraftingGroupSubItem.getId()); + json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); + json.put("projectId", payDraftingGroupSubItem.getId()); json.put("path","/draftTeam/DraftTeamDetail"); //新建项目 给企业联系人发消息 if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 11929740..34dc3e9b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -151,6 +151,55 @@ public class PayWorkingGroupSubItemController extends JeroController getItemById(PayWorkingGroupSubItem payWorkingGroupSubItem, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + @RequestParam(name = "paymentDate", required = false) String paymentDate) { + if (!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName()) && payWorkingGroupSubItem.getChargeCompanyTemporaryName().length() > 50) { + return Result.error("成员单位长度不能大于50个字符"); + } + if (StringUtils.isBlank(payWorkingGroupSubItem.getWorkingGroupId())) { + return Result.error("工作组id不能为空！"); + } + if(!StringUtils.isBlank(payWorkingGroupSubItem.getChargeCompanyTemporaryName())){ + payWorkingGroupSubItem.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(payWorkingGroupSubItem.getChargeCompanyTemporaryName())); + } + PayWorkingGroup payWorkingGroup = payWorkingGroupService.getById(payWorkingGroupSubItem.getWorkingGroupId()); + if(Objects.isNull(payWorkingGroup)){ + return Result.error("工作组不存在！"); + } + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payWorkingGroupSubItemService.queryPageList(page, payWorkingGroupSubItem, paymentDate); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ + List list = pageList.getRecords(); + list.forEach(p->{ + if(Objects.isNull(p.getReceivableAmount())){ + p.setReceivableAmount(new BigDecimal("0.00")); + } + if(Objects.isNull(p.getPaidAmount())){ + p.setPaidAmount(new BigDecimal("0.00")); + } + }); + } + List records = pageList.getRecords(); + if (CollectionUtils.isEmpty(records)){ + return Result.error("该成员不存在"); + } + PayWorkingGroupSubItem item = records.get(0); + return Result.OK(item); + } + /** * 分页列表查询 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml index 51e2ac37..379dd6f4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml @@ -78,6 +78,9 @@ AND pwgs.estimated_arrival_date <= #{payWorkingGroupSubItem.estimatedArrivalEndDate} + + and pwgs.id = #{payWorkingGroupSubItem.id} + GROUP BY pwgs.id ORDER BY pwgs.create_time desc From 62dac46bd2bc6e7b4717f2edeb936d8e93782451 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 11 Jan 2024 17:32:36 +0800 Subject: [PATCH 28/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=8A=A5=E5=90=8D=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PayDraftingGroupSubItemController.java | 4 ++++ .../impl/PayDraftingGroupSubItemServiceImpl.java | 10 ++++++++++ .../controller/PayWorkingGroupSubItemController.java | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index d945191d..cd5af935 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -166,6 +166,10 @@ public class PayDraftingGroupSubItemController extends JeroController passList = pageList.getRecords().stream().filter(item -> Objects.equals(item.getCheckResult(), DraftingConstant.CHECK_PASS)).collect(Collectors.toList()); + pageList.setRecords(passList); + if(!CollectionUtils.isEmpty(pageList.getRecords())){ List list = pageList.getRecords(); // 过滤数据，只要审核通过的数据 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index 624a1afb..a04da740 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -714,6 +714,16 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl payDraftingGroupSubItemContactsList = draftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + sendMessage(draftingGroupSubItem,payDraftingGroup,payDraftingGroupSubItemContactsList); + } } /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 34dc3e9b..19c37896 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -160,7 +160,7 @@ public class PayWorkingGroupSubItemController extends JeroController getItemById(PayWorkingGroupSubItem payWorkingGroupSubItem, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @@ -172,6 +172,9 @@ public class PayWorkingGroupSubItemController extends JeroController Date: Thu, 11 Jan 2024 18:17:09 +0800 Subject: [PATCH 29/52] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E6=93=8D=E4=BD=9C=E5=88=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemController.java | 15 +---- .../IPayDraftingGroupSubItemService.java | 7 ++ .../PayDraftingGroupSubItemServiceImpl.java | 67 ++++++++++++++++++- 3 files changed, 73 insertions(+), 16 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index cd5af935..b482463e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -12,10 +12,6 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.ValidUtil; import com.jero.common.util.oConvertUtils; -import com.jero.contract.entity.PayIncomeContract; -import com.jero.contract.entity.PayIncomeContractAssociated; -import com.jero.contract.service.IPayIncomeContractAssociatedService; -import com.jero.contract.service.IPayIncomeContractService; import com.jero.drafting.common.DraftingConstant; import com.jero.drafting.entity.PayDraftingGroup; import com.jero.drafting.entity.PayDraftingGroupSubItem; @@ -25,17 +21,8 @@ import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService; import com.jero.drafting.service.IPayDraftingGroupSubItemService; import com.jero.drafting.vo.CheckVo; import com.jero.drafting.vo.PayDraftingGroupSubItemExcel; -import com.jero.mail.entity.PayMailBill; -import com.jero.mail.entity.PayMailBillProject; -import com.jero.mail.service.IPayMailBillProjectService; -import com.jero.mail.service.IPayMailBillService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.pack.entity.PayPackCompany; -import com.jero.pack.entity.PayPackCompanyProject; -import com.jero.pack.service.IPayPackCompanyProjectService; -import com.jero.pack.service.IPayPackCompanyService; -import com.jero.project.common.PayProjectCommon; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayContactsManagementTemporaryService; import io.swagger.annotations.Api; @@ -305,7 +292,7 @@ public class PayDraftingGroupSubItemController extends JeroController queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubItemId); + queryDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getContactsId,sysUser.getId()); + long l = payDraftingGroupSubItemContactsService.count(queryDraftingGroupSubItemContacts); + if(l == 0){ + throw new JeroBootException("非起草组成员不可操作！"); + } + + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, payDraftingGroupSubItem.getDraftingGroupId()); + queryWrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, payDraftingGroupSubItem.getChargeCompanyId()); + PayDraftingGroupSubItem payDraftingGroupSubItemNew = payDraftingGroupSubItemService.getOne(queryWrapper); + // 企业和联系人同时存在，则校验不通过 + if (!Objects.isNull(payDraftingGroupSubItemNew) && !Objects.equals(payDraftingGroupSubItemNew.getId(), draftingGroupSubItemId)) { + throw new JeroBootException("起草组成员单位已存在！"); + } + } catch (Exception e) { + throw new JeroBootException("起草组成员单位已存在！"); + } + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, payDraftingGroupSubItemOld.getId()); + List listPayDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)) { + payDraftingGroupSubItemOld.setPayDraftingGroupSubItemContactsList(listPayDraftingGroupSubItemContacts); + } + setPayDraftingGroupSubItemEdit(payDraftingGroupSubItem, payDraftingGroupSubItemOld); + List listPayDraftingGroupSubItemContactsNew = payDraftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); + // 添加联系人表 + if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContactsNew)) { + // 先删除之前的企业联系人 + LambdaUpdateWrapper updatePayWorkingGroupSubItemContacts = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, draftingGroupSubItemId); + payDraftingGroupSubItemContactsService.remove(updatePayWorkingGroupSubItemContacts); + // 添加新的企业联系人 + for (int i = 0; i < listPayDraftingGroupSubItemContactsNew.size(); i++) { + listPayDraftingGroupSubItemContactsNew.get(i).setOrderNum(i + 1); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupSubId(draftingGroupSubItemId); + listPayDraftingGroupSubItemContactsNew.get(i).setDraftingGroupId(payDraftingGroupSubItem.getDraftingGroupId()); + } + payDraftingGroupSubItemContactsService.saveBatch(listPayDraftingGroupSubItemContactsNew); + } + payDraftingGroupSubItemService.updateById(payDraftingGroupSubItem); + } + /** * 插入企业信息，联系人信息到临时表，更新项目记录 * From fa098c774b14d43da67ff2d6baab7349a5f6610c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Thu, 11 Jan 2024 18:25:35 +0800 Subject: [PATCH 30/52] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E6=93=8D=E4=BD=9C=E5=88=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayWorkingGroupSubItemController.java | 3 +- .../IPayWorkingGroupSubItemService.java | 13 +- .../PayWorkingGroupSubItemServiceImpl.java | 167 +++++++++++++++++- 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 19c37896..89a7c272 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -445,7 +445,6 @@ public class PayWorkingGroupSubItemController extends JeroController editCompany(@RequestBody PayWorkingGroupSubItem payWorkingGroupSubItem) { @@ -456,7 +455,7 @@ public class PayWorkingGroupSubItemController extends JeroController queryWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId, workingGroupSubItemId); + queryWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId()); + long l = payWorkingGroupSubItemContactsService.count(queryWorkingGroupSubItemContacts); + if(l == 0){ + throw new JeroBootException("非工作组成员不可操作！"); + } + + // 项目为打包状态 || 到账！=0 || 开票！=0 || 邮寄！=0 + if(!Objects.equals(payWorkingGroupSubItem.getChargeCompanyId(),payWorkingGroupSubItemOld.getChargeCompanyId()) + && (Objects.equals(payWorkingGroupSubItem.getPack(),PayProjectCommon.PACKAGING1) + || !Objects.equals(payWorkingGroupSubItem.getInAccount(),PayProjectCommon.IN_ACCOUNT0) + || !Objects.equals(payWorkingGroupSubItem.getMakeInvoice(),PayProjectCommon.MAKE_INVOICE0) + || !Objects.equals(payWorkingGroupSubItem.getMail(),PayProjectCommon.MAIL0))){ + throw new JeroBootException("来款企业不可更改！"); + } + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){ + throw new JeroBootException("待确收金额不能为空"); + } + if(StringUtils.isBlank(payWorkingGroupSubItem.getContractNum())){ + throw new JeroBootException("合同号不能为空"); + } + } + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){ + if(Objects.isNull(payWorkingGroupSubItem.getChargeNoticeNo())){ + throw new JeroBootException("收费通知号不能为空"); + } + if(Objects.isNull(payWorkingGroupSubItem.getReceivableAmount())){ + throw new JeroBootException("待确收金额不能为空"); + } + } + + try { + // 编辑保存前再次校验来款项目是否存在 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayWorkingGroupSubItem::getWorkingGroupId,payWorkingGroupSubItem.getWorkingGroupId()); + queryWrapper.eq(PayWorkingGroupSubItem::getChargeCompanyId,payWorkingGroupSubItem.getChargeCompanyId()); +// queryWrapper.eq(PayWorkingGroupSubItem::getContactsIdOne,payWorkingGroupSubItem.getContactsIdOne()); + PayWorkingGroupSubItem payWorkingGroupSubItemNew = payWorkingGroupSubItemService.getOne(queryWrapper); + // 来款项目存在，并且编辑id与查询不同，则校验不通过 + if(!Objects.isNull(payWorkingGroupSubItemNew) + && !Objects.equals(payWorkingGroupSubItemNew.getId(), workingGroupSubItemId)) { + throw new JeroBootException("工作组成员单位已存在！"); + } + }catch (Exception e){ + log.info("工作组成员-编辑异常",e); + throw new JeroBootException("工作组成员单位已存在！"); + } + // 校验项目是否已关联合同 + PayIncomeContract payIncomeContract = payIncomeContractService.checkPayIncomeContractAssociated(workingGroupSubItemId); + if(!Objects.isNull(payIncomeContract)){ + if(!Objects.equals(payWorkingGroupSubItem.getChargeWay(),payWorkingGroupSubItemOld.getChargeWay())){ + throw new JeroBootException("项目已关联合同，来款方式不可修改！"); + } + if(Objects.equals(payWorkingGroupSubItemOld.getChargeWay(),PayProjectCommon.CHARGE_WAY2) && !Objects.equals(payWorkingGroupSubItemOld.getContractNum(),payWorkingGroupSubItem.getContractNum())){ + throw new JeroBootException("项目已关联合同，合同编号不可修改！"); + } + }else{ + PayIncomeContract payIncomeContractAdd = null; + // 来款方式为合同，校验合同编号 + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + payIncomeContractAdd = payIncomeContractService.setPayIncomeContractAssociated(payWorkingGroupSubItem.getContractNum(),payWorkingGroupSubItem.getChargeCompanyId(), workingGroupSubItemId); + } + if(!Objects.isNull(payIncomeContractAdd)){ + // 合同存在 && 合同状态不为草稿，不为未通过 关联合同 + payIncomeContractService.insertPayIncomeContract(payIncomeContractAdd, workingGroupSubItemId,Integer.parseInt(PayProjectCommon.PROJECT_TYPE2)); + Integer pack = payIncomeContractAdd.getPack(); + if (Objects.equals(pack,PayProjectCommon.PACKAGING1)){ + payWorkingGroupSubItem.setPack(PayProjectCommon.PACKAGING1); + } + }else{ + payWorkingGroupSubItem.setPack(payWorkingGroupSubItemOld.getPack()); + } + // 关联了合同,判断合同是否打包，更新项目打包状态，添加打包 + if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){ + String masterContactsId = payWorkingGroupSubItemContactsMapper.getMasterContactsId(workingGroupSubItemId); + payPackCompanyProjectService.setPack(payWorkingGroupSubItem.getChargeCompanyId(),masterContactsId,payIncomeContractAdd.getPackYear(), workingGroupSubItemId,PayProjectCommon.PROJECT_TYPE2,payIncomeContractAdd.getPack()); + } + } + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,payWorkingGroupSubItemOld.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + payWorkingGroupSubItemOld.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); + } + setPayWorkingGroupSubItemEdit(payWorkingGroupSubItem,payWorkingGroupSubItemOld); + List listPayWorkingGroupSubItemContactsNew = payWorkingGroupSubItem.getPayWorkingGroupSubItemContactsList(); + // 添加联系人表 + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContactsNew)){ + for (int i = 0; i < listPayWorkingGroupSubItemContactsNew.size(); i++) { + listPayWorkingGroupSubItemContactsNew.get(i).setOrderNum(i+1); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupId(payWorkingGroupSubItem.getWorkingGroupId()); + listPayWorkingGroupSubItemContactsNew.get(i).setWorkingGroupSubId(workingGroupSubItemId); + } + payWorkingGroupSubItemContactsService.saveBatch(listPayWorkingGroupSubItemContactsNew); + } + payWorkingGroupSubItem.setChargeUse(PayProjectCommon.CHARGE_USE1); + // 变更待确收金额，重新校验状态 + ProjectStatusVO projectStatusVO = projectDetailService.getStatus(workingGroupSubItemId,payWorkingGroupSubItem.getReceivableAmount(),payWorkingGroupSubItem.getNeedInvoice()); + if(!Objects.isNull(projectStatusVO)){ + if(!Objects.isNull(projectStatusVO.getInAccount())){ + payWorkingGroupSubItem.setInAccount(projectStatusVO.getInAccount()); + } + if(!Objects.isNull(projectStatusVO.getMakeInvoice())){ + payWorkingGroupSubItem.setMakeInvoice(projectStatusVO.getMakeInvoice()); + } + if(!Objects.isNull(projectStatusVO.getMail())){ + payWorkingGroupSubItem.setMail(projectStatusVO.getMail()); + } + } + String paymentStatus = payPaymentCheckService.getPaymentStatus(payWorkingGroupSubItem.getReceivableAmount(),payWorkingGroupSubItemOld.getPaidAmount(),payWorkingGroupSubItemOld.getPaymentStatus()); + payWorkingGroupSubItem.setPaymentStatus(paymentStatus); + payWorkingGroupSubItem.setInAccount(null); + payWorkingGroupSubItem.setPaidAmount(null); + + BigDecimal taxRate = payWorkingGroupSubItem.getTaxRate(); + BigDecimal receivableAmount = payWorkingGroupSubItem.getReceivableAmount(); + BigDecimal noTaxAmount = receivableAmount.divide(taxRate.add(BigDecimal.ONE), 2, RoundingMode.HALF_UP); + BigDecimal tax = receivableAmount.subtract(noTaxAmount); + payWorkingGroupSubItem.setNoTaxAmount(noTaxAmount); + payWorkingGroupSubItem.setTax(tax); + payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem); + LambdaUpdateWrapper updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>(); + updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId, workingGroupSubItemId); + // 选择无 + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY1)){ + //updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getReceivableAmount,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,null); + } + // 选择合同 + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY2)){ + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getCharge,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeNo,null); + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getChargeNoticeId,null); + } + // 选择收费通知 + if(Objects.equals(payWorkingGroupSubItem.getChargeWay(),PayProjectCommon.CHARGE_WAY3)){ + updatePayWorkingGroupSubItem.set(PayWorkingGroupSubItem::getContractNum,null); + } + payWorkingGroupSubItemService.update(updatePayWorkingGroupSubItem); + // 如果有邮寄信息更新邮寄联系人信息 + String mailContactsId = payWorkingGroupSubItem.getMailContactsId(); + payMailBillService.updateContactByProjectId(mailContactsId, workingGroupSubItemId, null); + } + @Override @Transactional(rollbackFor = JeroBootException.class) public void importExcel(HttpServletRequest request) { From da27b502e70674655adcffba02364a82a4af2666 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Thu, 11 Jan 2024 19:08:05 +0800 Subject: [PATCH 31/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B8=BA=E6=8B=92=E7=BB=9D=E7=9B=B4=E6=8E=A5=E5=B0=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectDetailServiceImpl.java | 3 +- .../PayDraftingGroupSubItemServiceImpl.java | 37 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) 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 86b7e898..b242e605 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 @@ -335,7 +335,8 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { p.setPostalCodeContacts(payContactsManagementTemporary.getPostalCode()); p.setContactAddress(payContactsManagementTemporary.getContactAddress()); }); - projectDetailVO.setPayDraftingGroupSubItemContactsLists(listPayDraftingGroupSubItemContacts); + List payWorkingGroupSubItemContactsList = JSON.parseArray(JSONArray.toJSONString(listPayDraftingGroupSubItemContacts), PayWorkingGroupSubItemContacts.class); + projectDetailVO.setPayWorkingGroupSubItemContactsList(payWorkingGroupSubItemContactsList); } } }else { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index a04da740..d95fe363 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.drafting.service.impl; 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; @@ -153,6 +154,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayDraftingGroupSubItem::getDraftingGroupId, payDraftingGroupSubItem.getDraftingGroupId()); queryWrapper.eq(PayDraftingGroupSubItem::getChargeCompanyId, payDraftingGroupSubItem.getChargeCompanyId()); + queryWrapper.ne(PayDraftingGroupSubItem::getCheckResult,DraftingConstant.CHECK_REJECTION); PayDraftingGroupSubItem payDraftingGroupSubItemNew = payDraftingGroupSubItemService.getOne(queryWrapper); // 企业和联系人同时存在，则校验不通过 if (!Objects.isNull(payDraftingGroupSubItemNew)) { @@ -707,22 +709,31 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(PayDraftingGroupSubItem::getId,payDraftingGroupSubItemId); - updateWrapper.set(StringUtils.isNotBlank(checkRemark),PayDraftingGroupSubItem::getCheckRemark,checkRemark); - updateWrapper.set(!Objects.isNull(checkResult),PayDraftingGroupSubItem::getCheckResult,checkResult); - payDraftingGroupSubItemService.update(updateWrapper); - // 如果审核通过,发送消息 if(Objects.equals(checkVO.getCheckResult(),DraftingConstant.CHECK_PASS)) { - PayDraftingGroupSubItem draftingGroupSubItem = payDraftingGroupSubItemService.getById(payDraftingGroupSubItemId); - if (Objects.isNull(draftingGroupSubItem) || StringUtils.isBlank(draftingGroupSubItem.getDraftingGroupId())) { - throw new JeroBootException("起草组不存在"); - } - PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(draftingGroupSubItem.getDraftingGroupId()); - List payDraftingGroupSubItemContactsList = draftingGroupSubItem.getPayDraftingGroupSubItemContactsList(); - sendMessage(draftingGroupSubItem,payDraftingGroup,payDraftingGroupSubItemContactsList); + // 审核通过,将状态改为2 发送消息 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(PayDraftingGroupSubItem::getId,payDraftingGroupSubItemId); + updateWrapper.set(StringUtils.isNotBlank(checkRemark),PayDraftingGroupSubItem::getCheckRemark,checkRemark); + updateWrapper.set(!Objects.isNull(checkResult),PayDraftingGroupSubItem::getCheckResult,checkResult); + payDraftingGroupSubItemService.update(updateWrapper); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,payDraftingGroupSubItem.getDraftingGroupId()); + queryWrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId,payDraftingGroupSubItem.getId()); + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryWrapper); + sendMessage(payDraftingGroupSubItem,payDraftingGroup,payDraftingGroupSubItemContactsList); + } + if(Objects.equals(checkVO.getCheckResult(),DraftingConstant.CHECK_REJECTION)) { + // 直接将数据删除 + payDraftingGroupSubItemService.removeById(payDraftingGroupSubItemId); + // 删除对应的联系表 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,payDraftingGroupSubItem.getDraftingGroupId()); + queryWrapper.eq(PayDraftingGroupSubItemContacts::getDraftingGroupSubId,payDraftingGroupSubItem.getId()); + payDraftingGroupSubItemContactsService.remove(queryWrapper); } } From 4ca44ced91146005778f75205e70b45165be16c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 12 Jan 2024 11:04:11 +0800 Subject: [PATCH 32/52] =?UTF-8?q?=E8=B5=B7=E8=8D=89=E7=BB=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/common/common/ProjectCommon.java | 4 ++-- .../service/impl/ProjectDetailServiceImpl.java | 4 ++-- .../service/impl/PayDraftingGroupServiceImpl.java | 13 +------------ .../impl/PayDraftingGroupSubItemServiceImpl.java | 3 +-- .../com/jero/meeting/mapper/PayMeetingMapper.java | 2 +- 5 files changed, 7 insertions(+), 19 deletions(-) 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 6a2b58c6..8b59a143 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 @@ -38,9 +38,9 @@ public class ProjectCommon { */ public final static String PROJECT_TYPE6 = "6"; /** - * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,7: 起草组项目） + * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,9: 起草组项目） */ - public final static String PROJECT_TYPE7 = "7"; + public final static String PROJECT_TYPE9 = "9"; /** * 来源（1:收入合同,2:打包管理） */ 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 b242e605..fe5a0f0b 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 @@ -139,7 +139,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { } // 起草组项目资料 - if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){ + if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId); @@ -302,7 +302,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); } } - }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)) { + }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)) { PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId); if(Objects.isNull(payDraftingGroupSubItem)){ throw new JeroBootException("项目不存在！"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index 2c35b4aa..eb80de79 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -7,7 +7,6 @@ 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.api.vo.Result; import com.jero.common.common.ProjectCommon; import com.jero.common.dto.PaySendContactsMessageDTO; import com.jero.common.exception.JeroBootException; @@ -32,21 +31,12 @@ import com.jero.meeting.entity.PayMeeting; import com.jero.meeting.service.IPayMeetingService; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; -import com.jero.modules.system.service.impl.SysUserServiceImpl; -import com.jero.project.common.PayProjectCommon; -import com.jero.project.entity.PayResearchProject; import com.jero.project.entity.PayWorkingGroup; -import com.jero.project.entity.PayWorkingGroupSubItem; -import com.jero.project.entity.PayWorkingGroupSubItemContacts; -import com.jero.project.mapper.PayWorkingGroupSubItemContactsMapper; import com.jero.project.service.IPayWorkingGroupService; -import com.jero.project.service.IPayWorkingGroupSubItemService; -import com.jero.project.vo.PayWorkingGroupVO; import com.jero.temporary.entity.PayCompanyManagementTemporary; import com.jero.temporary.entity.PayContactsManagementTemporary; import com.jero.temporary.service.IPayCompanyManagementTemporaryService; import com.jero.temporary.service.IPayContactsManagementTemporaryService; -import com.sun.xml.bind.v2.TODO; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -55,7 +45,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.math.BigDecimal; import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -369,7 +358,7 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl{ JSONObject json = new JSONObject(); - json.put("type", ProjectCommon.PROJECT_TYPE7); + json.put("type", ProjectCommon.PROJECT_TYPE9); json.put("DraftingGroupId",p.getDraftingGroupId()); json.put("projectId",p.getId()); json.put("path","/workTeam/WorkTeamDetail"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index 9fc5d7b3..ee52e02b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -2,7 +2,6 @@ package com.jero.drafting.service.impl; 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; @@ -186,7 +185,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listPayDraftingGroupSubItemContactsNew) { JSONObject json = new JSONObject(); - json.put("type",ProjectCommon.PROJECT_TYPE7); + json.put("type",ProjectCommon.PROJECT_TYPE9); json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); json.put("projectId", payDraftingGroupSubItem.getId()); json.put("path","/draftTeam/DraftTeamDetail"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java index abc029d2..0ff0c727 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/mapper/PayMeetingMapper.java @@ -35,7 +35,7 @@ public interface PayMeetingMapper extends BaseMapper { IPage workGroupPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - IPage draftGroupPage(Page page, QueryWrapper queryWrapper); + IPage draftGroupPage(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage standardPage(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); From b9f2444ac2a417e55ca1489d6f49c593601130ab Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 12 Jan 2024 14:32:17 +0800 Subject: [PATCH 33/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/common/common/ProjectCommon.java | 6 ++++-- .../jero/common/service/impl/ProjectDetailServiceImpl.java | 4 ++-- .../drafting/service/impl/PayDraftingGroupServiceImpl.java | 5 ++--- .../service/impl/PayDraftingGroupSubItemServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) 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 8b59a143..2dd71d98 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 @@ -38,9 +38,9 @@ public class ProjectCommon { */ public final static String PROJECT_TYPE6 = "6"; /** - * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,9: 起草组项目） + * 项目类型（1：普通项目，2：工作组项目，3：会议项目，4：会员项目，5：标协会员项目，6：证书,7: 起草组项目） */ - public final static String PROJECT_TYPE9 = "9"; + public final static String PROJECT_TYPE7 = "7"; /** * 来源（1:收入合同,2:打包管理） */ @@ -208,4 +208,6 @@ public class ProjectCommon { * 条件 0为发送创建通知，1为发送缴费通知 */ public final static String FLAG1 = "1"; + + public final static String INFO_TYPE9 = "9"; } 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 fe5a0f0b..b242e605 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 @@ -139,7 +139,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { } // 起草组项目资料 - if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){ + if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LambdaQueryWrapper queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,projectId); @@ -302,7 +302,7 @@ public class ProjectDetailServiceImpl implements ProjectDetailService { projectDetailVO.setPayWorkingGroupSubItemContactsList(listPayWorkingGroupSubItemContacts); } } - }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)) { + }else if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE7)) { PayDraftingGroupSubItem payDraftingGroupSubItem = payDraftingGroupSubItemService.getById(projectId); if(Objects.isNull(payDraftingGroupSubItem)){ throw new JeroBootException("项目不存在！"); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index eb80de79..c19e818a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -355,13 +355,12 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl{ JSONObject json = new JSONObject(); - json.put("type", ProjectCommon.PROJECT_TYPE9); + json.put("type", ProjectCommon.INFO_TYPE9); json.put("DraftingGroupId",p.getDraftingGroupId()); json.put("projectId",p.getId()); - json.put("path","/workTeam/WorkTeamDetail"); + json.put("path","/draftTeam/DraftTeamDetail"); //新建项目 给企业联系人发消息 List itemContactsList = p.getPayDraftingGroupSubItemContactsList(); for (PayDraftingGroupSubItemContacts subItemContacts : itemContactsList) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index ee52e02b..d3ef3418 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -185,7 +185,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listPayDraftingGroupSubItemContactsNew) { JSONObject json = new JSONObject(); - json.put("type",ProjectCommon.PROJECT_TYPE9); + json.put("type",ProjectCommon.INFO_TYPE9); json.put("draftGroupId", payDraftingGroupSubItem.getDraftingGroupId()); json.put("projectId", payDraftingGroupSubItem.getId()); json.put("path","/draftTeam/DraftTeamDetail"); From d61c7fab8cd9036e7c4736b6c1008d018f363e5f Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 12 Jan 2024 15:04:54 +0800 Subject: [PATCH 34/52] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89id=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B5=B7=E8=8D=89=E7=BB=84=E4=BF=A1=E6=81=AF(?= =?UTF-8?q?=E5=85=8Dtoken)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 5 ++++ .../PayDraftingGroupController.java | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 60449e9d..0953459f 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -201,6 +201,11 @@ public class ShiroConfig { // 快递100-快递信息 filterChainDefinitionMap.put("/mail/postInfo/queryInfo","anon"); + // 起草组报名-按照id查询 + filterChainDefinitionMap.put("/drafting/payDraftingGroup/applyQueryById","anon"); + // 起草组报名-提交信息 + filterChainDefinitionMap.put("/drafting/payDraftingGroupSubitem/addByQRCode","anon"); + // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); //如果cloudServer为空 则说明是单体 需要加载跨域配置 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java index c9c7f675..7afad13c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupController.java @@ -300,4 +300,30 @@ public class PayDraftingGroupController extends JeroController createBase64(String contact) { return Result.OK(QrcodeUtil.create(contact)); } + + /** + * 报名-起草组项目报名-通过id查询 + * + * @param id 起草组项目id + * @return + */ + @ApiOperation(value="报名-起草组项目-通过id查询", notes="报名-起草组项目-通过id查询") + @GetMapping(value = "/applyQueryById") + public Result applyQueryById(@RequestParam(name="id") String id) { + if (StringUtils.isBlank(id)) { + return Result.error("起草组id不能为空"); + } + PayDraftingGroup payDraftingGroup = payDraftingGroupService.getById(id); + if(Objects.isNull(payDraftingGroup)) { + return Result.error("未找到对应数据"); + } + // 根据工作组id查询对应的工作组名称 + if (StringUtils.isNotBlank(payDraftingGroup.getWorkingGroupId())) { + PayWorkingGroup payWorkingGroup = payDraftingGroupService.getPayWorkingGroupNameById(payDraftingGroup.getWorkingGroupId()); + if (!Objects.isNull(payWorkingGroup)) { + payDraftingGroup.setWorkingGroupName(payWorkingGroup.getWorkingGroupProject()); + } + } + return Result.OK(payDraftingGroup); + } } \ No newline at end of file From dfc4600765a072259b3db4a431ccdf902313ae2c Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 12 Jan 2024 16:44:00 +0800 Subject: [PATCH 35/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9db=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年1月中旬需求变更新增.sql | 6 ++++-- .../impl/PayWorkingGroupDistributionRecordServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index e6548868..ffa28f37 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -21,7 +21,7 @@ PRIMARY KEY (`id`) USING BTREE -- 新增 pay_drafting_group_subitem表 (起草组成员表) CREATE TABLE `pay_drafting_group_subitem` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', + `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '主键', `drafting_group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起草组id', `charge_company_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '成员单位id', `charge_company_temporary_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时成员单位id', @@ -30,6 +30,8 @@ CREATE TABLE `pay_drafting_group_subitem` ( `contacts_temporary_id_one` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人一id', `contacts_temporary_name_one` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人一名称', `remarks_one` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人备注1', + `check_result` int NULL DEFAULT NULL COMMENT '审核状态 1-未审核 2-已通过 3-已驳回', + `check_remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '审核说明', `contacts_id_two` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业联系人二id', `contacts_temporary_id_two` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人二id', `contacts_temporary_name_two` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '临时企业联系人二名称', @@ -41,7 +43,7 @@ CREATE TABLE `pay_drafting_group_subitem` ( `remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `working_drafting_id_and_company_id_index`(`drafting_group_id`, `charge_company_id`) USING BTREE COMMENT '工作组与企业唯一', 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 cf593ebe..80f73a64 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 @@ -248,7 +248,7 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE1) ? + (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE4) ? Objects.equals(item.getTemporaryContactsId(),p.getId()) : Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); if(CollectionUtils.isEmpty(listStr)){ From 53b6c8fa899000ae175ec57592b975cb0a8a63ca Mon Sep 17 00:00:00 2001 From: sunzheng Date: Fri, 12 Jan 2024 17:44:21 +0800 Subject: [PATCH 36/52] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AE=A1=E6=A0=B8=E8=A2=AB=E6=8B=92=E7=BB=9D?= =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayDraftingGroupMapper.xml | 8 ++--- .../impl/PayDraftingGroupServiceImpl.java | 35 +++++++++++++------ 2 files changed, 28 insertions(+), 15 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml index 16d4d12c..c0576888 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupMapper.xml @@ -33,10 +33,10 @@ - - AND pdgs.check_result != 3 - + + + + AND drafting_group_project LIKE concat('%',concat(#{payDraftingGroup.draftingGroupProject},'%')) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index c19e818a..1f8f5351 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -158,13 +158,20 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { - if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { - throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); - } - } + throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, id); +// List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); +// if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { +// for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { +// if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { +// throw new JeroBootException(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除!"); +// } +// } +// } + LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); meetingQuery.eq(PayMeeting::getDraftingGroupId,id); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); @@ -206,13 +213,19 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { - for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { - if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { - sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); - break; - } - } + sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); } +// LambdaQueryWrapper query = new LambdaQueryWrapper<>(); +// query.eq(PayDraftingGroupSubItem::getDraftingGroupId, p); +// List listPayDraftingGroupSubItem = payDraftingGroupSubItemService.list(query); +// if (!CollectionUtils.isEmpty(listPayDraftingGroupSubItem)) { +// for (PayDraftingGroupSubItem payDraftingGroupSubItem : listPayDraftingGroupSubItem) { +// if (!Objects.equals(payDraftingGroupSubItem.getCheckResult(), DraftingConstant.CHECK_REJECTION)) { +// sb1.append(payDraftingGroupOld.getDraftingGroupProject() + "起草组下存在企业，不可进行删除！
"); +// break; +// } +// } +// } LambdaQueryWrapper meetingQuery = new LambdaQueryWrapper<>(); meetingQuery.eq(PayMeeting::getDraftingGroupId,p); meetingQuery.eq(PayMeeting::getMeetingType, MeetingCommon.DRAFTING_GROUP_MEETING_INT); From 0ce241df42f99ca4bce0529d827f7d7d7651c4b9 Mon Sep 17 00:00:00 2001 From: danshihao Date: Mon, 15 Jan 2024 09:25:20 +0800 Subject: [PATCH 37/52] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E8=8F=9C=E5=8D=95sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年1月中旬需求变更新增.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index ffa28f37..4da0ed6e 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -119,6 +119,7 @@ ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_id` varchar(50) COMMENT ' ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_name` varchar(50) COMMENT '起草组名称'; -- sys_permission表 新增起草组相关菜单 +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 ('1736668960149286914', '', '起草组管理', '/draftingGroup/DraftingGroupManagement', 'draftingGroup/DraftingGroupManagement', NULL, NULL, 0, NULL, '1', 3.10, 0, 'cus_working', 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 16:45:20', 'LKGLZ', '2024-01-09 15:20:33', 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 ('1744610339198091266', '1430376424950026242', '起草组参会情况', '/incomePayments/meetManage/AttendanceDraftGroupMeeting', 'incomePayments/meetManage/Attendance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-09 14:41: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 ('1742070808427126785', '1430376424950026242', '起草组会议维护', '/draftingGroup/ConferenceMaintenance', 'draftingGroup/ConferenceMaintenance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 1, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:30:21', 'LKGLZ', '2024-01-02 14:30:32', 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 ('1742065161262358530', '1430376424950026242', '起草组在研项目', '/draftingGroup/DraftingGroupUnderStudyProject', 'draftingGroup/DraftingGroupUnderStudyProject', NULL, NULL, 1, NULL, '1', 21.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:07:55', 'LKGLZ', '2024-01-02 14:08:09', 0, 0, '1', 0, 1); From a716a8656f94e96270896104b39b05e29e1cbbdd Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 10:37:37 +0800 Subject: [PATCH 38/52] =?UTF-8?q?=E8=A1=A5=E5=85=A8sql=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年1月中旬需求变更新增.sql | 59 +++++++++++++++++-- .../src/main/resources/application-dev.yml | 22 ++++--- 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index 4da0ed6e..a4022aa7 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -43,7 +43,7 @@ CREATE TABLE `pay_drafting_group_subitem` ( `remarks` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `working_drafting_id_and_company_id_index`(`drafting_group_id`, `charge_company_id`) USING BTREE COMMENT '工作组与企业唯一', @@ -119,8 +119,55 @@ ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_id` varchar(50) COMMENT ' ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_name` varchar(50) COMMENT '起草组名称'; -- sys_permission表 新增起草组相关菜单 -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 ('1736668960149286914', '', '起草组管理', '/draftingGroup/DraftingGroupManagement', 'draftingGroup/DraftingGroupManagement', NULL, NULL, 0, NULL, '1', 3.10, 0, 'cus_working', 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 16:45:20', 'LKGLZ', '2024-01-09 15:20:33', 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 ('1744610339198091266', '1430376424950026242', '起草组参会情况', '/incomePayments/meetManage/AttendanceDraftGroupMeeting', 'incomePayments/meetManage/Attendance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-09 14:41: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 ('1742070808427126785', '1430376424950026242', '起草组会议维护', '/draftingGroup/ConferenceMaintenance', 'draftingGroup/ConferenceMaintenance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 1, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:30:21', 'LKGLZ', '2024-01-02 14:30:32', 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 ('1742065161262358530', '1430376424950026242', '起草组在研项目', '/draftingGroup/DraftingGroupUnderStudyProject', 'draftingGroup/DraftingGroupUnderStudyProject', NULL, NULL, 1, NULL, '1', 21.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:07:55', 'LKGLZ', '2024-01-02 14:08:09', 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 ('1736675369997905922', '1430376424950026242', '起草组成员维护', '/draftingGroup/DraftingGroupMemberUnitMaintenance', 'draftingGroup/DraftingGroupMemberUnitMaintenance', NULL, NULL, 1, NULL, '1', 20.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 17:10:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744975224801075202', '1736675369997905922', '审核', '', NULL, NULL, NULL, 2, 'draftingGroupMember:check', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-10 14:51:28', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650871911792641', '1742070808427126785', '上传会议纪要', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:uploadCouncil', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:37', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650747009613826', '1742070808427126785', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650680030773249', '1742070808427126785', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:51', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650603614748673', '1742070808427126785', '上传文件', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:upload', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:33', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650486782410753', '1742070808427126785', '发布', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:publish', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:05', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650398005772289', '1742070808427126785', '批量删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:44', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650314702700546', '1742070808427126785', '导出', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:24', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650199401283585', '1742070808427126785', '新增', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:56', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744650007667064833', '1742070808427126785', '查询', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:11', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744618617370066946', '1744610339198091266', '资料状态（嘉宾是否可以在企业端上传）', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:guestsUploadFileFlag', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:14:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744618038157656066', '1744610339198091266', '审核凭证', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:12:08', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617928828928002', '1744610339198091266', '审核报名信息', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditCredentials', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:11:42', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617734913671170', '1744610339198091266', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:56', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617671705509890', '1744610339198091266', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:41', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617607901757441', '1744610339198091266', '批量删除', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617378741764097', '1744610339198091266', '导出', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:31', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617286152503297', '1744610339198091266', '添加参会人', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:09', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744617202534858754', '1744610339198091266', '查询', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:08:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744610339198091266', '1430376424950026242', '起草组参会情况', '/incomePayments/meetManage/AttendanceDraftGroupMeeting', 'incomePayments/meetManage/Attendance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-09 14:41:33', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744557748690894850', '1742065161262358530', '删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:34', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744557677312229378', '1742065161262358530', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:17', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744557618365480962', '1742065161262358530', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:03', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744557548442238978', '1742065161262358530', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:47', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744557479416578050', '1742065161262358530', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:30', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744556066435252226', '1736675369997905922', '新增', '', NULL, NULL, NULL, 2, 'draftingGroupMember:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:05:53', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744553118539988993', '1736675369997905922', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroupMember:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:54:10', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744552595946487809', '1736675369997905922', '删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:52:06', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744552520780365825', '1736675369997905922', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:48', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744552416749043714', '1736675369997905922', '下载模板', '', NULL, NULL, NULL, 2, 'draftingGroupMember:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:23', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744552350437097473', '1736675369997905922', '导出', '', NULL, NULL, NULL, 2, 'draftingGroupMember:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744552151597727745', '1736675369997905922', '导入', '', NULL, NULL, NULL, 2, 'draftingGroupMember:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:50:20', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744551907694755841', '1736675369997905922', '查询', '', NULL, NULL, NULL, 2, 'draftingGroupMember:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:49:22', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550770337923073', '1736668960149286914', '在研项目', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudyProject', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550626938863617', '1736668960149286914', '删除', NULL, NULL, NULL, NULL, 2, 'draftingGroup:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:16', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550489080479745', '1736668960149286914', '基本信息维护', '', NULL, NULL, NULL, 2, 'draftingGroup:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:43', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550409195765762', '1736668960149286914', '复制', '', NULL, NULL, NULL, 2, 'draftingGroup:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:24', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550212579377153', '1736668960149286914', '工作组会议', '', NULL, NULL, NULL, 2, 'draftingGroup:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:38', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744550123177787393', '1736668960149286914', '其他分发资料', '', NULL, NULL, NULL, 2, 'draftingGroup:fileMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:16', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744549961910992898', '1736668960149286914', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:38', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744549877257355266', '1736668960149286914', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:18', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1744549760974471169', '1736668960149286914', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:40:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1736675369997905922', '1430376424950026242', '起草组成员维护', '/draftingGroup/DraftingGroupMemberUnitMaintenance', 'draftingGroup/DraftingGroupMemberUnitMaintenance', NULL, NULL, 1, NULL, '1', 20.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 17:10:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1736668960149286914', '', '起草组管理', '/draftingGroup/DraftingGroupManagement', 'draftingGroup/DraftingGroupManagement', NULL, NULL, 0, NULL, '1', 3.10, 0, 'cus_working', 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 16:45:20', 'LKGLZ', '2024-01-09 15:20:33', 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1742065161262358530', '1430376424950026242', '起草组在研项目', '/draftingGroup/DraftingGroupUnderStudyProject', 'draftingGroup/DraftingGroupUnderStudyProject', NULL, NULL, 1, NULL, '1', 21.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:07:55', 'LKGLZ', '2024-01-02 14:08:09', 0, 0, '1', 0, 1); +INSERT INTO `income_payments_test`.`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 ('1742070808427126785', '1430376424950026242', '起草组会议维护', '/draftingGroup/ConferenceMaintenance', 'draftingGroup/ConferenceMaintenance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:30:21', 'LKGLZ', '2024-01-02 14:30:32', 0, 0, '1', 0, 1); + + + + + + diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index f9b4c0fd..eec3d261 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -136,16 +136,20 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:p6spy:mysql://lijiarao.cn:3306/income_payments_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai + url: jdbc:mysql://10.10.10.44:3306/income_payments_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: 704670af746903fa - driver-class-name: com.p6spy.engine.spy.P6SpyDriver - # 多数据源配置 - multi-datasource1: - url: jdbc:p6spy:mysql://lijiarao.cn:3306/standards_association?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&serverTimezone=Asia/Shanghai - username: root - password: 704670af746903fa - driver-class-name: com.p6spy.engine.spy.P6SpyDriver + password: hzwlsoft.com + driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:p6spy:mysql://lijiarao.cn:3306/income_payments_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# username: root +# password: 704670af746903fa +# driver-class-name: com.p6spy.engine.spy.P6SpyDriver +# # 多数据源配置 +# multi-datasource1: +# url: jdbc:p6spy:mysql://lijiarao.cn:3306/standards_association?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&serverTimezone=Asia/Shanghai +# username: root +# password: 704670af746903fa +# driver-class-name: com.p6spy.engine.spy.P6SpyDriver redis: database: 14 # host: 121.36.69.172 From 1782b6d521eea99dc869ed492bf4d16fab4b5667 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 10:55:45 +0800 Subject: [PATCH 39/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86-=E5=A4=8D=E5=88=B6=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E4=BD=8D=E6=95=B0=E8=BE=BE=E5=88=B0=E6=BB=A1=E4=BD=8D?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=86=8D=E5=A4=8D=E5=88=B6=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E8=AF=AD=E4=B8=8D=E6=98=8E=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PayDraftingGroupServiceImpl.java | 3 +++ .../src/main/resources/application-dev.yml | 26 +++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java index 1f8f5351..7c3bc046 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupServiceImpl.java @@ -264,6 +264,9 @@ public class PayDraftingGroupServiceImpl extends ServiceImpl= 50) { + throw new JeroBootException("起草组名称长度为50位，不可复制，请修改之后再复制！"); + } LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(PayDraftingGroup::getDraftingGroupProject,str); List listPayDraftingGroup = list(queryWrapper); diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index eec3d261..3ab7b3fe 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -136,20 +136,20 @@ spring: connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000 datasource: master: - url: jdbc:mysql://10.10.10.44:3306/income_payments_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://10.10.10.44:3306/income_payments_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# username: root +# password: hzwlsoft.com +# driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:p6spy:mysql://lijiarao.cn:3306/income_payments_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root - password: hzwlsoft.com - driver-class-name: com.mysql.cj.jdbc.Driver -# url: jdbc:p6spy:mysql://lijiarao.cn:3306/income_payments_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai -# username: root -# password: 704670af746903fa -# driver-class-name: com.p6spy.engine.spy.P6SpyDriver -# # 多数据源配置 -# multi-datasource1: -# url: jdbc:p6spy:mysql://lijiarao.cn:3306/standards_association?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&serverTimezone=Asia/Shanghai -# username: root -# password: 704670af746903fa -# driver-class-name: com.p6spy.engine.spy.P6SpyDriver + password: 704670af746903fa + driver-class-name: com.p6spy.engine.spy.P6SpyDriver + # 多数据源配置 + multi-datasource1: + url: jdbc:p6spy:mysql://lijiarao.cn:3306/standards_association?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&serverTimezone=Asia/Shanghai + username: root + password: 704670af746903fa + driver-class-name: com.p6spy.engine.spy.P6SpyDriver redis: database: 14 # host: 121.36.69.172 From e50bd748e798da62ac5e3fcbb184eac7ba02d3bb Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 12:00:53 +0800 Subject: [PATCH 40/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86--=E6=88=90=E5=91=98=E5=8D=95?= =?UTF-8?q?=E4=BD=8D-=E5=AF=BC=E5=85=A5-=E5=AF=BC=E5=85=A5=E5=90=8E?= =?UTF-8?q?=E5=A4=87=E6=B3=A81--=E5=A4=87=E6=B3=A810=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayDraftingGroupSubItemServiceImpl.java | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index d3ef3418..5098ed34 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -589,7 +589,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl query = new LambdaQueryWrapper<>(); query.eq(PayDraftingGroupSubItem::getDraftingGroupId, draftGroupId); List listData = payDraftingGroupSubItemService.list(query); @@ -610,7 +610,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl listDateNew = listData.stream().filter(item -> Objects.equals(p.getChargeCompanyId(), item.getChargeCompanyId())).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(listDateNew)) { @@ -638,6 +638,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl{ + // 处理联系人的备注字段 + List remarks = dealRemarkField(p); String draftingGroupSubItemId = p.getId(); List listPayDraftingGroupSubItemContacts = p.getPayDraftingGroupSubItemContactsList(); if(!CollectionUtils.isEmpty(listPayDraftingGroupSubItemContacts)){ @@ -645,6 +647,8 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl dealRemarkField(PayDraftingGroupSubItem p) { + ArrayList arrayList = new ArrayList<>(); + arrayList.add(p.getRemarksOne()); + arrayList.add(p.getRemarksTwo()); + arrayList.add(p.getRemarksThree()); + arrayList.add(p.getRemarksFour()); + arrayList.add(p.getRemarksFive()); + arrayList.add(p.getRemarksSix()); + arrayList.add(p.getRemarksSeven()); + arrayList.add(p.getRemarksEight()); + arrayList.add(p.getRemarksNine()); + arrayList.add(p.getRemarksTen()); + return arrayList; + } + /** * 验证重复 * @param p From 64cd10bc4e0ce68d125738d4a35cce91cac2b9d7 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 14:04:16 +0800 Subject: [PATCH 41/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86--=E5=9C=A8=E7=A0=94=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE-=E7=BC=96=E8=BE=91-=E6=8A=A5=E8=AF=B7=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=9C=89=E6=95=88=E5=86=85=E5=AE=B9,=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E7=BB=84=E7=AE=A1=E7=90=86--=E5=9C=A8=E7=A0=94?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE-=E6=96=B0=E5=A2=9E-=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A020=E4=B8=AA=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=E6=8A=A5=E5=AD=97=E6=AE=B5=E5=A4=AA=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年1月中旬需求变更新增.sql | 19 +------------------ .../PayDraftingGroupResearchProjectMapper.xml | 2 +- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index a4022aa7..c6d2a670 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -75,7 +75,7 @@ CREATE TABLE `pay_drafting_group_research_project` ( `drafting_group_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起草组id', `project_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目名称', `draft_company` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要起草单位', - `files` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '过程文件', + `files` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '过程文件', `project_schedule` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '项目进度', `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', @@ -97,23 +97,6 @@ CREATE TABLE `pay_drafting_group_research_project_file` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '起草组-在研项目-资料文件表' ROW_FORMAT = Dynamic; --- 新增 pay_drafting_group_distribution_record表(起草组-分发记录表) -CREATE TABLE `pay_drafting_group_distribution_record` ( - `id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', - `data_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '资料id', - `project_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '起草组id或者分标委id', - `sub_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '工作组成员id或者分标委成员id', - `project_type` tinyint(1) NULL DEFAULT NULL COMMENT '类型1:起草组，2：分标委', - `file_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件id', - `contacts_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人id', - `contacts_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系人名称', - `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', - `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', - `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '起草组-分发记录表' ROW_FORMAT = Dynamic; - -- pay_meeting表 新增 drafting_group_id(起草组id),drafting_group_name(起草组名称)字段 ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_id` varchar(50) COMMENT '起草组id'; ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_name` varchar(50) COMMENT '起草组名称'; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml index dfb90df8..6b30da2a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupResearchProjectMapper.xml @@ -29,7 +29,7 @@ - delete from pay_drafting_group_research_project_file ppf where ppf.project_id=#{id} + delete from pay_drafting_group_research_project_file where project_id=#{id} From 972ab1ff6cf5007eea8a9781823b185d4bc72325 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 14:24:41 +0800 Subject: [PATCH 42/52] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/24年1月中旬需求变更新增.sql | 95 ++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index c6d2a670..97edacf7 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -102,52 +102,55 @@ ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_id` varchar(50) COMMENT ' ALTER TABLE `pay_meeting` ADD COLUMN `drafting_group_name` varchar(50) COMMENT '起草组名称'; -- sys_permission表 新增起草组相关菜单 -INSERT INTO `income_payments_test`.`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 ('1744975224801075202', '1736675369997905922', '审核', '', NULL, NULL, NULL, 2, 'draftingGroupMember:check', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-10 14:51:28', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650871911792641', '1742070808427126785', '上传会议纪要', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:uploadCouncil', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:37', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650747009613826', '1742070808427126785', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:07', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650680030773249', '1742070808427126785', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:51', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650603614748673', '1742070808427126785', '上传文件', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:upload', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:33', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650486782410753', '1742070808427126785', '发布', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:publish', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:05', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650398005772289', '1742070808427126785', '批量删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:44', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650314702700546', '1742070808427126785', '导出', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:24', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650199401283585', '1742070808427126785', '新增', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:56', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744650007667064833', '1742070808427126785', '查询', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:11', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744618617370066946', '1744610339198091266', '资料状态（嘉宾是否可以在企业端上传）', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:guestsUploadFileFlag', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:14:26', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744618038157656066', '1744610339198091266', '审核凭证', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:12:08', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617928828928002', '1744610339198091266', '审核报名信息', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditCredentials', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:11:42', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617734913671170', '1744610339198091266', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:56', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617671705509890', '1744610339198091266', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:41', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617607901757441', '1744610339198091266', '批量删除', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:26', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617378741764097', '1744610339198091266', '导出', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:31', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617286152503297', '1744610339198091266', '添加参会人', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:09', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744617202534858754', '1744610339198091266', '查询', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:08:49', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744610339198091266', '1430376424950026242', '起草组参会情况', '/incomePayments/meetManage/AttendanceDraftGroupMeeting', 'incomePayments/meetManage/Attendance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-09 14:41:33', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744557748690894850', '1742065161262358530', '删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:34', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744557677312229378', '1742065161262358530', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:17', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744557618365480962', '1742065161262358530', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:03', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744557548442238978', '1742065161262358530', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:47', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744557479416578050', '1742065161262358530', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:30', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744556066435252226', '1736675369997905922', '新增', '', NULL, NULL, NULL, 2, 'draftingGroupMember:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:05:53', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744553118539988993', '1736675369997905922', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroupMember:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:54:10', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744552595946487809', '1736675369997905922', '删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:52:06', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744552520780365825', '1736675369997905922', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:48', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744552416749043714', '1736675369997905922', '下载模板', '', NULL, NULL, NULL, 2, 'draftingGroupMember:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:23', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744552350437097473', '1736675369997905922', '导出', '', NULL, NULL, NULL, 2, 'draftingGroupMember:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:07', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744552151597727745', '1736675369997905922', '导入', '', NULL, NULL, NULL, 2, 'draftingGroupMember:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:50:20', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744551907694755841', '1736675369997905922', '查询', '', NULL, NULL, NULL, 2, 'draftingGroupMember:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:49:22', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550770337923073', '1736668960149286914', '在研项目', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudyProject', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:50', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550626938863617', '1736668960149286914', '删除', NULL, NULL, NULL, NULL, 2, 'draftingGroup:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:16', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550489080479745', '1736668960149286914', '基本信息维护', '', NULL, NULL, NULL, 2, 'draftingGroup:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:43', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550409195765762', '1736668960149286914', '复制', '', NULL, NULL, NULL, 2, 'draftingGroup:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:24', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550212579377153', '1736668960149286914', '工作组会议', '', NULL, NULL, NULL, 2, 'draftingGroup:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:38', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744550123177787393', '1736668960149286914', '其他分发资料', '', NULL, NULL, NULL, 2, 'draftingGroup:fileMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:16', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744549961910992898', '1736668960149286914', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:38', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744549877257355266', '1736668960149286914', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:18', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1744549760974471169', '1736668960149286914', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:40:50', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1736675369997905922', '1430376424950026242', '起草组成员维护', '/draftingGroup/DraftingGroupMemberUnitMaintenance', 'draftingGroup/DraftingGroupMemberUnitMaintenance', NULL, NULL, 1, NULL, '1', 20.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 17:10:49', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1736668960149286914', '', '起草组管理', '/draftingGroup/DraftingGroupManagement', 'draftingGroup/DraftingGroupManagement', NULL, NULL, 0, NULL, '1', 3.10, 0, 'cus_working', 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 16:45:20', 'LKGLZ', '2024-01-09 15:20:33', 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1742065161262358530', '1430376424950026242', '起草组在研项目', '/draftingGroup/DraftingGroupUnderStudyProject', 'draftingGroup/DraftingGroupUnderStudyProject', NULL, NULL, 1, NULL, '1', 21.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:07:55', 'LKGLZ', '2024-01-02 14:08:09', 0, 0, '1', 0, 1); -INSERT INTO `income_payments_test`.`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 ('1742070808427126785', '1430376424950026242', '起草组会议维护', '/draftingGroup/ConferenceMaintenance', 'draftingGroup/ConferenceMaintenance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:30:21', 'LKGLZ', '2024-01-02 14:30:32', 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744975224801075202', '1736675369997905922', '审核', '', NULL, NULL, NULL, 2, 'draftingGroupMember:check', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-10 14:51:28', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650871911792641', '1742070808427126785', '上传会议纪要', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:uploadCouncil', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:37', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650747009613826', '1742070808427126785', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:22:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650680030773249', '1742070808427126785', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:51', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650603614748673', '1742070808427126785', '上传文件', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:upload', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:33', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650486782410753', '1742070808427126785', '发布', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:publish', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:21:05', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650398005772289', '1742070808427126785', '批量删除', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:44', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650314702700546', '1742070808427126785', '导出', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:20:24', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650199401283585', '1742070808427126785', '新增', '', NULL, NULL, NULL, 2, 'draftGroupMeeting:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:56', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744650007667064833', '1742070808427126785', '查询', NULL, NULL, NULL, NULL, 2, 'draftGroupMeeting:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 17:19:11', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744618617370066946', '1744610339198091266', '资料状态（嘉宾是否可以在企业端上传）', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:guestsUploadFileFlag', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:14:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744618038157656066', '1744610339198091266', '审核凭证', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditSignUp', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:12:08', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617928828928002', '1744610339198091266', '审核报名信息', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:auditCredentials', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:11:42', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617734913671170', '1744610339198091266', '删除', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:56', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617671705509890', '1744610339198091266', '编辑', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:41', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617607901757441', '1744610339198091266', '批量删除', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:10:26', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617378741764097', '1744610339198091266', '导出', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:31', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617286152503297', '1744610339198091266', '添加参会人', NULL, NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:09:09', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744617202534858754', '1744610339198091266', '查询', '', NULL, NULL, NULL, 2, 'draftGroupMeetingSituation:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 15:08:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744610339198091266', '1430376424950026242', '起草组参会情况', '/incomePayments/meetManage/AttendanceDraftGroupMeeting', 'incomePayments/meetManage/Attendance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-09 14:41:33', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744557748690894850', '1742065161262358530', '删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:34', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744557677312229378', '1742065161262358530', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:17', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744557618365480962', '1742065161262358530', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:12:03', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744557548442238978', '1742065161262358530', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:47', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744557479416578050', '1742065161262358530', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudy:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:11:30', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744556066435252226', '1736675369997905922', '新增', '', NULL, NULL, NULL, 2, 'draftingGroupMember:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 11:05:53', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744553118539988993', '1736675369997905922', '编辑', '', NULL, NULL, NULL, 2, 'draftingGroupMember:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:54:10', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744552595946487809', '1736675369997905922', '删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:52:06', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744552520780365825', '1736675369997905922', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroupMember:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:48', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744552416749043714', '1736675369997905922', '下载模板', '', NULL, NULL, NULL, 2, 'draftingGroupMember:downTemplate', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:23', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744552350437097473', '1736675369997905922', '导出', '', NULL, NULL, NULL, 2, 'draftingGroupMember:export', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:51:07', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744552151597727745', '1736675369997905922', '导入', '', NULL, NULL, NULL, 2, 'draftingGroupMember:import', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:50:20', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744551907694755841', '1736675369997905922', '查询', '', NULL, NULL, NULL, 2, 'draftingGroupMember:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:49:22', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550770337923073', '1736668960149286914', '在研项目', '', NULL, NULL, NULL, 2, 'draftingGroup:underStudyProject', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550626938863617', '1736668960149286914', '删除', NULL, NULL, NULL, NULL, 2, 'draftingGroup:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:16', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550489080479745', '1736668960149286914', '基本信息维护', '', NULL, NULL, NULL, 2, 'draftingGroup:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:43', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550409195765762', '1736668960149286914', '复制', '', NULL, NULL, NULL, 2, 'draftingGroup:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:24', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550212579377153', '1736668960149286914', '工作组会议', '', NULL, NULL, NULL, 2, 'draftingGroup:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:38', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550123177787393', '1736668960149286914', '其他分发资料', '', NULL, NULL, NULL, 2, 'draftingGroup:fileMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:16', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744549961910992898', '1736668960149286914', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:38', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744549877257355266', '1736668960149286914', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:18', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744549760974471169', '1736668960149286914', '查询', '', NULL, NULL, NULL, 2, 'draftingGroup:search', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:40:50', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1736675369997905922', '1430376424950026242', '起草组成员维护', '/draftingGroup/DraftingGroupMemberUnitMaintenance', 'draftingGroup/DraftingGroupMemberUnitMaintenance', NULL, NULL, 1, NULL, '1', 20.00, 0, NULL, 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 17:10:49', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1736668960149286914', '', '起草组管理', '/draftingGroup/DraftingGroupManagement', 'draftingGroup/DraftingGroupManagement', NULL, NULL, 0, NULL, '1', 3.10, 0, 'cus_working', 1, 0, 0, 0, NULL, 'LKGLZ', '2023-12-18 16:45:20', 'LKGLZ', '2024-01-09 15:20:33', 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1742065161262358530', '1430376424950026242', '起草组在研项目', '/draftingGroup/DraftingGroupUnderStudyProject', 'draftingGroup/DraftingGroupUnderStudyProject', NULL, NULL, 1, NULL, '1', 21.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:07:55', 'LKGLZ', '2024-01-02 14:08:09', 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1742070808427126785', '1430376424950026242', '起草组会议维护', '/draftingGroup/ConferenceMaintenance', 'draftingGroup/ConferenceMaintenance', NULL, NULL, 1, NULL, '1', 22.00, 0, NULL, 1, 0, 0, 1, NULL, 'LKGLZ', '2024-01-02 14:30:21', 'LKGLZ', '2024-01-02 14:30:32', 0, 0, '1', 0, 1); + +-- sys_dict_item表 新增 起草组会议类型 +INSERT INTO `income_payments`.`sys_dict_item`(`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES ('1477781428149047297', '1432280766382727169', '起草组会议', '7', '起草组会议', 7.00, 1, 'LKGLZ', '2024-01-05 14:56:54', NULL, NULL); From 50d3608b58d4b6187b7a96ea40add8d0e4743221 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 15:39:42 +0800 Subject: [PATCH 43/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E8=B5=B7=E8=8D=89?= =?UTF-8?q?=E7=BB=84=E7=AE=A1=E7=90=86--=E6=B7=BB=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=8D=95=E4=BD=8D=E5=90=8E=EF=BC=8C=E6=88=90=E5=91=98?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E6=9C=89?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayDraftingGroupSubItemMapper.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml index bf073555..8e8c8a91 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/mapper/xml/PayDraftingGroupSubItemMapper.xml @@ -8,7 +8,16 @@ pdgs.drafting_group_id AS draftingGroupId, pdgs.charge_company_id AS chargeCompanyId, pdgs.charge_company_temporary_id AS chargeCompanyTemporaryId, - if(pdgs.charge_company_temporary_name = pcm.company_name, pdgs.charge_company_temporary_name, concat(pdgs.charge_company_temporary_name,'（更名为',pcm.company_name,'）')) as chargeCompanyTemporaryName, + IF( + pdgs.charge_company_temporary_name = + IF( + pdgs.charge_company_temporary_name LIKE '%（未审核）', + CONCAT(pcm.company_name, '（未审核）'), + pcm.company_name + ), + pdgs.charge_company_temporary_name, + CONCAT(pdgs.charge_company_temporary_name, '（更名为', pcm.company_name, '）') + ) AS chargeCompanyTemporaryName, pdgs.contacts_id_one AS contactsIdOne, pdgs.contacts_temporary_id_one AS contactsTemporaryIdOne, pdgs.contacts_temporary_name_one AS contactsTemporaryNameOne, From fc56a9a5629f5a04293f438b07ebf01cbc8af4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 15 Jan 2024 16:26:04 +0800 Subject: [PATCH 44/52] fix:80828 --- .../controller/PayCommonProjectController.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 185076e2..c757dcce 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 @@ -359,7 +359,7 @@ public class PayCommonProjectController extends JeroController queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id); @@ -491,6 +493,7 @@ public class PayCommonProjectController extends JeroController Date: Mon, 15 Jan 2024 17:30:42 +0800 Subject: [PATCH 45/52] fix:80828 --- .../PayCommonProjectController.java | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) 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 c757dcce..0647de4f 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 @@ -25,6 +25,8 @@ import com.jero.contract.entity.PayIncomeContract; import com.jero.contract.entity.PayIncomeContractAssociated; 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.mail.entity.PayMailBill; import com.jero.mail.entity.PayMailBillProject; import com.jero.mail.service.IPayMailBillProjectService; @@ -102,6 +104,8 @@ public class PayCommonProjectController extends JeroController queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id); @@ -494,6 +496,38 @@ public class PayCommonProjectController extends JeroController queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>(); + queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getSubId,id); + queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId()); + queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId); + List listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord); + if(!CollectionUtils.isEmpty(listPayWorkingGroupDistributionRecord)){ + StringBuilder sb = new StringBuilder(); + listPayWorkingGroupDistributionRecord.forEach(p->{ + sb.append(p.getFileId()); + if(listPayWorkingGroupDistributionRecord.indexOf(p) != (listPayWorkingGroupDistributionRecord.size() - 1)){ + sb.append(","); + } + }); + payCommonProject.setFiles(sb.toString()); + } + LambdaQueryWrapper queryPayDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayDraftingGroupSubItemContacts.eq(PayDraftingGroupSubItemContacts::getDraftingGroupId,id); + List pwg = payDraftingGroupSubItemContactsService.list(queryPayDraftingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(pwg)){ + pwg.sort(Comparator.comparing(PayDraftingGroupSubItemContacts::getOrderNum)); + payCommonProject.setContactsTemporaryId(pwg.get(0).getContactsTemporaryId()); + payCommonProject.setContactsTemporaryName(pwg.get(0).getContactsTemporaryName()); + }else{ + payCommonProject.setContactsTemporaryId(""); + payCommonProject.setContactsTemporaryName(""); + } + + } + String strProject = JSON.toJSONString(payCommonProject); payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class); if(Objects.isNull(payCompanyCommonProject.getPaidAmount())){ From 56bea7bbaa259c5eb31fd3dbe93628b36dfc3bec Mon Sep 17 00:00:00 2001 From: sunzheng Date: Mon, 15 Jan 2024 17:57:23 +0800 Subject: [PATCH 46/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 24 +++++++++---------- .../src/main/resources/application-dev.yml | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) 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 7e096513..a1be0c44 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 @@ -121,18 +121,18 @@ public class SendMessageServiceImpl implements SendMessageService { } email = PasswordUtil.decrypt(email); emailPassword = PasswordUtil.decrypt(emailPassword); - //EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); - //// 发送带附件邮箱 -// if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ -// emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); -// }else{ -// //如果有通知内容就替换 -// if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ -// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); -// }else { -// emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); -// } -// } + EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); + // 发送带附件邮箱emailPassword = "wflwijcpdmwvcihc" + if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ + emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); + }else{ + //如果有通知内容就替换 + if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); + }else { + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); + } + } }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){ diff --git a/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot-single-startup/src/main/resources/application-dev.yml index 3ab7b3fe..50c3dbaa 100644 --- a/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -25,6 +25,7 @@ spring: max-file-size: 50MB max-request-size: 50MB mail: +# host: smtp.qq.com host: smtp.126.com # host: smtp.qiye.163.com username: zhangqinlin@syxysoft.com From 2d5331dda28d7c1103dfe3cc4d9f3cd08295f883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 15 Jan 2024 18:21:48 +0800 Subject: [PATCH 47/52] fix:80847 --- ...ingGroupDistributionRecordServiceImpl.java | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 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 80f73a64..691ba860 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 @@ -247,14 +247,6 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listMsg = new ArrayList<>(); for (PayContactsManagementTemporary p : list) { try { - List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> - (payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE4) ? - Objects.equals(item.getTemporaryContactsId(),p.getId()) : - Objects.equals(item.getContactsId(),p.getId())).collect(Collectors.toList()); - if(CollectionUtils.isEmpty(listStr)){ - continue; - } - // 发送消息 SendMessageDTO sendMessageDTO = new SendMessageDTO(); Integer sendEmailFlag = payWorkingGroupDistributionRecord.getSendEmailFlag(); @@ -275,9 +267,32 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),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)){ + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),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)){ + List listStr = listPayWorkingGroupDistributionRecord.stream().filter(item-> + Objects.equals(payWorkingGroupDistributionRecord.getProjectType(),PayProjectCommon.PROJECT_TYPE_FILE4) ? + 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()); } sendMessageDTO.setBusId(json.toJSONString()); sendMessageService.SendMessageService(sendMessageDTO); From 0d5ede0289e02cfc4683df42119e9aeb4232ce9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 15 Jan 2024 18:42:51 +0800 Subject: [PATCH 48/52] fix:80854 --- db/24年1月中旬需求变更新增.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/24年1月中旬需求变更新增.sql b/db/24年1月中旬需求变更新增.sql index 97edacf7..a8ca052b 100644 --- a/db/24年1月中旬需求变更新增.sql +++ b/db/24年1月中旬需求变更新增.sql @@ -139,7 +139,7 @@ INSERT INTO `income_payments`.`sys_permission`(`id`, `parent_id`, `name`, `url`, INSERT INTO `income_payments`.`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 ('1744550626938863617', '1736668960149286914', '删除', NULL, NULL, NULL, NULL, 2, 'draftingGroup:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:44:16', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments`.`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 ('1744550489080479745', '1736668960149286914', '基本信息维护', '', NULL, NULL, NULL, 2, 'draftingGroup:edit', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:43', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments`.`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 ('1744550409195765762', '1736668960149286914', '复制', '', NULL, NULL, NULL, 2, 'draftingGroup:copy', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:43:24', NULL, NULL, 0, 0, '1', 0, 1); -INSERT INTO `income_payments`.`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 ('1744550212579377153', '1736668960149286914', '工作组会议', '', NULL, NULL, NULL, 2, 'draftingGroup:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:38', NULL, NULL, 0, 0, '1', 0, 1); +INSERT INTO `income_payments`.`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 ('1744550212579377153', '1736668960149286914', '起草组会议', '', NULL, NULL, NULL, 2, 'draftingGroup:meetingMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:38', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments`.`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 ('1744550123177787393', '1736668960149286914', '其他分发资料', '', NULL, NULL, NULL, 2, 'draftingGroup:fileMaintenance', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:42:16', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments`.`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 ('1744549961910992898', '1736668960149286914', '批量删除', '', NULL, NULL, NULL, 2, 'draftingGroup:batchDel', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:38', NULL, NULL, 0, 0, '1', 0, 1); INSERT INTO `income_payments`.`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 ('1744549877257355266', '1736668960149286914', '新增', '', NULL, NULL, NULL, 2, 'draftingGroup:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'LKGLZ', '2024-01-09 10:41:18', NULL, NULL, 0, 0, '1', 0, 1); From 0c842c197bf6e63ab6e98f457b95082986768860 Mon Sep 17 00:00:00 2001 From: sunzheng Date: Tue, 16 Jan 2024 09:10:49 +0800 Subject: [PATCH 49/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=8F=91=E9=80=81?= =?UTF-8?q?=E9=82=AE=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/common/service/impl/SendMessageServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) 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 a1be0c44..16b6be14 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 @@ -121,6 +121,8 @@ public class SendMessageServiceImpl implements SendMessageService { } email = PasswordUtil.decrypt(email); emailPassword = PasswordUtil.decrypt(emailPassword); +// email = "1617303691@qq.com"; +// emailPassword = "wflwijcpdmwvcihc"; EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); // 发送带附件邮箱emailPassword = "wflwijcpdmwvcihc" if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ From fda6d8cab73fe311bc61a9e25828991166119d0d Mon Sep 17 00:00:00 2001 From: sunzheng Date: Tue, 16 Jan 2024 09:52:42 +0800 Subject: [PATCH 50/52] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=88=90=E5=91=98=E5=8D=95=E4=BD=8D=E5=90=8E=EF=BC=8C=E6=88=90?= =?UTF-8?q?=E5=91=98=E5=8D=95=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E8=AF=AF,=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E5=B7=A5=E4=BD=9C=E7=BB=84=E6=88=90=E5=91=98=E7=BB=B4?= =?UTF-8?q?=E6=8A=A4,=E8=B5=84=E6=96=99=E7=BD=91=E5=91=98=E6=88=90?= =?UTF-8?q?=E5=91=98=E7=BB=B4=E6=8A=A4,=E6=99=AE=E9=80=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=B4=E6=8A=A4,=E5=85=B1=E8=AE=A1=E5=9B=9B?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84=E5=90=8C=E6=A0=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/PayMemberProjectSubitemMapper.xml | 12 +++++++++++- .../project/mapper/xml/PayCommonProjectMapper.xml | 12 +++++++++++- .../mapper/xml/PayWorkingGroupSubItemMapper.xml | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml index 5a80d474..5fd3c5e3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml @@ -60,7 +60,17 @@