From 129e7ace9330dbaff4c77984098cbcac9407b757 Mon Sep 17 00:00:00 2001 From: zhangqinlin <983410zql> Date: Fri, 10 Dec 2021 17:44:54 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BB=9F=E8=AE=A1=E6=89=93=E5=8C=85?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AD=89=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PayCaseCommitteeController.java | 49 +-- .../controller/PayCaseCouncilController.java | 118 +++++++ .../PayCaseCouncilSubitemController.java | 207 +++++++++++++ .../jero/data/entity/ChooseExcelCouncil.java | 35 +++ .../data/entity/DTO/PayCaseCommitteeDTO.java | 13 +- .../entity/DTO/PayCaseCommitteeUpdateDTO.java | 10 +- .../jero/data/entity/PayCaseCommittee.java | 4 + .../com/jero/data/entity/PayCaseCouncil.java | 66 ++++ .../data/entity/PayCaseCouncilSubitem.java | 70 +++++ .../com/jero/data/entity/councilList.java | 26 ++ .../java/com/jero/data/entity/subCouncil.java | 26 ++ .../data/mapper/PayCaseCouncilMapper.java | 14 + .../mapper/PayCaseCouncilSubitemMapper.java | 29 ++ .../xml/PayCaseCommitteeSubitemMapper.xml | 5 +- .../data/mapper/xml/PayCaseCouncilMapper.xml | 5 + .../xml/PayCaseCouncilSubitemMapper.xml | 95 ++++++ .../data/service/IPayCaseCouncilService.java | 14 + .../IPayCaseCouncilSubitemService.java | 28 ++ .../impl/PayCaseCouncilServiceImpl.java | 19 ++ .../PayCaseCouncilSubitemServiceImpl.java | 46 +++ .../entity/PayWorkGroupSubletStatistics.java | 4 +- .../mapper/xml/PayWorkingGroupMapper.xml | 38 +-- .../xml/PayWorkingGroupSubItemMapper.xml | 4 +- .../AllProjectStatisticsController.java | 290 +++++++++--------- .../CompanyComeMoneyStatisticsController.java | 195 ++++++------ .../PayWorkingGroupStatisticsController.java | 144 ++++----- .../entity/AllProjectStatistics.java | 8 +- .../entity/CompanyComeMoneyDetail.java | 5 +- .../entity/PrincipalPeopleDetail.java | 4 +- 29 files changed, 1205 insertions(+), 366 deletions(-) create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelCouncil.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncilSubitem.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java create mode 100644 jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java index 45d50dc8..acd3a83d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java @@ -64,7 +64,7 @@ public class PayCaseCommitteeController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeDTO.getName()); PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); - if (ObjectUtils.isEmpty(one)) { - PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); - BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee); - payCaseCommitteeService.save(payCaseCommittee); - return Result.OK("添加成功！"); - }else { + if (!ObjectUtils.isEmpty(one)) { return Result.error("分标委名已存在"); } - + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeDTO.getAbbreviation()); + PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false); + if (ObjectUtils.isEmpty(one2)) { + return Result.error("分标简称已存在"); + } + PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); + BeanUtils.copyProperties(payCaseCommitteeDTO, payCaseCommittee); + payCaseCommitteeService.save(payCaseCommittee); + return Result.OK("添加成功！"); } @@ -183,19 +187,22 @@ public class PayCaseCommitteeController extends JeroController edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(PayCaseCommittee::getName,payCaseCommitteeUpdateDTO.getName()); - - PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); - if (ObjectUtils.isEmpty(one)||one.getId().equals(payCaseCommitteeUpdateDTO.getId())) { - PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); - BeanUtils.copyProperties(payCaseCommitteeUpdateDTO,payCaseCommittee); - payCaseCommitteeService.updateById(payCaseCommittee); - return Result.OK("编辑成功!"); - }else { - return Result.error("分标委名已存在"); - } - + PayCaseCommittee one = payCaseCommitteeService.getOne(queryWrapper,false); + if (!ObjectUtils.isEmpty(one)) { + return Result.error("分标委名已存在"); + } + LambdaQueryWrapper queryWrapper2 = new LambdaQueryWrapper<>(); + queryWrapper2.eq(PayCaseCommittee::getAbbreviation,payCaseCommitteeUpdateDTO.getAbbreviation()); + PayCaseCommittee one2 = payCaseCommitteeService.getOne(queryWrapper2,false); + if (ObjectUtils.isEmpty(one2)) { + return Result.error("分标简称已存在"); + } + PayCaseCommittee payCaseCommittee = new PayCaseCommittee(); + BeanUtils.copyProperties(payCaseCommitteeUpdateDTO, payCaseCommittee); + payCaseCommitteeService.updateById(payCaseCommittee); + return Result.OK("编辑成功！"); } - + /** * 通过id删除 * diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java new file mode 100644 index 00000000..a4699cc3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java @@ -0,0 +1,118 @@ +package com.jero.data.controller; + +import java.util.Arrays; +import java.util.Optional; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.data.entity.PayCaseCouncil; +import com.jero.data.service.IPayCaseCouncilService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.ObjectUtils; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: 理事会 + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Api(tags="理事会") +@RestController +@RequestMapping("/payCaseCouncil/payCaseCouncil") +@Slf4j +public class PayCaseCouncilController extends JeroController { + @Autowired + private IPayCaseCouncilService payCaseCouncilService; + + /** + * 添加 + * + * + */ + @Transactional +// @RequiresPermissions("committee:add") + @AutoLog(value = "理事会-添加") + @ApiOperation(value="理事会-添加", notes="理事会-添加") + @PostMapping(value = "/add") + public Result add( @Valid @RequestBody PayCaseCouncil payCaseCouncil) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCaseCouncil::getName,payCaseCouncil.getName()); + PayCaseCouncil one = payCaseCouncilService.getOne(queryWrapper,false); + if (!ObjectUtils.isEmpty(one)) { + return Result.error("分标委名已存在"); + } + PayCaseCouncil payCaseCouncil1 = new PayCaseCouncil(); + BeanUtils.copyProperties(payCaseCouncil, payCaseCouncil1); + payCaseCouncilService.save(payCaseCouncil1); + return Result.OK("添加成功！"); + } + + + + /** + * 编辑 + * + */ +// @RequiresPermissions("committee:edit") + @Transactional + @AutoLog(value = "理事会-编辑") + @ApiOperation(value="理事会-编辑", notes="理事会-编辑") + @PostMapping(value = "/edit") + public Result edit( @Valid @RequestBody PayCaseCouncil payCaseCouncil) { + if(StringUtils.isBlank(payCaseCouncil.getId())){ + return Result.error("主键不能为空"); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(PayCaseCouncil::getName,payCaseCouncil.getName()); + PayCaseCouncil one = payCaseCouncilService.getOne(queryWrapper,false); + if (!ObjectUtils.isEmpty(one)) { + return Result.error("分标委名已存在"); + } + PayCaseCouncil payCaseCouncil1 = new PayCaseCouncil(); + BeanUtils.copyProperties(payCaseCouncil, payCaseCouncil1); + payCaseCouncilService.updateById(payCaseCouncil1); + return Result.OK("编辑成功！"); + } + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "理事会-通过id删除") + @ApiOperation(value="理事会-通过id删除", notes="理事会-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payCaseCouncilService.removeById(id); + return Result.OK("删除成功!"); + } + +// /** +// * 批量删除 +// * +// * @param ids +// * @return +// */ +// @AutoLog(value = "理事会-批量删除") +// @ApiOperation(value="理事会-批量删除", notes="理事会-批量删除") +// @DeleteMapping(value = "/deleteBatch") +// public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { +// this.payCaseCouncilService.removeByIds(Arrays.asList(ids.split(","))); +// return Result.OK("批量删除成功!"); +// } + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java new file mode 100644 index 00000000..029c7524 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java @@ -0,0 +1,207 @@ +package com.jero.data.controller; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.validation.Valid; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.jero.common.api.vo.Result; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; +import com.jero.common.system.query.QueryGenerator; +import com.jero.common.util.PasswordUtil; +import com.jero.common.util.oConvertUtils; +import com.jero.data.entity.*; +import com.jero.data.entity.DTO.PayCaseCommitteeSubitemDTO; +import com.jero.data.service.IPayCaseCouncilSubitemService; +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.util.AmountUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.CollectionUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.jetbrains.annotations.NotNull; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; + + /** + * @Description: 理事会成员 + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Api(tags="理事会成员") +@RestController +@RequestMapping("/payCaseCouncilSubitem/payCaseCouncilSubitem") +@Slf4j +public class PayCaseCouncilSubitemController extends JeroController { + @Autowired + private IPayCaseCouncilSubitemService payCaseCouncilSubitemService; + + /** + * 理事会成员表 + * + */ +// @RequiresPermissions("committee:search") + @ApiOperation(value="理事会成员表-搜索", notes="理事会成员表-搜索",response = FindByName.class) + @GetMapping(value = "/find") + public Result find(@RequestParam(name="contactsName",required =false) String contactsName, + @RequestParam(name="companyName",required =false) String companyName, + @RequestParam(name="councilName",required =false) String councilName, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize + ) { + //模糊查询%_特殊字符bug + String contactsNames = oConvertUtils.replaceAllPercent(contactsName); + String companyNames = oConvertUtils.replaceAllPercent(companyName); + String councilNames = oConvertUtils.replaceAllPercent(councilName); + + Page page = new Page<>(pageNo, pageSize); + IPage pageList = payCaseCouncilSubitemService.listThree(page,contactsNames,companyNames,councilNames); + if (!CollectionUtils.isEmpty(pageList.getRecords())) { + try { + pageList.getRecords().forEach(p -> { + if (!CollectionUtils.isEmpty(p.getList())) { + for ( subCouncil q:p.getList() + ) { + if (!org.apache.commons.lang3.StringUtils.isBlank(q.getPhone())){ + q.setPhone(PasswordUtil.decrypt(q.getPhone())); + } + } + } + }); + + } catch (Exception e) { + log.error("手机号、邮箱解密异常！", e); + } + } + return Result.OK(pageList); + } + + /** + * 添加 + */ +// @RequiresPermissions("committee:addMember") + @Transactional + @AutoLog(value = "理事会成员表-添加") + @ApiOperation(value="理事会成员表-添加", notes="理事会成员表-添加") + @PostMapping(value = "/add") + public Result add(@Valid @RequestBody PayCaseCouncilSubitem payCaseCouncilSubitem) { + PayCaseCouncilSubitem payCaseCouncilSubitem1 = new PayCaseCouncilSubitem(); + BeanUtils.copyProperties(payCaseCouncilSubitem,payCaseCouncilSubitem1); +// 新增时校验重复 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getContactsId, payCaseCouncilSubitem.getContactsId()); + lambdaQueryWrapper.eq(PayCaseCouncilSubitem::getCouncilId, payCaseCouncilSubitem.getCouncilId()); + int count = payCaseCouncilSubitemService.count(lambdaQueryWrapper); + if (count > 0) { + return Result.error("联系人重复，请重新选择"); + } else { + payCaseCouncilSubitemService.save(payCaseCouncilSubitem1); + } + return Result.OK("添加成功！"); + } + + + /** + * 通过id删除 + * + * @param id + * @return + */ + @AutoLog(value = "理事会成员-通过id删除") + @ApiOperation(value="理事会成员-通过id删除", notes="理事会成员-通过id删除") + @DeleteMapping(value = "/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { + payCaseCouncilSubitemService.removeById(id); + return Result.OK("删除成功!"); + } + + /** + * 批量删除 + * + * @param ids + * @return + */ + @AutoLog(value = "理事会成员-批量删除") + @ApiOperation(value="理事会成员-批量删除", notes="理事会成员-批量删除") + @DeleteMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.payCaseCouncilSubitemService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功!"); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @AutoLog(value = "理事会成员-通过id查询") + @ApiOperation(value="理事会成员-通过id查询", notes="理事会成员-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + PayCaseCouncilSubitem payCaseCouncilSubitem = payCaseCouncilSubitemService.getById(id); + if(payCaseCouncilSubitem==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(payCaseCouncilSubitem); + } + + + /** + * 分标委表导出 + * + * + */ + + @RequiresPermissions("committee:export") + @AutoLog(value = "分标委表导出-导出") + @ApiOperation(value="分标委表导出-导出", notes="分标委表导出-导出") + @GetMapping(value = "/exportXls",produces = "text/text;charset=utf-8") + public ModelAndView customExportXlsList(@RequestParam(name="contactsName",required =false) String contactsName, + @RequestParam(name = "selects",required = false) String selects, + @RequestParam(name="companyName",required =false) String companyName, + @RequestParam(name="fenBiaoWeiName",required =false) String councilName) { + String contactsNames = oConvertUtils.replaceAllPercent(contactsName); + String companyNames = oConvertUtils.replaceAllPercent(companyName); + String councilNames = oConvertUtils.replaceAllPercent(councilName); +// ids为空表示搜索导出 + if (StringUtils.isBlank(selects)) { + List list = payCaseCouncilSubitemService.listForExcel(contactsNames, companyNames, councilNames); + return getModelAndView(list); + } else { + ArrayList idList = new ArrayList<>(Arrays.asList(selects.split(","))); + List list= payCaseCouncilSubitemService.chooseExcel(idList); + return getModelAndView(list); + } + } + @NotNull + private ModelAndView getModelAndView(List list) { + if (!CollectionUtils.isEmpty(list)) { + try { + list.forEach(p -> { + if (!org.apache.commons.lang3.StringUtils.isBlank(p.getPhone())) { + p.setPhone(PasswordUtil.decrypt(p.getPhone())); + } + }); + } catch (Exception e) { + log.error("手机号解密异常！", e); + } + } + + return AmountUtil.exportListXls(list, ChooseExcelCouncil.class,"理事会表导出"); + } + + + } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelCouncil.java new file mode 100644 index 00000000..c6fd6ec4 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelCouncil.java @@ -0,0 +1,35 @@ +package com.jero.data.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + +/** + * @author zql + * @date 2021/9/27 10:28 + */ +@Data +public class ChooseExcelCouncil { + + @Excel(name = "理事会名称", width = 15) + @ApiModelProperty(value = "理事会名称") + private String name; + + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private String companyName; + + @Excel(name = "姓名", width = 15) + @ApiModelProperty(value = "姓名") + private String peopleName; + + @Excel(name = "电话", width = 15) + @ApiModelProperty(value = "电话") + private String phone; + + @Excel(name = "职位", width = 15) + @ApiModelProperty(value = "职位") + private String post; + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java index 35b5bb8a..aa284d2a 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java @@ -3,19 +3,24 @@ package com.jero.data.entity.DTO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; + import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; @Data @ApiModel(value="PayCaseCommitteeDTO对象", description="分标委请求对象") public class PayCaseCommitteeDTO { - @NotBlank(message = "分标委名称不能为空") @Size(max = 50,message = "分标委名称长度不能超过50") @ApiModelProperty(value = "分标委名称") private java.lang.String name; - - @Size(max = 200,message = "备注长度不得超过200") - @ApiModelProperty(value = "备注") + @NotBlank(message = "分标委简称不能为空") + @ApiModelProperty(value = "分标委简称") + @Size(max = 50,message = "分标委简称长度不能超过50") + private java.lang.String abbreviation; + @NotBlank(message = "目标简述不能为空") + @Size(max = 200,message = "目标简述长度不得超过200") + @ApiModelProperty(value = "目标简述") private java.lang.String remarks; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java index 9c53259f..6415271b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java @@ -19,7 +19,13 @@ public class PayCaseCommitteeUpdateDTO { @ApiModelProperty(value = "分标委名称") private java.lang.String name; - @Size(max = 200,message = "备注长度不得超过200") - @ApiModelProperty(value = "备注") + @NotBlank(message = "分标委简称不能为空") + @ApiModelProperty(value = "分标委简称") + @Size(max = 50,message = "分标委简称长度不能超过50") + private java.lang.String abbreviation; + + @NotBlank(message = "目标简述不能为空") + @Size(max = 200,message = "目标简述长度不得超过200") + @ApiModelProperty(value = "目标简述") private java.lang.String remarks; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java index fbe8b205..d3a54450 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java @@ -35,6 +35,10 @@ public class PayCaseCommittee implements Serializable { @Excel(name = "分标委名称", width = 15) @ApiModelProperty(value = "分标委名称") private java.lang.String name; + /**分标委简称*/ + @Excel(name = "分标委简称", width = 15) + @ApiModelProperty(value = "分标委简称") + private java.lang.String abbreviation; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java new file mode 100644 index 00000000..95b4e959 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java @@ -0,0 +1,66 @@ +package com.jero.data.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +/** + * @Description: pay_case_council + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Data +@TableName("pay_case_council") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_case_council对象", description="pay_case_council") +public class PayCaseCouncil implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**理事会名称*/ + @NotBlank(message = "理事会名称不能为空") + @Size(max = 50,message = "理事会名称长度不能超过50") + @Excel(name = "理事会名称", width = 15) + @ApiModelProperty(value = "理事会名称") + private java.lang.String name; + /**目标简述*/ + @NotBlank(message = "目标简述不能为空") + @Size(max =200,message = "目标简述长度不能超过200") + @Excel(name = "目标简述", width = 15) + @ApiModelProperty(value = "目标简述") + private java.lang.String remarks; + /**创建人*/ + @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/data/entity/PayCaseCouncilSubitem.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncilSubitem.java new file mode 100644 index 00000000..0818213e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncilSubitem.java @@ -0,0 +1,70 @@ +package com.jero.data.entity; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: pay_case_council_subitem + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Data +@TableName("pay_case_council_subitem") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="pay_case_council_subitem对象", description="pay_case_council_subitem") +public class PayCaseCouncilSubitem implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private java.lang.String id; + /**理事会id*/ + @Excel(name = "理事会id", width = 15) + @ApiModelProperty(value = "理事会id") + private java.lang.String councilId; + /**企业id*/ + @Excel(name = "企业id", width = 15) + @ApiModelProperty(value = "企业id") + private java.lang.String companyId; + /**企业名称*/ + @Excel(name = "企业名称", width = 15) + @ApiModelProperty(value = "企业名称") + private java.lang.String companyName; + /**联系人id*/ + @Excel(name = "联系人id", width = 15) + @ApiModelProperty(value = "联系人id") + private java.lang.String contactsId; + /**联系人名称*/ + @Excel(name = "联系人名称", width = 15) + @ApiModelProperty(value = "联系人名称") + private java.lang.String contactsName; + /**创建人*/ + @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/data/entity/councilList.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java new file mode 100644 index 00000000..60ddcd8d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java @@ -0,0 +1,26 @@ +package com.jero.data.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +@Data +public class councilList implements Serializable { + + @ApiModelProperty(value = "理事会主键") + private String id; + + @ApiModelProperty(value = "理事会名称") + private String name; + + @ApiModelProperty(value = "目标简称") + private String remarks; + + @ApiModelProperty(value = "理事会成员") + private List list; + + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java new file mode 100644 index 00000000..e05cd14d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java @@ -0,0 +1,26 @@ +package com.jero.data.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class subCouncil implements Serializable { + + @ApiModelProperty(value = "主键") + private String id; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "姓名") + private String peopleName; + + @ApiModelProperty(value = "电话") + private String phone; + + @ApiModelProperty(value = "职位") + private String post; + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java new file mode 100644 index 00000000..66ff9a88 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java @@ -0,0 +1,14 @@ +package com.jero.data.mapper; + +import com.jero.data.entity.PayCaseCouncil; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: pay_case_council + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +public interface PayCaseCouncilMapper extends BaseMapper { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java new file mode 100644 index 00000000..712b9c5e --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java @@ -0,0 +1,29 @@ +package com.jero.data.mapper; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.data.entity.ChooseExcelCouncil; +import com.jero.data.entity.FindByName; +import com.jero.data.entity.PayCaseCouncilSubitem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.data.entity.councilList; +import org.apache.ibatis.annotations.Param; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: pay_case_council_subitem + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +public interface PayCaseCouncilSubitemMapper extends BaseMapper { + + IPage listThree(Page page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames); + + List chooseExcel(@Param("idList")ArrayList idList); + + List listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames); + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml index 9c2f428f..cec86990 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml @@ -4,9 +4,10 @@ + - + @@ -102,4 +103,4 @@ - \ No newline at end of file + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml new file mode 100644 index 00000000..64dc47c3 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml new file mode 100644 index 00000000..58d8df4d --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java new file mode 100644 index 00000000..666dc573 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java @@ -0,0 +1,14 @@ +package com.jero.data.service; + +import com.jero.data.entity.PayCaseCouncil; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: pay_case_council + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +public interface IPayCaseCouncilService extends IService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java new file mode 100644 index 00000000..7e7b8fc9 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java @@ -0,0 +1,28 @@ +package com.jero.data.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.data.entity.ChooseExcelCouncil; +import com.jero.data.entity.FindByName; +import com.jero.data.entity.PayCaseCouncilSubitem; +import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.data.entity.councilList; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: pay_case_council_subitem + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +public interface IPayCaseCouncilSubitemService extends IService { + + IPage listThree(Page page,String contactsNames, String companyNames, String councilNames); + + List listForExcel(String contactsNames, String companyNames, String councilNames); + + List chooseExcel(ArrayList idList); + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java new file mode 100644 index 00000000..c88e2b11 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java @@ -0,0 +1,19 @@ +package com.jero.data.service.impl; + +import com.jero.data.entity.PayCaseCouncil; +import com.jero.data.mapper.PayCaseCouncilMapper; +import com.jero.data.service.IPayCaseCouncilService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: pay_case_council + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Service +public class PayCaseCouncilServiceImpl extends ServiceImpl implements IPayCaseCouncilService { + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java new file mode 100644 index 00000000..90c46ed8 --- /dev/null +++ b/jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java @@ -0,0 +1,46 @@ +package com.jero.data.service.impl; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jero.data.entity.ChooseExcelCouncil; +import com.jero.data.entity.FindByName; +import com.jero.data.entity.PayCaseCouncilSubitem; +import com.jero.data.entity.councilList; +import com.jero.data.mapper.PayCaseCouncilSubitemMapper; +import com.jero.data.service.IPayCaseCouncilSubitemService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @Description: pay_case_council_subitem + * @Author: jeecg-boot + * @Date: 2021-12-10 + * @Version: V1.0 + */ +@Service +public class PayCaseCouncilSubitemServiceImpl extends ServiceImpl implements IPayCaseCouncilSubitemService { + + @Resource + private PayCaseCouncilSubitemMapper payCaseCouncilSubitemMapper; + @Override + public IPage listThree(Page page, String contactsNames, String companyNames, String councilNames) { + return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames); + } + + @Override + public List listForExcel(String contactsNames, String companyNames, String councilNames) { + return payCaseCouncilSubitemMapper.listForExcel(contactsNames,companyNames,councilNames); + } + + @Override + public List chooseExcel(ArrayList idList) { + return payCaseCouncilSubitemMapper.chooseExcel(idList); + } + + +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java index 44dca460..7cb8dcf6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java @@ -38,10 +38,12 @@ public class PayWorkGroupSubletStatistics { @ApiModelProperty(value = "来款用途文本") private String chargeUse_text; - @Excel(name = "打包", width = 15) @ApiModelProperty(value = "打包") private String pack; + @Excel(name = "打包", width = 15) + private String packText; + @Excel(name = "项目负责人", width = 15) @ApiModelProperty(value = "项目负责人") private String principalName; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index b7340a5b..36440652 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -252,7 +252,7 @@ - select pp.projectId,pp.projectName,pp.allMoney,pp.comeAllMoney,pp.chargeUse,if(pp.pack=0,'否','是') as pack from (SELECT + select pp.projectId,pp.projectName,pp.allMoney,pp.comeAllMoney,pp.chargeUse,if(pp.pack=0,'否','是') as packText,pp.pack from (SELECT pwgs.create_time as createTime, pwgs.id AS projectId, pwg.working_group_project as projectName, @@ -2096,7 +2096,7 @@ AND pwg.working_group_project LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} @@ -2139,7 +2139,7 @@ AND pcp.charge_project LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} @@ -2182,7 +2182,7 @@ AND pm.meeting_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} @@ -2225,7 +2225,7 @@ AND pmp.project_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse} @@ -2268,7 +2268,7 @@ AND tmp.project_name LIKE - concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) + concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%')) @@ -2337,4 +2337,4 @@ order by pprr.payment_date desc - \ No newline at end of file + 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 698ce71f..000189d7 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 @@ -64,7 +64,7 @@ - \ No newline at end of file + diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java index 6efb5c17..1d6c6c8e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java @@ -19,8 +19,12 @@ import com.jero.member.service.IPayMemberProjectService; import com.jero.member.service.IPayMemberProjectSubitemService; import com.jero.member.service.ITbMemberProjectService; import com.jero.member.service.ITbMemberProjectSubitemService; +import com.jero.modules.system.entity.SysDepart; +import com.jero.modules.system.entity.SysRole; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysRoleService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.UserUtil; import com.jero.project.entity.PayCommonProject; @@ -60,8 +64,8 @@ import java.util.stream.Collectors; @RequestMapping("/statistics/allProjectStatistics") @Slf4j public class AllProjectStatisticsController { - @Resource - private SysUserMapper userMapper; + @Autowired + private ISysDepartService sysDepartService; @Autowired private ISysBaseAPI sysBaseAPI; @Autowired @@ -86,31 +90,31 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - return Result.OK(); - } - assert idList != null; +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// return Result.OK(); +// } +// assert idList != null; Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList ); + IPage pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, null ); HashMap hashMap = new HashMap<>(); double sum=0; double sumTwo =0; @@ -160,31 +164,31 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName( oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - return Result.OK(); - } +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// return Result.OK(); +// } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList); + IPage pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,null); HashMap hashMap = new HashMap<>(); double sum=0; double sumTwo =0; @@ -232,73 +236,73 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); +// } + if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { + Calendar calendar = Calendar.getInstance(); + String year = String.valueOf(calendar.get(Calendar.YEAR)); + allProjectStatisticsSearch.setYear(year); + } - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); - } - if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { - Calendar calendar = Calendar.getInstance(); - String year = String.valueOf(calendar.get(Calendar.YEAR)); - allProjectStatisticsSearch.setYear(year); - } - - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); - if (pageList != null) { - for (AllProjectStatistics s : pageList) { - String key = String.valueOf(s.getChargeUse()); - String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); - s.setChargeUse_text(payment_charge_use); - } - } - return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计"); + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null); + if (pageList != null) { + for (AllProjectStatistics s : pageList) { + String key = String.valueOf(s.getChargeUse()); + String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); + s.setChargeUse_text(payment_charge_use); + } + } + return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "所领导统计"); }else { ArrayList strings = new ArrayList<>(Arrays.asList(selections.split(","))); allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); - } +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计"); +// } if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) { Calendar calendar = Calendar.getInstance(); @@ -306,7 +310,7 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setYear(year); } - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList,strings); + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null,strings); if (pageList != null) { for (AllProjectStatistics s : pageList) { String key = String.valueOf(s.getChargeUse()); @@ -330,32 +334,32 @@ public class AllProjectStatisticsController { allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName())); allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName())); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds); +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计"); +// } - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds); - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计"); - } - - List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList); + List pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, null); if (pageList != null) { for (AllProjectStatistics s : pageList) { String key = String.valueOf(s.getChargeUse()); @@ -366,12 +370,14 @@ public class AllProjectStatisticsController { return AmountUtil.exportListXls(pageList, AllProjectStatistics.class, "项目来款统计"); } - @ApiOperation(value = "通过部门id查所有人员", notes = "通过部门id查所有人员") @RequestMapping(value = "/listForUserByOrgCode", method = RequestMethod.GET) - public Result listForUserByOrgCode(@RequestParam(name = "departId",required = true) String departId) { - List sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId); - SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(departId); + public Result listForUserByOrgCode(@RequestParam(name = "departCode",required = true) String departCode) { + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("org_code",departCode); + SysDepart one = sysDepartService.getOne(queryWrapper1); + List sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId()); + SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId()); List orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList()); orgCodes.add(sysDepartModel.getOrgCode()); QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -380,4 +386,4 @@ public class AllProjectStatisticsController { return Result.OK(pageList); } -} \ No newline at end of file +} diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index eef7f9d7..222d0467 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -66,31 +66,31 @@ public class CompanyComeMoneyStatisticsController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds); - //项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - return Result.OK(); - } +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds); +// //项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// return Result.OK(); +// } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList); + IPage pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,null); HashMap hashMap = new HashMap<>(); double sum=0; double sumTwo =0; @@ -131,33 +131,33 @@ public class CompanyComeMoneyStatisticsController { @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { companyComeMoneyDetailSearch.setProjectName( oConvertUtils.replaceAllPercent(companyComeMoneyDetailSearch.getProjectName())); - //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds); - //项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - return Result.OK(); - } +// //根据不同角色加载不同列表的参数 +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds); +// //项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// return Result.OK(); +// } Page page = new Page<>(pageNo, pageSize); - IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList); + IPage pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,null); HashMap hashMap = new HashMap<>(); double sum=0; double sumTwo =0; @@ -196,31 +196,31 @@ public class CompanyComeMoneyStatisticsController { @ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计") public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) { //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计"); +// } - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计"); - } - - List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList); + List pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, null); return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计"); @@ -235,31 +235,30 @@ public class CompanyComeMoneyStatisticsController { @ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计") public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) { //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); - - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计"); - } - - List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList); +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计"); +// } + List pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, null); for (CompanyComeMoneyDetail s : pageList) { String key = String.valueOf(s.getChargeUse()); String payment_charge_use = sysBaseAPI.translateDict("payment_charge_use", key); diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java index 69a28259..18eef3cd 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java @@ -78,29 +78,29 @@ public class PayWorkingGroupStatisticsController { payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup())); Page page = new Page<>(pageNo, pageSize); //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// return Result.OK(); +// } - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - return Result.OK(); - } - - IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList); + IPage pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,null); List records = pageList.getRecords(); for (PayWorkingGroupStatistics payWorkingGroupStatistics:records){ if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){ @@ -145,32 +145,32 @@ public class PayWorkingGroupStatisticsController { public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch, @RequestParam(name = "selections", required = false) String selections) { if (StringUtils.isBlank(selections)) { payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup())); - //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// //根据不同角色加载不同列表的参数 +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); +// } - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); - } - - List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList); + List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,null); //处理为空数据为0 for (PayWorkingGroupStatistics s : pageList) { if (s.getAllMoney() == null || s.getAllMoney().equals("")) { @@ -187,32 +187,32 @@ public class PayWorkingGroupStatisticsController { }else { ArrayList strings = new ArrayList<>(Arrays.asList(selections.split(","))); payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup())); - //根据不同角色加载不同列表的参数 - List idList = new ArrayList<>(); - //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String roleCode = sysUser.getRoleCode(); - List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); - //admin - if (roleCodes.contains(constant.ADMIN)) { - idList = null; - //部门负责人 - } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { - //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) - List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); - //获取本部门成员 - idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// //根据不同角色加载不同列表的参数 +// List idList = new ArrayList<>(); +// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码 +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String roleCode = sysUser.getRoleCode(); +// List roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(","))); +// //admin +// if (roleCodes.contains(constant.ADMIN)) { +// idList = null; +// //部门负责人 +// } else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) { +// //获取本部门及其所有下部部门所有成员(不包含最开始的部门下级成员) +// List allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList); +// //获取本部门成员 +// idList.addAll((userMapper.selectList(new QueryWrapper().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList())); +// +// idList.addAll(allDepartIds);//项目负责人 +// } else if (roleCodes.contains(constant.XMFZR)) { +// String userId = sysUser.getId(); +// idList.add(userId); +// } else { +// ArrayList objects = new ArrayList<>(); +// return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); +// } - idList.addAll(allDepartIds);//项目负责人 - } else if (roleCodes.contains(constant.XMFZR)) { - String userId = sysUser.getId(); - idList.add(userId); - } else { - ArrayList objects = new ArrayList<>(); - return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计"); - } - - List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings); + List pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,null,strings); //处理为空数据为0 for (PayWorkingGroupStatistics s : pageList) { if (s.getAllMoney() == null || s.getAllMoney().equals("")) { diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java index 38d3e0ed..fa0f6e74 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java @@ -1,5 +1,6 @@ package com.jero.statistics.entity; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; @@ -36,10 +37,15 @@ public class AllProjectStatistics { @ApiModelProperty(value = "来款用途") private String ChargeUse_text; - @Excel(name = "打包", width = 15) + @ApiModelProperty(value = "打包") private String pack; + @TableField(exist = false) + @Excel(name = "打包", width = 15) + @ApiModelProperty(value = "打包") + private String packText; + @Excel(name = "科室", width = 15) @ApiModelProperty(value = "科室") private String depart; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java index 05e459eb..5bbbe90c 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java @@ -26,10 +26,13 @@ public class CompanyComeMoneyDetail { @ApiModelProperty(value = "来款用途编码") private String chargeUse; - @Excel(name = "打包") @ApiModelProperty(value = "打包") private String pack; + @Excel(name = "打包") + @ApiModelProperty(value = "打包") + private String packText; + @Excel(name = "来款用途") @ApiModelProperty(value = "来款用途") private String chargeUse_text; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java index 65651c21..a9ccfc06 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java @@ -26,9 +26,11 @@ public class PrincipalPeopleDetail { @Excel(name = "实收总金额", width = 15) @ApiModelProperty(value = "实收总金额") private String comeAllMoney; - @Excel(name = "打包", width = 15) @ApiModelProperty(value = "打包") private String pack; + @Excel(name = "打包", width = 15) + @ApiModelProperty(value = "打包") + private String packText; @ApiModelProperty(value = "来款用途编码") private String chargeUse; @Excel(name = "来款用途", width = 15)