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

全所统计

Browse Source
This commit is contained in:
zhangqinlin
2021-09-28 18:22:29 +08:00
parent 346cb363cf
commit 2cddb6df2a
17 changed files with 278 additions and 82 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
+85 -28
View File
@@ -1,41 +1,39 @@
package com.jero.data.controller;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.activation.MimetypesFileTypeMap;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.data.entity.*;
import com.jero.data.entity.DTO.PayCaseCommitteeDTO;
import com.jero.data.entity.DTO.PayCaseCommitteeUpdateDTO;
import com.jero.data.entity.PayCaseCommittee;
import com.jero.data.entity.PayCaseCommitteeExcel;
import com.jero.data.entity.VO.payCaseCommitteeSubitemVO;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeService;
import com.jero.data.entity.PayCaseCommitteeSubitem;
import com.jero.data.service.IPayCaseCommitteeSubitemService;
import com.jero.statistics.entity.AllProjectStatistics;
import com.jero.util.AmountUtil;
import com.jero.modules.oss.entity.OSSFile;
import com.jero.modules.oss.service.IOSSFileService;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -53,6 +51,9 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
@Value("${jero.path.upload}")
private String upLoadPath;
@Resource
private IOSSFileService iossFileService;
@Autowired
private IPayCaseCommitteeService payCaseCommitteeService;
@@ -62,26 +63,82 @@ public class PayCaseCommitteeController extends JeroController<PayCaseCommittee,
/**
* 分页列表查询
* 分标委表-企业端分页列表查询
*
* @param payCaseCommittee
* @param name
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "分标委表-分页列表查询")
@ApiOperation(value="分标委表-分页列表查询", notes="分标委表-分页列表查询")
@AutoLog(value = "分标委表-企业端分页列表查询")
@ApiOperation(value="分标委表-企业端分页列表查询", notes="分标委表-企业端分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayCaseCommittee payCaseCommittee,
public Result<?> queryPageList(@RequestParam(name="name",required = false) String name,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayCaseCommittee> queryWrapper = QueryGenerator.initQueryWrapper(payCaseCommittee, req.getParameterMap());
Page<PayCaseCommittee> page = new Page<PayCaseCommittee>(pageNo, pageSize);
IPage<PayCaseCommittee> pageList = payCaseCommitteeService.page(page, queryWrapper);
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
Page<PayCaseCommittee> page = new Page<>(pageNo, pageSize);
IPage<PayCaseCommittee> pageList = payCaseCommitteeService.pageForList(page,name,userId);
return Result.OK(pageList);
}
/**
* 分标委表-企业端通过分标委id查询详情
*
* @param id
* @return
*/
@AutoLog(value = "分标委表-企业端通过分标委id查询详情")
@ApiOperation(value="分标委表-企业端通过分标委id查询详情", notes="分标委表-企业端通过分标委id查询详情")
@GetMapping(value = "/detail")
public Result<?> detail(@RequestParam(name="id",required = true) String id) {
DetailForCaseCommittee detailForCaseCommittee = payCaseCommitteeService.detail(id);
return Result.OK(detailForCaseCommittee);
}
@AutoLog(value = "分标委表-企业端资料下载")
@ApiOperation(value="分标委表-企业端资料下载", notes="分标委表-企业端资料下载")
@GetMapping(value = "download")
public void download(
@RequestParam(name = "fileId",required = true) String fileId
) throws IOException {
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletResponse response = requestAttributes.getResponse();
OSSFile byId = iossFileService.getById(fileId);
String url = byId.getUrl();
int i = url.indexOf("/");
String fileName = url.substring(i+1);
// 设置信息给客户端不解析
String type = new MimetypesFileTypeMap().getContentType(fileName);
// 设置contenttype，即告诉客户端所发送的数据属于什么类型
response.setHeader("Content-type",type);
// 设置编码
String hehe = new String(fileName.getBytes("utf-8"), "iso-8859-1");
// 设置扩展头，当Content-Type 的类型为要下载的类型时 , 这个信息头会告诉浏览器这个文件的名字和类型。
response.setHeader("Content-Disposition", "attachment;filename=" + hehe);
download(url, response);
}
public void download(String url, HttpServletResponse res) throws IOException {
// 发送给客户端的数据
OutputStream outputStream = res.getOutputStream();
byte[] buff = new byte[1024];
BufferedInputStream bis = null;
// 读取filename
bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+url)));
int i = bis.read(buff);
while (i != -1) {
outputStream.write(buff, 0, buff.length);
outputStream.flush();
i = bis.read(buff);
}
}
/**
* 添加
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayCaseCommitteeSubitemController.java
+1 -9
View File
@@ -151,21 +151,13 @@ public class PayCaseCommitteeSubitemController extends JeroController<PayCaseCom
// ids为空表示搜索导出
if (StringUtils.isBlank(ids)) {
List<ChooseExcelWorkingGroup> list = payCaseCommitteeSubitemService.listForExcel(contactsName, companyName, fenBiaoWeiName);
ArrayList<ChooseExcelWorkingGroup> objects = new ArrayList<>();
for(ChooseExcelWorkingGroup c:list){
if(StringUtils.isNotBlank(c.getCompanyName())){
objects.add(c);
}
}
return getModelAndView(objects);
return getModelAndView(list);
} else {
ArrayList<String> idList = new ArrayList<>(Arrays.asList(ids.split(",")));
List<ChooseExcelWorkingGroup> list= payCaseCommitteeSubitemService.chooseExcel(idList);
return getModelAndView(list);
}
}
@NotNull
private ModelAndView getModelAndView(List<ChooseExcelWorkingGroup> list) {
if (!CollectionUtils.isEmpty(list)) {
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayDataFileController.java
+1
View File
@@ -2,6 +2,7 @@ package com.jero.data.controller;
import java.io.*;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
jero-boot-incoming-payment/src/main/java/com/jero/data/controller/PayFileDownloadRecordController.java
+4 -3
View File
@@ -1,6 +1,7 @@
package com.jero.data.controller;
import java.io.*;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
@@ -131,17 +132,17 @@ public class PayFileDownloadRecordController extends JeroController<PayFileDownl
String hehe = new String(fileName.getBytes("utf-8"), "iso-8859-1");
// 设置扩展头，当Content-Type 的类型为要下载的类型时 , 这个信息头会告诉浏览器这个文件的名字和类型。
response.setHeader("Content-Disposition", "attachment;filename=" + hehe);
download(fileName, response);
download(url, response);
}
public void download(String filename, HttpServletResponse res) throws IOException {
public void download(String url, HttpServletResponse res) throws IOException {
// 发送给客户端的数据
OutputStream outputStream = res.getOutputStream();
byte[] buff = new byte[1024];
BufferedInputStream bis = null;
// 读取filename
bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\temp\\"+filename)));
bis = new BufferedInputStream(new FileInputStream(new File(upLoadPath+"\\"+url)));
int i = bis.read(buff);
while (i != -1) {
outputStream.write(buff, 0, buff.length);
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/DetailForCaseCommittee.java
+24
View File
@@ -0,0 +1,24 @@
package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* 分标委详情
*
* @author zql
* @date 2021/9/28 11:34
*/
@Data
public class DetailForCaseCommittee {
@ApiModelProperty(value = "分标委名称")
private java.lang.String name;
@ApiModelProperty(value = "文件集合")
private List<Files> files;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/entity/Files.java
+18
View File
@@ -0,0 +1,18 @@
package com.jero.data.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author zql
* @date 2021/9/28 11:37
*/
@Data
public class Files {
@ApiModelProperty(value = "文件id")
private java.lang.String fileId;
@ApiModelProperty(value = "文件名")
private java.lang.String fileName;
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/PayCaseCommitteeMapper.java
+9
View File
@@ -2,7 +2,11 @@ package com.jero.data.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.data.entity.DetailForCaseCommittee;
import com.jero.data.entity.PayCaseCommittee;
import org.apache.ibatis.annotations.Param;
/**
* @Description: pay_case_committee
@@ -12,4 +16,9 @@ import com.jero.data.entity.PayCaseCommittee;
*/
public interface PayCaseCommitteeMapper extends BaseMapper<PayCaseCommittee> {
IPage<PayCaseCommittee> pageForList(Page<PayCaseCommittee> page, @Param("name") String name,@Param("userId") String userId);
DetailForCaseCommittee detail(@Param("id")String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/mapper/xml/PayCaseCommitteeMapper.xml
+26
View File
@@ -1,5 +1,31 @@
<?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.PayCaseCommitteeMapper">
<select id="pageForList" resultType="com.jero.data.entity.PayCaseCommittee">
select pcc.id as id ,pcc.name,pcc.create_time as createTime from pay_case_committee pcc left join pay_case_committee_subitem pccs on(pcc.id=pccs.committee_id)
<where>
pccs.contacts_id=#{userId}
<if test="name != null and name !=''">
and pcc.name like concat('%',concat(#{name},'%'))
</if>
</where> group by pcc.id order by pcc.create_time
</select>
<resultMap id="searchFile" type="com.jero.data.entity.DetailForCaseCommittee">
<result property="name" column="name"></result>
<collection property="files" ofType="com.jero.data.entity.Files" javaType="java.util.List" >
<result property="fileId" column="fileId"></result>
<result property="fileName" column="fileName"></result>
</collection>
</resultMap>
<select id="detail" resultMap="searchFile">
SELECT pcc.name,ossf.id as fileId,ossf.file_name as fileName FROM pay_case_committee pcc left join pay_working_group_distribution_record pwgdr on(pcc.id=pwgdr.project_id) left join oss_file
ossf on(pwgdr.file_id=ossf.id) where pcc.id=#{id}
</select>
<!-- <select id="listForChildren" resultType="com.jero.data.entity.Files">-->
<!-- select ossf.id as fileId,ossf.file_name as fileName from pay_case_committee_subitem pccs left join pay_working_group_distribution_record pwgdr on(pccs.id=pwgdr.project_id) left join oss_file-->
<!-- ossf on(pwgdr.file_id=ossf.id) where pccs.committee_id=#{id} and pccs.contacts_id=#{userId}-->
<!-- </select>-->
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/data/service/IPayCaseCommitteeService.java
+20
View File
@@ -1,5 +1,8 @@
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.DetailForCaseCommittee;
import com.jero.data.entity.PayCaseCommittee;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -12,4 +15,21 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface IPayCaseCommitteeService extends IService<PayCaseCommittee> {
/**
* 企业端分标委列表
* @param page
* @param name
* @param userId
* @return
*/
IPage<PayCaseCommittee> pageForList(Page<PayCaseCommittee> page, String name, String userId);
/**
* 企业主分标委详情
* @param id
* @return
*/
DetailForCaseCommittee detail(String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/data/service/impl/PayCaseCommitteeServiceImpl.java
+29 -2
View File
@@ -1,12 +1,19 @@
package com.jero.data.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.data.entity.DetailForCaseCommittee;
import com.jero.data.entity.PayCaseCommittee;
import com.jero.data.mapper.PayCaseCommitteeMapper;
import com.jero.data.mapper.PayCaseCommitteeSubitemMapper;
import com.jero.data.service.IPayCaseCommitteeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* @Description: pay_case_committee
@@ -17,7 +24,27 @@ import org.springframework.stereotype.Service;
@Service
public class PayCaseCommitteeServiceImpl extends ServiceImpl<PayCaseCommitteeMapper, PayCaseCommittee> implements IPayCaseCommitteeService {
@Resource
private PayCaseCommitteeMapper payCaseCommitteeMapper;
/**
* 企业端分标委列表
* @param page
* @param name
* @param userId
* @return
*/
@Override
public IPage<PayCaseCommittee> pageForList(Page<PayCaseCommittee> page, String name, String userId) {
return payCaseCommitteeMapper.pageForList(page,name,userId);
}
/**
* 企业主分标委详情
* @param id
* @return
*/
@Override
public DetailForCaseCommittee detail(String id) {
return payCaseCommitteeMapper.detail(id);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/FirstPageStatisticsController.java → jero-boot-incoming-payment/src/main/java/com/jero/home/controller/FirstPageStatisticsController.java
+3 -1
View File
@@ -1,6 +1,7 @@
package com.jero.statistics.controller;
package com.jero.home.controller;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.project.entity.PayWorkingGroupStatistics;
import com.jero.project.service.IPayWorkingGroupService;
import com.jero.statistics.entity.*;
@@ -27,6 +28,7 @@ import java.util.List;
public class FirstPageStatisticsController {
@Autowired
private IPayWorkingGroupService payWorkingGroupService;
@GetMapping(value = "/firstPage")
@ApiOperation(value = "首页统计", notes = "首页统计")
public Result<?> getFirstPage() {
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+4
View File
@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.common.ProjectCommon;
import com.jero.common.constant.GlobalConstants;
import com.jero.common.dto.SendMessageDTO;
@@ -155,6 +156,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* 邮寄合同-修改
*
*/
@AutoLog(value = "邮寄合同-修改")
@ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
@PostMapping(value = "/editTwo")
public Result<?> editTwo(@RequestBody PayMailBill payMailBill
@@ -168,6 +170,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* 邮寄票据-邮寄
*
*/
@AutoLog(value = "邮寄票据-邮寄")
@ApiOperation(value="邮寄票据-邮寄", notes="邮寄票据-邮寄")
@Transactional
@PostMapping(value = "/edit")
@@ -307,6 +310,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
* 邮寄票据-导出
*
*/
@AutoLog(value = "邮寄票据-导出")
@ApiOperation(value="邮寄票据-导出", notes="邮寄票据-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+2 -2
View File
@@ -55,7 +55,6 @@ public class PayMailContractController extends JeroController<PayMailContract, I
/**
* 邮寄合同-分页列表查询
*/
@AutoLog(value = "邮寄合同-分页列表查询")
@ApiOperation(value = "邮寄合同-分页列表查询", notes = "邮寄合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBillList payMailBillList,
@@ -85,7 +84,8 @@ public class PayMailContractController extends JeroController<PayMailContract, I
/**
* 邮寄合同-编辑（邮寄和修改按钮统一接口）
*/
@ApiOperation(value = "邮寄合同-编辑（邮寄和修改按钮统一接口）", notes = "邮寄合同-编辑（邮寄和修改按钮统一接口）")
@AutoLog(value = "邮寄合同-邮寄合同-编辑（邮寄和修改按钮统一接口）")
@ApiOperation(value = "邮寄合同-编辑（邮寄和修改按钮统一接口）", notes = "邮寄合同-编辑（邮寄和修改按钮统一接口)")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailContract payMailContract
) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+41 -22
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.mail.commont.constant;
@@ -61,16 +62,33 @@ public class AllProjectStatisticsController {
* @param pageNo 页数
* @param pageSize 条数
*/
@ApiOperation(value = "全统计搜索-分页列表查询", notes = "全统计搜索-详情分页列表查询")
@ApiOperation(value = "全所统计搜索-分页列表查询", notes = "全所统计搜索-详情分页列表查询")
@GetMapping(value = "/list")
public Result<?> list(AllProjectStatisticsSearch allProjectStatisticsSearch,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
List<String> roleCodes = new ArrayList<>(Arrays.asList(roleCode.split(",")));
if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
List<String> 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(",")));
//科长
if(roleCodes.contains(constant.BMFZR)&&!(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))) {
String orgCode = sysUser.getOrgCode();
List<SysUser> userList = userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgCode));
idList = userList.stream().map(SysUser::getId).collect(Collectors.toList());
//所领导或者超级管理员
} else if(roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN)) {
idList=null;
//企业职员项目负责人
}else if(roleCodes.contains(constant.XMFZR)&&!(roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)||roleCodes.contains(constant.ADMIN))){
String userId = sysUser.getId();
idList.add(userId);
}
if (allProjectStatisticsSearch.getYear() == null || allProjectStatisticsSearch.getYear().equals("")) {
Calendar calendar = Calendar.getInstance();
String year = String.valueOf(calendar.get(Calendar.YEAR));
@@ -93,23 +111,21 @@ public class AllProjectStatisticsController {
s.setChargeUse_text(payment_charge_use);
}
}
//处理为空数据为0
for(AllProjectStatistics s: pageList.getRecords()){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
//处理为空数据为0
for(AllProjectStatistics s: pageList.getRecords()){
if(s.getAllMoney()== null || s.getAllMoney().equals("") ){
s.setAllMoney("0.00");
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
}
if(s.getComeAllMoney()== null || s.getComeAllMoney().equals("") ) {
s.setComeAllMoney("0.00");
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
}
hashMap.put("sumOfMoney", sum==0.0?sum:df.format(sum));
hashMap.put("sumOfReallyMoney", sum2==0.0?sum2:df.format(sum2));
hashMap.put("pageList",pageList);
return Result.OK(hashMap);
}else {
return Result.OK("权限不足");
}
}
/**
@@ -119,6 +135,7 @@ public class AllProjectStatisticsController {
* @param pageNo 页数
* @param pageSize 条数
*/
@ApiOperation(value = "企业项目统计-分页列表查询", notes = "企业项目统计-详情分页列表查询")
@GetMapping(value = "/listProject")
public Result<?> listProject(AllProjectStatisticsSearch allProjectStatisticsSearch,
@@ -187,8 +204,9 @@ public class AllProjectStatisticsController {
*所领导统计导出
*
*/
@AutoLog(value = "全所统计导出-导出统计")
@GetMapping(value = "/statistics/excel")
@ApiOperation(value = "所领导统计导出-导出统计", notes = "所领导统计导出-导出统计")
@ApiOperation(value = "全所统计导出-导出统计", notes = "全所统计导出-导出统计")
public ModelAndView excel( AllProjectStatisticsSearch allProjectStatisticsSearch) {
LoginUser sysUser =(LoginUser) SecurityUtils.getSubject().getPrincipal();
String roleCode = sysUser.getRoleCode();
@@ -218,6 +236,7 @@ public class AllProjectStatisticsController {
*企业来款统计
*
*/
@AutoLog(value = "企业来款统计-导出统计")
@GetMapping(value = "/statistics/excelProject")
@ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
public ModelAndView excelProject( AllProjectStatisticsSearch allProjectStatisticsSearch) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+3
View File
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
import com.jero.mail.commont.constant;
@@ -184,6 +185,7 @@ public class CompanyComeMoneyStatisticsController {
*企业来款统计
*
*/
@AutoLog(value = "企业来款统计-导出统计")
@GetMapping(value = "/excel")
@ApiOperation(value = "企业来款统计-导出统计", notes = "企业来款统计-导出统计")
public ModelAndView excel(CompanyComeMoneySearch companyComeMoneySearch) {
@@ -220,6 +222,7 @@ public class CompanyComeMoneyStatisticsController {
*企业来款统计
*
*/
@AutoLog(value = "企业来款详情统计-导出统计")
@GetMapping(value = "/excelDetail")
@ApiOperation(value = "企业来款详情统计-导出统计", notes = "企业来款详情统计-导出统计")
public ModelAndView excelDetail( CompanyComeMoneyDetailSearch companyComeMoneyDetailSearch) {
jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupStatisticsController.java → jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PayWorkingGroupStatisticsController.java
+4 -1
View File
@@ -1,9 +1,10 @@
package com.jero.project.controller;
package com.jero.statistics.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.ComboModel;
import com.jero.common.system.vo.DictModel;
@@ -132,6 +133,7 @@ public class PayWorkingGroupStatisticsController {
* 工作组项目统计-统计导出excel
*
*/
@AutoLog(value = "工作组项目统计-统计导出excel")
@GetMapping(value = "/exportXls2")
@ApiOperation(value="工作组项目统计-统计导出excel", notes="工作组项目统计-统计导出excel")
public ModelAndView exportXls2( PayWorkingGroupSearch payWorkingGroupSearch) {
@@ -233,6 +235,7 @@ for(PayWorkGroupSubletStatistics s: pageList.getRecords()){
* @param id
*
*/
@AutoLog(value = "工作组成员统计-导出统计(传工作组id)")
@GetMapping(value = "/excelSub")
@ApiOperation(value = "工作组成员统计-导出统计(传工作组id)", notes = "工作组成员统计-导出统计(传工作组id)")
@ApiImplicitParam(name = "id", value = "工作组id", dataType = "String", required = true)
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+4 -14
View File
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.vo.LoginUser;
@@ -170,25 +171,13 @@ public class PrincipalPeopleStatisticsController {
}
/**
* 项目详情
*
* @param projectId
* @return
*/
@ApiOperation(value="个人来款统计-项目详情", notes="个人来款统计-项目详情")
@PostMapping(value = "/getProjectDetail")
@Transactional
public Result<?> getProjectDetail(@RequestParam(name="projectId") String projectId
) {
ProjectDetailVO projectDetailVO = projectDetailService.getProjectDetail(projectId);
return Result.OK(projectDetailVO);
}
/**
*个人来款统计导出
*
*/
@AutoLog(value = "个人来款统计导出-导出统计")
@GetMapping(value = "/excel")
@ApiOperation(value = "个人来款统计导出-导出统计", notes = "个人来款统计导出-导出统计")
public ModelAndView excel( PrincipalPeopleSearch principalPeopleSearch) {
@@ -225,6 +214,7 @@ public class PrincipalPeopleStatisticsController {
*个人来款统详情计导出
*
*/
@AutoLog(value = "个人来款统详情计导出-导出统计")
@GetMapping(value = "/excelDetail")
@ApiOperation(value = "个人来款统详情计导出-导出统计", notes = "个人来款统详情计导出-导出统计")
public ModelAndView excelDetail( PrincipalPeopleDetailSearch principalPeopleDetailSearch) {