LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:统计打包企业等字段调整

Browse Source
This commit is contained in:
zhangqinlin
2021-12-10 17:44:54 +08:00
parent 4aebce4e2e
commit 129e7ace93
29 changed files with 1205 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeController.java
+28 -21
View File
@@ -64,7 +64,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
private IPayCaseCommitteeSubitemService payCaseCommitteeSubitemService;
/**
* 分标委表-企业端分页列表查询
*
@@ -143,7 +143,7 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
/**
* 添加
*
@@ -158,15 +158,19 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
LambdaQueryWrapper<PayCaseCommittee> 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<PayCaseCommittee> 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<PayCaseCommittee,
public Result<?> edit( @Valid @RequestBody PayCaseCommitteeUpdateDTO payCaseCommitteeUpdateDTO) {
LambdaQueryWrapper<PayCaseCommittee> 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<PayCaseCommittee> 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删除
*
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilController.java
+118
View File
@@ -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<PayCaseCouncil, IPayCaseCouncilService> {
@Autowired
private IPayCaseCouncilService payCaseCouncilService;
/**
* 添加
*
*
*/
@Transactional
// @RequiresPermissions("committee:add")
@AutoLog(value = "理事会-添加")
@ApiOperation(value="理事会-添加", notes="理事会-添加")
@PostMapping(value = "/add")
public Result<?> add( @Valid @RequestBody PayCaseCouncil payCaseCouncil) {
LambdaQueryWrapper<PayCaseCouncil> 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<PayCaseCouncil> 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("批量删除成功!");
// }
}
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCouncilSubitemController.java
+207
View File
@@ -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<PayCaseCouncilSubitem, IPayCaseCouncilSubitemService> {
@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<councilList> page = new Page<>(pageNo, pageSize);
IPage<councilList> 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<PayCaseCouncilSubitem> 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<ChooseExcelCouncil> list = payCaseCouncilSubitemService.listForExcel(contactsNames, companyNames, councilNames);
return getModelAndView(list);
} else {
ArrayList<String> idList = new ArrayList<>(Arrays.asList(selects.split(",")));
List<ChooseExcelCouncil> list= payCaseCouncilSubitemService.chooseExcel(idList);
return getModelAndView(list);
}
}
@NotNull
private ModelAndView getModelAndView(List<ChooseExcelCouncil> 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,"理事会表导出");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/ChooseExcelCouncil.java
+35
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeDTO.java
+9 -4
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DTO/PayCaseCommitteeUpdateDTO.java
+8 -2
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCommittee.java
+4
View File
@@ -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 = "备注")
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncil.java
+66
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/PayCaseCouncilSubitem.java
+70
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/councilList.java
+26
View File
@@ -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<subCouncil> list;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/subCouncil.java
+26
View File
@@ -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;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilMapper.java
+14
View File
@@ -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<PayCaseCouncil> {
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCouncilSubitemMapper.java
+29
View File
@@ -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<PayCaseCouncilSubitem> {
IPage<councilList> listThree(Page<councilList> page, @Param("contactsNames")String contactsNames, @Param("companyNames") String companyNames, @Param("councilNames") String councilNames);
List<ChooseExcelCouncil> chooseExcel(@Param("idList")ArrayList<String> idList);
List<ChooseExcelCouncil> listForExcel(@Param("contactsNames")String contactsNames, @Param("companyNames")String companyNames,@Param("councilNames") String councilNames);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeSubitemMapper.xml
+3 -2
View File
@@ -4,9 +4,10 @@
<resultMap id="people" type="com.jero.data.entity.FindByName">
<id property="id" column="id"></id>
<result property="name" column="name"></result>
<result property="remarks" column="remark"></result>
<collection property="list" ofType="com.jero.data.entity.ChildrenFindByName" javaType="java.util.List" select="listForChildren" column="{pid=id,companyName=companyName,tname=tname}" >
<id property="childrenId" column="childrenId"></id>
<result property="companyName" column="companyName"></result>
<result property="companyName" column="company_name"></result>
<result property="post" column="post"></result>
<result property="phone" column="phone"></result>
<result property="peopleName" column="peopleName"></result>
@@ -102,4 +103,4 @@
</select>
</mapper>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilMapper.xml
+5
View File
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.data.mapper.PayCaseCouncilMapper">
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCouncilSubitemMapper.xml
+95
View File
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jero.data.mapper.PayCaseCouncilSubitemMapper">
<resultMap id="people" type="com.jero.data.entity.councilList">
<id property="id" column="id"></id>
<result property="name" column="name"></result>
<result property="remarks" column="remark"></result>
<collection property="list" ofType="com.jero.data.entity.subCouncil" javaType="java.util.List" select="listForChildren" column="{pid=id,companyName=companyName,tname=tname}" >
<id property="id" column="id"></id>
<result property="companyName" column="companyName"></result>
<result property="post" column="post"></result>
<result property="phone" column="phone"></result>
<result property="peopleName" column="peopleName"></result>
</collection>
</resultMap>
<select id="listThree" resultMap="people">
SELECT pe.id as id,pe.name as name,pe.abbreviation,pe.remarks,#{companyName} as companyName,#{contactsNames} as tname
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test=" contactsNames!=null and contactsNames != ''">
AND pt.name LIKE CONCAT('%',#{contactsNames},'%')
</if>
<if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" councilNames!=null and councilNames != ''">
AND pe.name LIKE CONCAT('%',#{councilNames},'%')
</if>
</where>
group by pe.id
order by pe.create_time desc
</select>
<select id="listForChildren" resultType="com.jero.data.entity.ChildrenFindByName">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pm.id as id
from
pay_case_council_subitem pm
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id) left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
pm.committee_id = #{pid}
<if test=" companyName!=null and companyName != ''">
AND pcm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" tname!=null and tname != ''">
AND pt.name LIKE CONCAT('%',#{tname},'%')
</if>
</where>
order by pm.create_time desc
</select>
<select id="listForExcel" resultType="com.jero.data.entity.ChooseExcelCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test=" contactsNames!=null and contactsNames != ''">
AND pt.name LIKE CONCAT('%',#{contactsNames},'%')
</if>
<if test=" companyName!=null and companyName != ''">
AND pm.company_name LIKE CONCAT('%',#{companyName},'%')
</if>
<if test=" councilNames!=null and councilNames != ''">
AND pe.name LIKE CONCAT('%',#{councilNames},'%')
</if>
</where>
order by pe.create_time desc
</select>
<select id="chooseExcel" resultType="com.jero.data.entity.ChooseExcelCouncil">
SELECT pt.name as peopleName,if(pcm.status=1,pcm.company_name,CONCAT(pcm.company_name,'(待审核)')) as companyName,pt.post as post,pt.phone as phone ,pe.name as name
from
pay_case_council pe
left JOIN pay_case_council_subitem pm on (pe.id = pm.council_id)
left JOIN pay_contacts_management pt on (pm.contacts_id = pt.id)
left join pay_company_management pcm on(pm.company_id=pcm.id)
<where>
<if test="idList !=null and idList != ''">
pm.id in
<foreach item="item" open="(" separator="," close=")" collection="idList">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilService.java
+14
View File
@@ -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<PayCaseCouncil> {
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCouncilSubitemService.java
+28
View File
@@ -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<PayCaseCouncilSubitem> {
IPage<councilList> listThree(Page<councilList> page,String contactsNames, String companyNames, String councilNames);
List<ChooseExcelCouncil> listForExcel(String contactsNames, String companyNames, String councilNames);
List<ChooseExcelCouncil> chooseExcel(ArrayList<String> idList);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilServiceImpl.java
+19
View File
@@ -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<PayCaseCouncilMapper, PayCaseCouncil> implements IPayCaseCouncilService {
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCouncilSubitemServiceImpl.java
+46
View File
@@ -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<PayCaseCouncilSubitemMapper, PayCaseCouncilSubitem> implements IPayCaseCouncilSubitemService {
@Resource
private PayCaseCouncilSubitemMapper payCaseCouncilSubitemMapper;
@Override
public IPage<councilList> listThree(Page<councilList> page, String contactsNames, String companyNames, String councilNames) {
return payCaseCouncilSubitemMapper.listThree(page,contactsNames,companyNames,councilNames);
}
@Override
public List<ChooseExcelCouncil> listForExcel(String contactsNames, String companyNames, String councilNames) {
return payCaseCouncilSubitemMapper.listForExcel(contactsNames,companyNames,councilNames);
}
@Override
public List<ChooseExcelCouncil> chooseExcel(ArrayList<String> idList) {
return payCaseCouncilSubitemMapper.chooseExcel(idList);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/entity/PayWorkGroupSubletStatistics.java
+3 -1
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml
+19 -19
View File
@@ -252,7 +252,7 @@
<!-- 全所统计-->
<select id="queryPageList3" resultType="com.jero.statistics.entity.AllProjectStatistics">
select pp.id as projectId,pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,if(pp.pack=0,'否','是') as pack from
select pp.id as projectId,pp.projectName, principalName, chargeCompanyTemporaryName, allMoney, comeAllMoney, chargeUse, depart, createTime,if(pp.pack=0,'否','是') as packText,pp.pack from
(SELECT
pwgs.id,
pwg.working_group_project AS projectName,
@@ -275,7 +275,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pwgs.in_account LIKE
@@ -289,7 +289,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pwgs.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pwg.principal_id_a=#{allProjectStatisticsSearch.principalNameId}
@@ -335,7 +335,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pcp.in_account LIKE
@@ -343,7 +343,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pcp.charge_company_temporary_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="allProjectStatisticsSearch.departCode != null and allProjectStatisticsSearch.departCode != ''">
AND su.org_code =#{allProjectStatisticsSearch.departCode}
@@ -396,7 +396,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pmps.in_account LIKE
@@ -410,7 +410,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pmp.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -456,7 +456,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND pms.in_account LIKE
@@ -470,7 +470,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND pms.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="allProjectStatisticsSearch.principalNameId != null and allProjectStatisticsSearch.principalNameId != ''">
AND pm.director_id=#{allProjectStatisticsSearch.principalNameId}
@@ -516,7 +516,7 @@
</if>
<if test="allProjectStatisticsSearch.projectName != null and allProjectStatisticsSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.projectName},'%'))
</if>
<if test="allProjectStatisticsSearch.payStatue != null and allProjectStatisticsSearch.payStatue != ''">
AND tmps.in_account LIKE
@@ -533,7 +533,7 @@
</if>
<if test="allProjectStatisticsSearch.chargeCompanyTemporaryName != null and allProjectStatisticsSearch.chargeCompanyTemporaryName != ''">
AND tmps.company_name LIKE
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
concat('%',concat(#{allProjectStatisticsSearch.chargeCompanyTemporaryName},'%'))
</if>
<if test="allProjectStatisticsSearch.pack != null and allProjectStatisticsSearch.pack != ''">
AND tmps.pack=#{allProjectStatisticsSearch.pack}
@@ -1366,7 +1366,7 @@
</select>
<!-- 个人来款详情-->
<select id="queryPageListForPrincipalDetail" resultType="com.jero.statistics.entity.PrincipalPeopleDetail">
select pp.id,pp.projectName,pp.principalId,pp.allMoney,pp.comeAllMoney,if(pp.pack=0,'否','是') as pack,pp.chargeUse,pp.chargeCompanyTemporaryName from (SELECT
select pp.id,pp.projectName,pp.principalId,pp.allMoney,pp.comeAllMoney,if(pp.pack=0,'否','是') as packText,pp.pack,pp.chargeUse,pp.chargeCompanyTemporaryName from (SELECT
pwgs.create_time as createTime,
pwgs.id,
pwgs.charge_company_temporary_name as chargeCompanyTemporaryName,
@@ -2076,7 +2076,7 @@
<!-- 企业来款详情统计-->
<select id="queryPageListForCompanyDetail" resultType="com.jero.statistics.entity.CompanyComeMoneyDetail">
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 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pwg.working_group_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pwgs.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -2139,7 +2139,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pcp.charge_project LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pcp.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -2182,7 +2182,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pm.meeting_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pms.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -2225,7 +2225,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND pmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.chargeUse != null and CompanyComeMoneyDetailSearch.chargeUse != ''">
AND pmps.charge_use=#{CompanyComeMoneyDetailSearch.chargeUse}
@@ -2268,7 +2268,7 @@
</if>
<if test="CompanyComeMoneyDetailSearch.projectName != null and CompanyComeMoneyDetailSearch.projectName != ''">
AND tmp.project_name LIKE
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
concat('%',concat(#{CompanyComeMoneyDetailSearch.projectName},'%'))
</if>
<if test="CompanyComeMoneyDetailSearch.inAccountStatue != null and CompanyComeMoneyDetailSearch.inAccountStatue != ''">
@@ -2337,4 +2337,4 @@
order by pprr.payment_date desc
</select>
</mapper>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupSubItemMapper.xml
+2 -2
View File
@@ -64,7 +64,7 @@
</select>
<!--工作组详情-->
<select id="queryPageList2" resultType="com.jero.project.entity.PayWorkGroupSubletStatistics">
select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as pack from (SELECT
select pwg1.principalId,pwg1.principalName,pwg1.chargeCompanyTemporaryName,pwg1.allMoney,pwg1.comeAllMoney,pwg1.chargeUse,if(pwg1.pack=0,'否','是') as packText,pwg1.pack from (SELECT
pwgs.id,
pwg.principal_id_a as principalId,
pwg.principal_name_a as principalName,
@@ -211,4 +211,4 @@
</where>
group by pwgs.id order by pwgs.create_time desc
</select>
</mapper>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+148 -142
View File
@@ -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<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, null );
HashMap<String, Object> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,null);
HashMap<String, Object> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> 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<AllProjectStatistics> 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<AllProjectStatistics> 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<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
allProjectStatisticsSearch.setProjectName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getProjectName()));
allProjectStatisticsSearch.setChargeCompanyTemporaryName(oConvertUtils.replaceAllPercent(allProjectStatisticsSearch.getChargeCompanyTemporaryName()));
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "所领导统计");
}
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> 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<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList,strings);
List<AllProjectStatistics> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定工作组内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "项目来款统计");
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
List<AllProjectStatistics> 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<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(departId);
SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(departId);
public Result<?> listForUserByOrgCode(@RequestParam(name = "departCode",required = true) String departCode) {
QueryWrapper<SysDepart> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("org_code",departCode);
SysDepart one = sysDepartService.getOne(queryWrapper1);
List<SysDepartTreeModel> sysDepartTreeModels =sysBaseAPI.listSonDepartsByDepId(one.getId());
SysDepartModel sysDepartModel = sysBaseAPI.selectAllById(one.getId());
List<String> orgCodes = sysDepartTreeModels.stream().map(s -> s.getOrgCode()).collect(Collectors.toList());
orgCodes.add(sysDepartModel.getOrgCode());
QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
@@ -380,4 +386,4 @@ public class AllProjectStatisticsController {
return Result.OK(pageList);
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+97 -98
View File
@@ -66,31 +66,31 @@ public class CompanyComeMoneyStatisticsController {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,null);
HashMap<String, Object> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,null);
HashMap<String, Object> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyList> 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<CompanyComeMoneyList> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
}
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
List<CompanyComeMoneyList> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyDetail> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
}
List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<CompanyComeMoneyDetail> objects = new ArrayList<>();
// return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
// }
List<CompanyComeMoneyDetail> 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);
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+72 -72
View File
@@ -78,29 +78,29 @@ public class PayWorkingGroupStatisticsController {
payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
Page<PayWorkingGroupStatistics> page = new Page<>(pageNo, pageSize);
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,null);
List<PayWorkingGroupStatistics> 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<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
// //根据不同角色加载不同列表的参数
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<PayWorkingGroupStatistics> 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<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
List<PayWorkingGroupStatistics> 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<String> strings = new ArrayList<>(Arrays.asList(selections.split(",")));
payWorkingGroupSearch.setWorkGroup(oConvertUtils.replaceAllPercent(payWorkingGroupSearch.getWorkGroup()));
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", sysUser.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
// //根据不同角色加载不同列表的参数
// List<String> idList = new ArrayList<>();
// //判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// String roleCode = sysUser.getRoleCode();
// List<String> 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<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),idList);
// //获取本部门成员
// idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().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<PayWorkingGroupStatistics> 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<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch,null,strings);
//处理为空数据为0
for (PayWorkingGroupStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/AllProjectStatistics.java
+7 -1
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneyDetail.java
+4 -1
View File
@@ -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;
jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/PrincipalPeopleDetail.java
+3 -1
View File
@@ -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)