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

Merge branch 'branch20211008'

Browse Source
This commit is contained in:
梁琦涛
2021-11-01 09:25:44 +08:00
parent 7debfa7436 6b2934d4bb
commit 1e0f5c0be7
50 changed files with 955 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-base/jero-boot-base-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java
+1 -1
View File
@@ -329,7 +329,7 @@ public interface ISysBaseAPI extends CommonAPI {
* @param departId 部门id
* @return JSONObject
*/
List<String> getAllDepartIds(String departId);
List<String> getAllDepartIds(String departId,String orgCode,List<String> idList);
/**
* 发送短信验证码
*/
jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java
+4 -4
View File
@@ -27,10 +27,7 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -253,6 +250,9 @@ public class JeroController<T, S extends IService<T>> {
}
return ExcelImportUtil.importExcel(file.getInputStream(), clazz, params);
} catch (Exception e) {
if(Objects.isNull(e.getMessage())){
throw new JeroBootException("文件导入失败:请填写内容标题！");
}
throw new JeroBootException("文件导入失败:" + e.getMessage());
} finally {
try {
jero-boot-incoming-payment/pom.xml
+6
View File
@@ -43,6 +43,12 @@
<artifactId>javase</artifactId>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>com.google.zxing</groupId>
<artifactId>core</artifactId>
<version>3.3.0</version>
<scope>compile</scope>
</dependency>
<!-- 如果需要微服务版本，则以上API注释，释放该API
<dependency>
<groupId>com.jero.boot</groupId>
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/CompanyLoginController.java
+1 -2
View File
@@ -109,8 +109,7 @@ public class CompanyLoginController {
throw new JeroBootException("手机号或密码错误");
}else {
if (StringUtils.isBlank(contactsManagement.getPassword())){
result.setMessage("请先用手机验证码登录");
return result;
throw new JeroBootException("请先用手机验证码登录");
}
}
jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java
+3 -1
View File
@@ -536,7 +536,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
paySpendingContract.setSignedContactsTemporaryName(map.get(3));
}
if(!Objects.isNull(map.get(4))){
if(!StringUtils.isBlank(map.get(4))){
mapOpening.forEach((k,v)->{
if(Objects.equals(map.get(4),k)){
paySpendingContract.setOpening(Integer.parseInt(v));
@@ -545,6 +545,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
if(Objects.isNull(paySpendingContract.getOpening())){
sb.append("第").append(n).append("行:是否开口格式错误，请修改。<br/>");
}
}else{
sb.append("第").append(n).append("行:是否开口不能为空，请修改。<br/>");
}
paySpendingContract.setPrincipalName(map.get(5));
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/BatOrder.java
+20
View File
@@ -0,0 +1,20 @@
package com.jero.mail.commont;
import lombok.Data;
import java.util.Date;
/**
* @author zql
* @date 2021/10/29 10:41
*/
@Data
public class BatOrder {
private String id;
private String addressName;
private String addressPhone;
private String address;
private String tracking_number;
private String filePath;
private Date mileTime;
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/HospitalInformation.java
+17
View File
@@ -0,0 +1,17 @@
package com.jero.mail.commont;
import lombok.Data;
/**
* @author zql
* @date 2021/10/29 10:44
*/
@Data
public class HospitalInformation {
private String hospitalName;
private String phoneNumber;
private String province;
private String city;
private String county;
private String area;
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/Print.java
+481
View File
@@ -0,0 +1,481 @@
package com.jero.mail.commont;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.*;
import java.util.Date;
import javax.imageio.ImageIO;
import cn.hutool.core.date.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGEncodeParam;
import com.sun.image.codec.jpeg.JPEGImageEncoder;
import org.springframework.util.ResourceUtils;
/**
* @author zql
* @date 2021/10/29 10:31
*/
public class Print {
/**
* 生成电子面单图片工具
*
* @author chunge
* @version 1.0
* @time 2021/08/01
*/
@Slf4j
public static class EMSGenerateUtil {
//图片的宽度
public static final int IMG_WIDTH = 799;
//图片的宽度
public static final int IMG_HEIGHT = 1199;
//LOGO的宽度
public static final int LOGO_WIDTH = 220;
//LOGO高度
public static final int LOGO_HEIGHT = 70;
public static BufferedImage image;
public static void createImage(String fileLocation) {
FileOutputStream fos = null;
BufferedOutputStream bos = null;
try {
fos = new FileOutputStream(fileLocation);
bos = new BufferedOutputStream(fos);
JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(bos);
encoder.encode(image);
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (bos != null) bos.close();
if (fos != null) fos.close();
} catch (Exception e2) {
e2.printStackTrace();
}
}
}
/**
* 插入图片 自定义图片的宽高
*
* @param imgPath 插入图片的路径
* @param imgWidth 设置图片的宽度
* @param imgHeight 设置图片的高度
* @param isCompress 是否按输入的宽高定义图片的尺寸，只有为true时 输入的宽度和高度才起作用<br/>
* 为false时输入的宽高不起作用，按输入图片的默认尺寸
* @return
* @throws Exception
*/
private static Image insertImage(String imgPath, int imgWidth, int imgHeight, boolean isCompress) throws Exception {
File fileimage = new File(imgPath);
Image src = ImageIO.read(fileimage);
if (isCompress) {
Image image = src.getScaledInstance(imgWidth, imgHeight, Image.SCALE_SMOOTH);
return image;
}
return src;
}
/**
* 生成
*/
public static boolean generateOrder(String orderPath, BatOrder orderParam, HospitalInformation hospitalInformation, boolean isCompress, int imgWidth, int imgHeidht) {
if (null == orderParam)
return false;
String picPath = orderPath;
int startHeight = 0; //表格的起始高度
int startWidth = 0; //表格的起始宽度
try {
image = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, BufferedImage.TYPE_INT_RGB);
Graphics2D g = image.createGraphics();
//以运单号为名称创建存放订单的目录
File mk = new File(picPath + orderParam.getTracking_number());
if (mk.exists()) {
FileUtils.deleteDirectory(mk);
}
FileUtils.forceMkdir(mk);
//设置背景色为白色
g.setColor(Color.WHITE);
//设置颜色区域大小
g.fillRect(0, 0, IMG_WIDTH, IMG_HEIGHT);
/*
* 绘制表格 填充内容
* */
//表格线条的颜色
g.setColor(Color.BLACK);
//边框加粗
g.setStroke(new BasicStroke(2.0f));
//消除文本出现锯齿现象
g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
//设置虚线条
Stroke bs = new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL, 0, new float[]{16, 4}, 0);
g.setStroke(bs);
//表格的四个边框
g.drawLine(startWidth + 16, startHeight + 16, startWidth + 783, startHeight + 16); //上边框
g.drawLine(startWidth + 16, startHeight + 16, startWidth + 16, startHeight + 1183); //左边框
g.drawLine(startWidth + 16, startHeight + 1183, startWidth + 783, startHeight + 1183); //下边框
g.drawLine(startWidth + 783, startHeight + 16, startWidth + 783, startHeight + 1183); //右边框
//分割线左边
//标准快递
Font fontSfTyp = new Font("黑体", Font.BOLD, 45);//Font.BOLD（加粗）
g.setFont(fontSfTyp);
g.drawString("标准快递", startWidth + 78, startHeight + 120);
Font fontSfTyp2 = new Font("黑体", Font.BOLD, 16);//Font.BOLD（加粗）
g.setFont(fontSfTyp2);
g.drawString("时间：" + DateUtil.format(orderParam.getMileTime(), "yyyy-MM-dd HH:mm:ss"), startWidth + 75, startHeight + 145);
//第一行竖 分割线
g.drawLine(startWidth + 336, startHeight + 16, startWidth + 336, startHeight + 176); //右边框
//分割线右边
//生成code128a 条码
SFBarCodeGenerateUtil.generateBarCode128_a(orderParam.getTracking_number(), //运单号
picPath + orderParam.getTracking_number() + ".png", //图片名称
440, //图片宽度
100);
//导入条码图片
Image sfBarImg = insertImage(picPath + orderParam.getTracking_number() + ".png", 0, 0, false);
g.drawImage(sfBarImg, startWidth + 340, startHeight + 32, null);
g.drawString(orderParam.getTracking_number(), startWidth + 500, startHeight + 150);
//绘制表格内容 第1行
g.drawLine(startWidth + 16, startHeight + 176, startWidth + 783, startHeight + 176);
//绘制表格内容 第2行
g.drawLine(startWidth + 16, startHeight + 248, startWidth + 783, startHeight + 248);
g.setFont(fontSfTyp);
g.drawString(orderParam.getFilePath(), startWidth + 100, startHeight + 220);
Font fontSfTyp3 = new Font("黑体", Font.BOLD, 28);
g.setFont(fontSfTyp3);
//收：
g.drawString("收:" + orderParam.getAddressName() + " " + orderParam.getAddressPhone(), startWidth + 18, startHeight + 280);
if (orderParam.getAddress().length() > 22) {
g.drawString(" " + orderParam.getAddress().substring(0, 22), startWidth + 18, startHeight + 310);
g.drawString(" " + orderParam.getAddress().substring(22, orderParam.getAddress().length()), startWidth + 18, startHeight + 340);
} else {
g.drawString(" " + orderParam.getAddress().substring(0, orderParam.getAddress().length()), startWidth + 18, startHeight + 310);
}
//绘制表格内容 第3行
g.drawLine(startWidth + 16, startHeight + 408, startWidth + 783, startHeight + 408);
//寄
Font fontSfTyp4 = new Font("黑体", Font.PLAIN, 20);//Font.PLAIN（普通）
g.setFont(fontSfTyp4);
//绘制表格内容 第4行
g.drawLine(startWidth + 16, startHeight + 472, startWidth + 783, startHeight + 472);
g.drawString("寄:" + hospitalInformation.getHospitalName() + " " + hospitalInformation.getPhoneNumber(), startWidth + 18, startHeight + 430);
String address = hospitalInformation.getProvince() + hospitalInformation.getCity() + hospitalInformation.getCounty() + hospitalInformation.getArea();
if (address.length() > 30) {
g.drawString(" " + address.substring(0, 30), startWidth + 18, startHeight + 450);
g.drawString(" " + address.substring(30, address.length()), startWidth + 18, startHeight + 470);
} else {
g.drawString(" " + address.substring(0, address.length()), startWidth + 18, startHeight + 450);
}
g.drawString("付款方式：", startWidth + 18, startHeight + 500);
g.drawString("计费重量（KG）：", startWidth + 18, startHeight + 530);
g.drawString("保价金额：", startWidth + 18, startHeight + 560);
//第5行竖 分割线
g.drawLine(startWidth + 464, startHeight + 472, startWidth + 464, startHeight + 583); //右边框
g.drawString("收件人\\代收人：", startWidth + 468, startHeight + 495);
g.drawString("签收时间 ： 年 月 日 时", startWidth + 468, startHeight + 530);
Font fontSfTyp5 = new Font("黑体", Font.PLAIN, 16);//Font.PLAIN（普通）
g.setFont(fontSfTyp5);
g.drawString("快件送达收货人地址：经收件人或收件人允", startWidth + 468, startHeight + 560);
g.drawString("许的代收人签字，视为送达", startWidth + 468, startHeight + 580);
//绘制表格内容 第5行
g.drawLine(startWidth + 16, startHeight + 583, startWidth + 783, startHeight + 583);
g.setFont(fontSfTyp4);
g.drawString("件数： 重量（KG）", startWidth + 18, startHeight + 600);
g.drawString("配货信息：物品", startWidth + 18, startHeight + 620);
//绘制表格内容 第5行
g.drawLine(startWidth + 16, startHeight + 719, startWidth + 783, startHeight + 719);
g.drawString("配货信息：物品", startWidth + 18, startHeight + 620);
g.drawLine(startWidth + 16, startHeight + 735, startWidth + 783, startHeight + 735);
//分割线右边
//生成code128a 条码
SFBarCodeGenerateUtil.generateBarCode128_a(orderParam.getTracking_number(), //运单号
picPath + orderParam.getTracking_number() + ".png", //图片名称
440, //图片宽度
60);
//导入条码图片
Image sfBarImg2 = insertImage(picPath + orderParam.getTracking_number() + ".png", 0, 0, false);
g.drawImage(sfBarImg2, startWidth + 20, startHeight + 750, null);
g.drawString(orderParam.getTracking_number(), startWidth + 180, startHeight + 830);
//插入Logo
//从springboot资源目录获取获取logo图片地址:
String logoPath = ResourceUtils.getFile("classpath:ems\\ems.png").getPath();
Image sublogoImg = insertImage(logoPath, LOGO_WIDTH, LOGO_HEIGHT, true);
g.drawImage(sublogoImg, startWidth + 480, startHeight + 750, null);
g.drawLine(startWidth + 16, startHeight + 855, startWidth + 783, startHeight + 855);
g.drawString("收:" + orderParam.getAddressName() + " " + orderParam.getAddressPhone(), startWidth + 18, startHeight + 880);
if (orderParam.getAddress().length() > 20) {
g.drawString(" " + orderParam.getAddress().substring(0, 20), startWidth + 18, startHeight + 900);
g.drawString(" " + orderParam.getAddress().substring(20, orderParam.getAddress().length()), startWidth + 18, startHeight + 920);
} else {
g.drawString(" " + orderParam.getAddress().substring(0, orderParam.getAddress().length()), startWidth + 18, startHeight + 900);
}
//竖线
g.drawLine(startWidth + 464, startHeight + 855, startWidth + 464, startHeight + 991);
g.drawString("寄:" + hospitalInformation.getHospitalName(), startWidth + 468, startHeight + 880);
g.drawString(" " + hospitalInformation.getPhoneNumber(), startWidth + 468, startHeight + 900);
if (address.length() > 14) {
g.drawString(" " + address.substring(0, 14), startWidth + 468, startHeight + 920);
g.drawString(" " + address.substring(14, address.length()), startWidth + 468, startHeight + 940);
} else {
g.drawString(" " + address.substring(0, address.length()), startWidth + 468, startHeight + 920);
}
g.drawLine(startWidth + 16, startHeight + 991, startWidth + 783, startHeight + 991);
g.drawString("备注：", startWidth + 18, startHeight + 1020);
g.drawLine(startWidth + 16, startHeight + 1127, startWidth + 783, startHeight + 1127);
g.drawString("网址：www.ems.com.cn 客服电话：11183", startWidth + 45, startHeight + 1160);
g.drawLine(startWidth + 559, startHeight + 1127, startWidth + 559, startHeight + 1183);
g.drawString("L", startWidth + 750, startHeight + 1170);
g.dispose();
File sfbarFile = new File(picPath + orderParam.getId() + ".jpg");
if (sfbarFile.exists() && sfbarFile.isFile()) {
sfbarFile.delete();
}
//生成订单图片
createImage(picPath + orderParam.getId() + ".jpg");
if (isCompress) {
compressImg(picPath + orderParam.getId() + ".jpg", imgWidth, imgHeidht);
}
log.info("订单生成成功. " + picPath + orderParam.getId() + ".jpg");
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
/**
* 水平翻转图像 顺时针旋转90度、左右翻转
*
* @param bi 目标图像
* @return
*/
private static BufferedImage rotate90DX(BufferedImage bi) {
int width = bi.getWidth();
int height = bi.getHeight();
BufferedImage biFlip = new BufferedImage(height, width, bi.getType());
for (int i = 0; i < width; i++)
for (int j = 0; j < height; j++)
biFlip.setRGB(height - 1 - j, width - 1 - i, bi.getRGB(i, j));
return biFlip;
}
/**
* 水平翻转图像 逆时针旋转90度、左右翻转
*
* @param bi 目标图像
* @return
*/
private static BufferedImage rotate90SX(BufferedImage bi) {
int width = bi.getWidth();
int height = bi.getHeight();
BufferedImage biFlip = new BufferedImage(height, width, bi.getType());
for (int i = 0; i < width; i++)
for (int j = 0; j < height; j++)
biFlip.setRGB(j, i, bi.getRGB(i, j));
return biFlip;
}
/**
* 根据规定尺寸压缩图片
*
* @param imgPath 图片路径
* @param width 图片宽度
* @param height 图片高度
*/
private static void compressImg(String imgPath, int width, int height) {
/**
* 设置条码图片的尺寸
* */
BufferedInputStream bis = null;
BufferedOutputStream out = null;
FileOutputStream fis = null;
try {
File sfFile = new File(imgPath);
if (sfFile.isFile() && sfFile.exists()) {
//读取图片
bis = new BufferedInputStream(new FileInputStream(imgPath));
//转换成图片对象
Image bi = ImageIO.read(bis).getScaledInstance(width, height, Image.SCALE_SMOOTH);
//构建图片流 设置图片宽和高
BufferedImage tag = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
//绘制改变尺寸后的图
tag.getGraphics().drawImage(bi, 0, 0, width, height, null);
//保存图片
fis = new FileOutputStream(imgPath);
JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(fis);
JPEGEncodeParam jep = JPEGCodec.getDefaultJPEGEncodeParam(tag);
//设置压缩图片质量
jep.setQuality(3f, true);
encoder.encode(tag, jep);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
try {
if (fis != null) fis.close();
if (out != null) out.close();
if (bis != null) bis.close();
} catch (Exception e2) {
e2.printStackTrace();
}
}
}
//创建目录
private static boolean createDir(String destDirName) {
try {
File file = new File(destDirName);
if (destDirName.endsWith(File.separator))
destDirName += File.separator;
if (file.mkdir())
return true;
} catch (Exception e) {
e.printStackTrace();
}
return false;
}
//删除目录
public static boolean removeDir(File dir) {
File[] files = dir.listFiles();
for (File file : files) {
if (file.isDirectory()) {
return removeDir(file);
} else {
return file.delete();
}
}
return dir.delete();
}
//删除目录
public static boolean deleteMk(String dirPath) {
File dirFile = new File(dirPath);
if (dirFile.isDirectory()) {
File[] files = dirFile.listFiles();
for (int i = 0; i < files.length; i++) {
files[i].delete();
}
}
return dirFile.delete();
}
/**
* 把文件转换为byte[]
*
* @param filePath 文件路径
*/
public static byte[] getFileBytes(String filePath) {
byte[] buffer = null;
FileInputStream fis = null;
ByteArrayOutputStream bos = null;
try {
File file = new File(filePath);
fis = new FileInputStream(file);
bos = new ByteArrayOutputStream(1000);
byte[] b = new byte[1000];
int n;
while ((n = fis.read(b)) != -1) {
bos.write(b, 0, n);
}
buffer = bos.toByteArray();
} catch (FileNotFoundException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
} finally {
try {
if (bos != null) {
bos.close();
}
if (fis != null) {
fis.close();
}
} catch (Exception e2) {
e2.printStackTrace();
}
}
return buffer;
}
}
public static void main(String[] args) {
BatOrder param = new BatOrder();
param.setTracking_number("883987638272");
param.setTracking_number("883987638272");
param.setFilePath("310-新A-沙区02-沙区揽投-*");
param.setAddressName("春哥");
param.setAddressPhone("15261800000");
param.setAddress("重庆市重庆市南岸区南岸区测试大道重庆交通大学测试小区1栋00单元00");
HospitalInformation hospitalInformation = new HospitalInformation();
hospitalInformation.setHospitalName("江苏大学");
hospitalInformation.setPhoneNumber("025-91918230");
hospitalInformation.setProvince("江苏");
hospitalInformation.setCity("南京市市");
hospitalInformation.setCounty("栖霞区区");
hospitalInformation.setArea("南京仙林大学城199号");
EMSGenerateUtil.generateOrder(
"D:\\12345\\",
param,
hospitalInformation,
false,
600,
400);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/commont/SFBarCodeGenerateUtil.java
+51
View File
@@ -0,0 +1,51 @@
package com.jero.mail.commont;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.MultiFormatWriter;
import com.google.zxing.WriterException;
import com.google.zxing.client.j2se.MatrixToImageWriter;
import com.google.zxing.common.BitMatrix;
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Hashtable;
/**
* @author zql
* @date 2021/10/29 10:57
*/
public class SFBarCodeGenerateUtil {
/**
* 快递单号 wayBillNo
*
* @param generatePathName 指定文件名
* @param wayBillNo 写入的内容
* @param width 尺寸宽
* @param height 尺寸高
*/
public static void generateBarCode128_a(String wayBillNo, String generatePathName, int width, int height) {
Hashtable<EncodeHintType, Object> hints = new Hashtable<EncodeHintType, Object>();
// 字符集
hints.put(EncodeHintType.CHARACTER_SET, "GBK");// Constant.CHARACTER);
// 容错质量
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
try {
// 尺寸
BitMatrix bitMatrix;
bitMatrix = new MultiFormatWriter().encode(wayBillNo, BarcodeFormat.CODE_128, width, height, hints);
BufferedOutputStream buffer = null;
buffer = new BufferedOutputStream(new FileOutputStream(generatePathName));
// ok
MatrixToImageWriter.writeToStream(bitMatrix, "png", new FileOutputStream(new File(generatePathName)));
buffer.close();
} catch (WriterException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+31 -5
View File
@@ -25,6 +25,9 @@ import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.mail.commont.BatOrder;
import com.jero.mail.commont.HospitalInformation;
import com.jero.mail.commont.Print;
import com.jero.mail.commont.constant;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
@@ -147,7 +150,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
*
*/
@RequiresPermissions("billMail:edit")
@AutoLog(value = "邮寄合同-修改")
@AutoLog(value = "邮寄票据-修改")
@ApiOperation(value="邮寄合同-修改", notes="邮寄合同-修改")
@PostMapping(value = "/editTwo")
public Result<?> editTwo(@RequestBody PayMailBill payMailBill
@@ -155,6 +158,7 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
payMailBill.setPostStatus(1);
payMailBill.setContactMobile(PasswordUtil.encrypt(payMailBill.getContactMobile()));
payMailBillService.updateById(payMailBill);
payMailBillService.pushBillEditToStandards(payMailBill);
return Result.OK("操作成功!");
}
@@ -311,10 +315,32 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Transactional
@PostMapping(value = "/print")
public Result<?> print(@RequestParam(name="id") String id) {
PayMailBill payMailBill = payMailBillService.print(id);
HashMap<String, PayMailBill> hashMap = new HashMap<>();
hashMap.put("payMailBill",payMailBill);
return Result.OK(hashMap);
PayMailBill payMailBill = payMailBillService.getById(id);
BatOrder param = new BatOrder();
param.setId("EMS票单");
param.setMileTime(payMailBill.getSendDate());
param.setTracking_number(payMailBill.getPostNo());
param.setFilePath("310-新A-沙区02-沙区揽投-*");
param.setAddressName(payMailBill.getContactName());
param.setAddressPhone(PasswordUtil.decrypt(payMailBill.getContactMobile()));
param.setAddress(payMailBill.getContactAddress());
HospitalInformation hospitalInformation = new HospitalInformation();
hospitalInformation.setHospitalName(payMailBill.getMailer());
hospitalInformation.setPhoneNumber(PasswordUtil.decrypt(payMailBill.getContactMobile()));
hospitalInformation.setProvince("江苏");
hospitalInformation.setCity("南京市市");
hospitalInformation.setCounty("栖霞区区");
hospitalInformation.setArea("南京仙林大学城199号");
Print.EMSGenerateUtil.generateOrder(
"D:\\",
param,
hospitalInformation,
false,
600,
400);
return Result.OK();
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+34 -25
View File
@@ -2,10 +2,8 @@ package com.jero.mail.controller;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.alibaba.fastjson.JSONObject;
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;
@@ -14,26 +12,24 @@ import com.jero.common.dto.SendMessageDTO;
import com.jero.common.enums.CompanyMessageEnums;
import com.jero.common.service.SendMessageService;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.service.IPayMailContractService;
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 com.jero.util.SearchUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
@@ -63,15 +59,15 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@RequiresPermissions("contractMail:search")
@ApiOperation(value = "邮寄合同-分页列表查询", notes = "邮寄合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBillList payMailBillList,
public Result<?> queryPageList(PayMailContracrList payMailContracrList,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize
) {
payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page,payMailBillList);
payMailContracrList.setContractName(oConvertUtils.replaceAllPercent(payMailContracrList.getContractName()));
payMailContracrList.setContractNum(oConvertUtils.replaceAllPercent(payMailContracrList.getContractNum()));
payMailContracrList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailContracrList.getSignedCompanyTemporaryName()));
Page<PayMailContracrList> page = new Page<>(pageNo, pageSize);
IPage<PayMailContracrList> pageList = payMailContractService.pageContract(page, payMailContracrList);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
@@ -93,8 +89,8 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@ApiOperation(value = "检测企业审核是否通过", notes = "检测企业审核是否通过")
@GetMapping(value = "/check")
public Result<?> check(@RequestParam(name = "id",required = true) String id) {
PayMailBillList payMailBillList =payMailContractService.checkOne(id);
if(ObjectUtils.isNotEmpty(payMailBillList)) {
PayMailContracrList payMailContracrList =payMailContractService.checkOne(id);
if(ObjectUtils.isNotEmpty(payMailContracrList)) {
return Result.OK("有权限可以操作!");
}else {
return Result.OK("企业审核未成功无法操作!");
@@ -109,8 +105,8 @@ public class PayMailContractController extends JeroController<PayMailContract, I
* 邮寄合同-邮寄接口
*/
@RequiresPermissions("contractMail:mail")
@AutoLog(value = "邮寄合同-邮寄口")
@ApiOperation(value = "邮寄合同-邮寄口", notes = "邮寄合同-邮寄口")
@AutoLog(value = "邮寄合同-邮寄接口")
@ApiOperation(value = "邮寄合同-邮寄接口", notes = "邮寄合同-邮寄接口")
@PostMapping(value = "/mile")
public Result<?> mile(@RequestBody PayMailContract payMailContract
) {
@@ -163,7 +159,19 @@ public class PayMailContractController extends JeroController<PayMailContract, I
return Result.OK("操作成功!");
}
/**
* 票据邮寄打印
*
*/
@ApiOperation(value="合同邮寄打印", notes="合同邮寄打印")
@Transactional
@PostMapping(value = "/print")
public Result<?> print(@RequestParam(name="id") String id) {
PayMailContract payMailContract = payMailContractService.getById(id);
HashMap<String, PayMailContract> hashMap = new HashMap<>();
hashMap.put("payMailBill",payMailContract);
return Result.OK(hashMap);
}
/**
* 导出excel
*/
@@ -171,12 +179,12 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@AutoLog(value = "邮寄合同-导出")
@ApiOperation(value = "邮寄合同-导出", notes = "邮寄合同-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids) {
public ModelAndView exportXls(PayMailContracrList payMailContracrList, @RequestParam(name = "ids", required = false) String ids) {
if (StringUtils.isBlank(ids)) {
payMailBillList.setContractName(oConvertUtils.replaceAllPercent(payMailBillList.getContractName()));
payMailBillList.setContractNum(oConvertUtils.replaceAllPercent(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailBillList.getSignedCompanyTemporaryName()));
List<PayMailBillList> pageList = payMailContractService.pageContractTwo(payMailBillList);
payMailContracrList.setContractName(oConvertUtils.replaceAllPercent(payMailContracrList.getContractName()));
payMailContracrList.setContractNum(oConvertUtils.replaceAllPercent(payMailContracrList.getContractNum()));
payMailContracrList.setSignedCompanyTemporaryName(oConvertUtils.replaceAllPercent(payMailContracrList.getSignedCompanyTemporaryName()));
List<PayMailContracrList> pageList = payMailContractService.pageContractTwo(payMailContracrList);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
@@ -188,11 +196,11 @@ public class PayMailContractController extends JeroController<PayMailContract, I
log.error("手机号解密异常！", e);
}
}
return AmountUtil.exportListXls(pageList, PayMailBillList.class, "邮寄合同");
return AmountUtil.exportListXls(pageList, PayMailContracrList.class, "邮寄合同");
} else {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
List<PayMailBillList> list = payMailContractService.getOneExcel(strings);
List<PayMailContracrList> list = payMailContractService.getOneExcel(strings);
if (!CollectionUtils.isEmpty(list)) {
try {
@@ -205,9 +213,10 @@ public class PayMailContractController extends JeroController<PayMailContract, I
log.error("手机号解密异常！", e);
}
}
return AmountUtil.exportListXls(list, PayMailBillList.class, "邮寄合同");
return AmountUtil.exportListXls(list, PayMailContracrList.class, "邮寄合同");
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailBillList.java → jero-boot-incoming-payment/src/main/java/com/jero/mail/entity/PayMailContracrList.java
+1 -1
View File
@@ -8,7 +8,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@Data
public class PayMailBillList {
public class PayMailContracrList {
@ApiModelProperty(value = "id主键")
private java.lang.String id;
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
-1
View File
@@ -69,6 +69,5 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
IPage<PayMailBill> pageLists(Page<PayMailBill> page,@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch);
PayMailBill print(@Param("id")String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java
+7 -6
View File
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import org.apache.ibatis.annotations.Param;
@@ -21,13 +21,14 @@ import java.util.List;
*/
public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, @Param("payMailBillList") PayMailBillList payMailBillList);
IPage<PayMailContracrList> pageContract(Page<PayMailContracrList> page, @Param("payMailBillList") PayMailContracrList payMailContracrList);
List<PayMailBillList> pageContract(@Param("payMailBillList") PayMailBillList payMailBillList);
List<PayMailContracrList> pageContract(@Param("payMailBillList") PayMailContracrList payMailContracrList);
List<PayMailBillList> pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailContracrList> pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper<PayMailContracrList> queryWrapper);
List<PayMailBillList> getOneExcel(@Param("strings") ArrayList<String> strings);
List<PayMailContracrList> getOneExcel(@Param("strings") ArrayList<String> strings);
PayMailContracrList checkOne(@Param("id") String id);
PayMailBillList checkOne(@Param("id") String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+2 -1
View File
@@ -96,8 +96,9 @@
post_no as postNo,
send_date as sendDate,
pmb.remark
from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) where pmb.id=#{id} group by pmb.id
from pay_mail_bill pmb left join pay_mail_bill_project pmbp on(pmb.id=pmbp.bill_id) where pmb.id=#{id}
${ew.customSqlSegment}
group by pmb.id
ORDER BY post_status ASC,create_time DESC
</select>
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+14 -12
View File
@@ -1,7 +1,7 @@
<?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.mail.mapper.PayMailContractMapper">
<select id="pageContract" resultType="com.jero.mail.entity.PayMailBillList">
<select id="pageContract" resultType="com.jero.mail.entity.PayMailContracrList">
SELECT
pc.id,
pc.post_status as postStatus,
@@ -19,23 +19,23 @@ pic.principal_name as principalName,
pic.principal_id as principalId,
pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
<where>
<if test="payMailBillList.contractNum !='' and payMailBillList.contractNum !=null">
pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%'))
<if test="payMailContracrList.contractNum !='' and payMailContracrList.contractNum !=null">
pic.contract_num like concat('%',concat(#{payMailContracrList.contractNum},'%'))
</if>
<if test="payMailBillList.contractName !='' and payMailBillList.contractName !=null">
and pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%'))
<if test="payMailContracrList.contractName !='' and payMailContracrList.contractName !=null">
and pic.contract_name like concat('%',concat(#{payMailContracrList.contractName},'%'))
</if>
<if test="payMailBillList.signedCompanyTemporaryName !='' and payMailBillList.signedCompanyTemporaryName !=null">
and pic.signed_company_temporary_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%'))
<if test="payMailContracrList.signedCompanyTemporaryName !='' and payMailContracrList.signedCompanyTemporaryName !=null">
and pic.signed_company_temporary_name like concat('%',concat(#{payMailContracrList.signedCompanyTemporaryName},'%'))
</if>
<if test="payMailBillList.principalId !='' and payMailBillList.principalId !=null">
and pic.principal_id = #{payMailBillList.principalId}
<if test="payMailContracrList.principalId !='' and payMailContracrList.principalId !=null">
and pic.principal_id = #{payMailContracrList.principalId}
</if>
</where>
order by post_status ASC , pc.create_time DESC
</select>
<select id="checkOne" resultType="com.jero.mail.entity.PayMailBillList">
<select id="checkOne" resultType="com.jero.mail.entity.PayMailContracrList">
SELECT
pc.id,
pc.post_status as postStatus,
@@ -55,7 +55,9 @@ on(pic.signed_company_temporary_id=pcmt.id)
where pc.id=#{id} and pcmt.status=1
</select>
<select id="pageContractExcel" resultType="com.jero.mail.entity.PayMailBillList">
<select id="pageContractExcel" resultType="com.jero.mail.entity.PayMailContracrList">
SELECT
pc.id,
pc.post_status as postStatus,
@@ -71,7 +73,7 @@ pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay
${ew.customSqlSegment}
</select>
<select id="getOneExcel" resultType="com.jero.mail.entity.PayMailBillList">
<select id="getOneExcel" resultType="com.jero.mail.entity.PayMailContracrList">
SELECT
pc.id,
pc.post_status as postStatus,
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+2 -4
View File
@@ -58,6 +58,8 @@ public interface IPayMailBillService extends IService<PayMailBill> {
*/
void pushSendToStandards(PayMailBill payMailBill, String id);
void pushBillEditToStandards(PayMailBill payMailBill);
/**
* 接收会员系统开票邮寄信息
* @param payMailBill
@@ -83,9 +85,5 @@ public interface IPayMailBillService extends IService<PayMailBill> {
IPage<PayMailBill> pageList(Page<PayMailBill> page, QueryWrapper<PayMailBill> queryWrapper);
List<PayMailBill> pageListTwo(PayMailBillSearch payMailBillSearch);
IPage<PayMailBill> pageLists(Page<PayMailBill> page, PayMailBillSearch payMailBillSearch);
PayMailBill print(String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+7 -9
View File
@@ -5,12 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.mapper.PayMailContractMapper;
import org.springframework.beans.factory.annotation.Autowired;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -24,14 +21,15 @@ public interface IPayMailContractService extends IService<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, PayMailBillList payMailBillList);
IPage<PayMailContracrList> pageContract(Page<PayMailContracrList> page, PayMailContracrList payMailContracrList);
List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailContracrList> pageContractExcel(QueryWrapper<PayMailContracrList> queryWrapper);
List<PayMailBillList> pageContractTwo(PayMailBillList payMailBillList);
List<PayMailContracrList> pageContractTwo(PayMailContracrList payMailContracrList);
List<PayMailBillList> getOneExcel(ArrayList<String> strings);
List<PayMailContracrList> getOneExcel(ArrayList<String> strings);
PayMailContracrList checkOne(String id);
PayMailBillList checkOne(String id);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+11 -15
View File
@@ -242,6 +242,17 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
AuthenticationUtils.checkResult(post);
}
@Override
public void pushBillEditToStandards(PayMailBill payMailBill) {
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemMapper.selectById(payMailBill.getProjectId());
BillingInfo billingInfo = new BillingInfo();
billingInfo.setBillNumber(tbMemberProjectSubitem.getBillNumber());
billingInfo.setSendMethod(payMailBill.getSendMethod());
billingInfo.setPostNo(payMailBill.getPostNo());
billingInfo.setSendDate(payMailBill.getSendDate());
AuthenticationUtils.post("/billingInfo/billingInfo/postFromPaymentEdit",null,billingInfo);
}
@Override
public void addFromStandards(PayMailBill payMailBill) {
String projectId = payMailBill.getProjectId();
@@ -283,21 +294,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
return payMailBillMapper.pageList(page,queryWrapper);
}
@Override
public List<PayMailBill> pageListTwo(PayMailBillSearch payMailBillSearch) {
return payMailBillMapper.pageListss(payMailBillSearch);
}
@Override
public IPage<PayMailBill> pageLists(Page<PayMailBill> page,PayMailBillSearch payMailBillSearch) {
return payMailBillMapper.pageLists(page,payMailBillSearch);
}
@Override
public PayMailBill print(String id) {
return payMailBillMapper.print(id);
}
//校验不同项目是否属于同一个公司，开票金额是否大于当前未开票金额，企业名称是否审核
private String checkCompanyProject(List<PayMailBillProject> bmpList) {
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java
+10 -8
View File
@@ -4,7 +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContracrList;
import com.jero.mail.entity.PayMailContract;
import com.jero.mail.mapper.PayMailContractMapper;
import com.jero.mail.service.IPayMailContractService;
@@ -28,27 +28,29 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
@Override
public IPage<PayMailBillList> pageContract(Page<PayMailBillList> page,PayMailBillList payMailBillList) {
return payMailContractMapper.pageContract(page,payMailBillList);
public IPage<PayMailContracrList> pageContract(Page<PayMailContracrList> page, PayMailContracrList payMailContracrList) {
return payMailContractMapper.pageContract(page, payMailContracrList);
}
@Override
public List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper) {
public List<PayMailContracrList> pageContractExcel(QueryWrapper<PayMailContracrList> queryWrapper) {
return payMailContractMapper.pageContractExcel(queryWrapper);
}
@Override
public List<PayMailBillList> pageContractTwo(PayMailBillList payMailBillList) {
return payMailContractMapper.pageContract(payMailBillList);
public List<PayMailContracrList> pageContractTwo(PayMailContracrList payMailContracrList) {
return payMailContractMapper.pageContract(payMailContracrList);
}
@Override
public List<PayMailBillList> getOneExcel(ArrayList<String> strings) {
public List<PayMailContracrList> getOneExcel(ArrayList<String> strings) {
return payMailContractMapper.getOneExcel(strings);
}
@Override
public PayMailBillList checkOne(String id) {
public PayMailContracrList checkOne(String id) {
return payMailContractMapper.checkOne(id);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingController.java
+3 -24
View File
@@ -226,10 +226,6 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
@@ -238,7 +234,7 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -291,25 +287,8 @@ public class CommitteeMeetingController extends JeroController<PayMeeting, IPayM
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.COMMITTEE_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/CommitteeMeetingSituationController.java
+3 -82
View File
@@ -192,89 +192,10 @@ public class CommitteeMeetingSituationController extends JeroController<PayMeeti
@RequiresPermissions("committeeMeetingSituation:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
String meetingId = payMeetingSituation.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
if (!Objects.equals(payMeeting.getMeetingType(),MEETING_TYPE)){
throw new JeroBootException("数据权限不足");
}
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation);
List<Object> exportList = new ArrayList<>();
for (PayMeetingSituation meetingSituation : pageList) {
String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
meetingSituation.setCompanyContactName(contactsManagement.getName());
meetingSituation.setPost(contactsManagement.getPost());
meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
meetingSituation.setCompanyName(companyManagement.getCompanyName());
switch (meetingType) {
case MeetingCommon.STANDARD_MEETING:
//保存数据
StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel();
BeanUtils.copyProperties(meetingSituation, standardsSituationExcel);
exportList.add(standardsSituationExcel);
// 工作组项目查询工作组项目名
break;
case MeetingCommon.WORKING_GROUP_MEETING:
//保存数据
WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel();
BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel);
exportList.add(workingGroupSituationExcel);
break;
case MeetingCommon.INTERNATIONAL_MEETING:
//保存数据
InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel();
BeanUtils.copyProperties(meetingSituation, internationalSituationExcel);
exportList.add(internationalSituationExcel);
break;
case MeetingCommon.OTHER_MEETING:
//保存数据
SituationExcel situationExcel = new SituationExcel();
BeanUtils.copyProperties(meetingSituation, situationExcel);
exportList.add(situationExcel);
break;
case MeetingCommon.COMMITTEE_MEETING:
//保存数据
CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel();
BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
exportList.add(committeeSituationExcel);
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupSituationExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsSituationExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalSituationExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = SituationExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeSituationExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "参会人员信息");
List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
Class<?> aClass = payMeetingSituationService.getaClass(MEETING_TYPE);
return super.exportListXls(objects, aClass, "参会人员信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java
+3 -24
View File
@@ -225,10 +225,6 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
@@ -237,7 +233,7 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -290,25 +286,8 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.INTERNATIONAL_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingController.java
+3 -24
View File
@@ -225,10 +225,6 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
@@ -237,7 +233,7 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -290,25 +286,8 @@ public class OtherMeetingController extends JeroController<PayMeeting, IPayMeeti
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.OTHER_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/OtherMeetingSituationController.java
+3 -78
View File
@@ -178,84 +178,9 @@ public class OtherMeetingSituationController extends JeroController<PayMeetingSi
@RequiresPermissions("otherMeetingSituation:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation);
List<Object> exportList = new ArrayList<>();
for (PayMeetingSituation meetingSituation : pageList) {
String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
meetingSituation.setCompanyContactName(contactsManagement.getName());
meetingSituation.setPost(contactsManagement.getPost());
meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
meetingSituation.setCompanyName(companyManagement.getCompanyName());
switch (meetingType) {
case MeetingCommon.STANDARD_MEETING:
//保存数据
StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel();
BeanUtils.copyProperties(meetingSituation, standardsSituationExcel);
exportList.add(standardsSituationExcel);
// 工作组项目查询工作组项目名
break;
case MeetingCommon.WORKING_GROUP_MEETING:
//保存数据
WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel();
BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel);
exportList.add(workingGroupSituationExcel);
break;
case MeetingCommon.INTERNATIONAL_MEETING:
//保存数据
InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel();
BeanUtils.copyProperties(meetingSituation, internationalSituationExcel);
exportList.add(internationalSituationExcel);
break;
case MeetingCommon.OTHER_MEETING:
//保存数据
SituationExcel situationExcel = new SituationExcel();
BeanUtils.copyProperties(meetingSituation, situationExcel);
exportList.add(situationExcel);
break;
case MeetingCommon.COMMITTEE_MEETING:
//保存数据
CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel();
BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
exportList.add(committeeSituationExcel);
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupSituationExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsSituationExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalSituationExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = SituationExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeSituationExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "参会人员信息");
List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
Class<?> aClass = payMeetingSituationService.getaClass(MEETING_TYPE);
return super.exportListXls(objects, aClass, "参会人员信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingController.java
+3 -24
View File
@@ -252,10 +252,6 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
@@ -264,7 +260,7 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -317,25 +313,8 @@ public class StandardsMeetingController extends JeroController<PayMeeting, IPayM
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.STANDARD_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/StandardsMeetingSituationController.java
+3 -78
View File
@@ -178,84 +178,9 @@ public class StandardsMeetingSituationController extends JeroController<PayMeeti
@RequiresPermissions("standardsMeetingSituation:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation);
List<Object> exportList = new ArrayList<>();
for (PayMeetingSituation meetingSituation : pageList) {
String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
meetingSituation.setCompanyContactName(contactsManagement.getName());
meetingSituation.setPost(contactsManagement.getPost());
meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
meetingSituation.setCompanyName(companyManagement.getCompanyName());
switch (meetingType) {
case MeetingCommon.STANDARD_MEETING:
//保存数据
StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel();
BeanUtils.copyProperties(meetingSituation, standardsSituationExcel);
exportList.add(standardsSituationExcel);
// 工作组项目查询工作组项目名
break;
case MeetingCommon.WORKING_GROUP_MEETING:
//保存数据
WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel();
BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel);
exportList.add(workingGroupSituationExcel);
break;
case MeetingCommon.INTERNATIONAL_MEETING:
//保存数据
InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel();
BeanUtils.copyProperties(meetingSituation, internationalSituationExcel);
exportList.add(internationalSituationExcel);
break;
case MeetingCommon.OTHER_MEETING:
//保存数据
SituationExcel situationExcel = new SituationExcel();
BeanUtils.copyProperties(meetingSituation, situationExcel);
exportList.add(situationExcel);
break;
case MeetingCommon.COMMITTEE_MEETING:
//保存数据
CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel();
BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
exportList.add(committeeSituationExcel);
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupSituationExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsSituationExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalSituationExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = SituationExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeSituationExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "参会人员信息");
List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
Class<?> aClass = payMeetingSituationService.getaClass(MEETING_TYPE);
return super.exportListXls(objects, aClass, "参会人员信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingController.java
+3 -24
View File
@@ -227,10 +227,6 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = pageList.get(0).getMeetingType().toString();
for (PayMeeting meeting : pageList) {
//查询会议负责人
LoginUser user = sysBaseAPI.getUserById(meeting.getDirectorId());
@@ -239,7 +235,7 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
meeting.setDirectorPhone(PasswordUtil.decrypt(user.getPhone()));
PayMeetingVO payMeetingVO = new PayMeetingVO();
BeanUtils.copyProperties(meeting, payMeetingVO);
meetingType = meeting.getMeetingType().toString();
String meetingType = meeting.getMeetingType().toString();
String meetingType1 = sysBaseAPI.translateDict("meeting_type", meetingType);
payMeetingVO.setMeetingType(meetingType1);
payMeetingVO.setHotelContactsList(new ArrayList<>());
@@ -292,25 +288,8 @@ public class WorkGroupMeetingController extends JeroController<PayMeeting, IPayM
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupMeetingExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsMeetingExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalMeetingExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = OtherMeetingExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeMeetingExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "会议管理");
Class<?> aClass = payMeetingService.getaClass(MeetingCommon.WORKING_GROUP_MEETING_INT);
return super.exportListXls(exportList, aClass, "会议管理");
}
/**
jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/WorkGroupMeetingSituationController.java
+3 -78
View File
@@ -178,84 +178,9 @@ public class WorkGroupMeetingSituationController extends JeroController<PayMeeti
@RequiresPermissions("workGroupMeetingSituation:export")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMeetingSituation payMeetingSituation) {
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
List<PayMeetingSituation> pageList = payMeetingSituationService.list(queryWrapper);
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType = payMeetingSituationService.getMeetingType(payMeetingSituation);
List<Object> exportList = new ArrayList<>();
for (PayMeetingSituation meetingSituation : pageList) {
String companyContactId = meetingSituation.getCompanyContactId();
PayContactsManagement contactsManagement = contactsManagementService.getById(companyContactId);
meetingSituation.setCompanyContactName(contactsManagement.getName());
meetingSituation.setPost(contactsManagement.getPost());
meetingSituation.setPhone(PasswordUtil.decrypt(contactsManagement.getPhone()));
meetingSituation.setEmail(PasswordUtil.decrypt(contactsManagement.getEmail()));
PayCompanyManagement companyManagement = companyManagementService.getById(contactsManagement.getCompanyId());
meetingSituation.setCompanyName(companyManagement.getCompanyName());
switch (meetingType) {
case MeetingCommon.STANDARD_MEETING:
//保存数据
StandardsSituationExcel standardsSituationExcel = new StandardsSituationExcel();
BeanUtils.copyProperties(meetingSituation, standardsSituationExcel);
exportList.add(standardsSituationExcel);
// 工作组项目查询工作组项目名
break;
case MeetingCommon.WORKING_GROUP_MEETING:
//保存数据
WorkingGroupSituationExcel workingGroupSituationExcel = new WorkingGroupSituationExcel();
BeanUtils.copyProperties(meetingSituation, workingGroupSituationExcel);
exportList.add(workingGroupSituationExcel);
break;
case MeetingCommon.INTERNATIONAL_MEETING:
//保存数据
InternationalSituationExcel internationalSituationExcel = new InternationalSituationExcel();
BeanUtils.copyProperties(meetingSituation, internationalSituationExcel);
exportList.add(internationalSituationExcel);
break;
case MeetingCommon.OTHER_MEETING:
//保存数据
SituationExcel situationExcel = new SituationExcel();
BeanUtils.copyProperties(meetingSituation, situationExcel);
exportList.add(situationExcel);
break;
case MeetingCommon.COMMITTEE_MEETING:
//保存数据
CommitteeSituationExcel committeeSituationExcel = new CommitteeSituationExcel();
BeanUtils.copyProperties(meetingSituation, committeeSituationExcel);
exportList.add(committeeSituationExcel);
break;
}
}
Class<?> classToExport = null;
switch (meetingType) {
case MeetingCommon.WORKING_GROUP_MEETING:
classToExport = WorkingGroupSituationExcel.class;
break;
case MeetingCommon.STANDARD_MEETING:
classToExport = StandardsSituationExcel.class;
break;
case MeetingCommon.INTERNATIONAL_MEETING:
classToExport = InternationalSituationExcel.class;
break;
case MeetingCommon.OTHER_MEETING:
classToExport = SituationExcel.class;
break;
case MeetingCommon.COMMITTEE_MEETING:
classToExport = CommitteeSituationExcel.class;
break;
}
return super.exportListXls(exportList, classToExport, "参会人员信息");
List<Object> objects = payMeetingSituationService.MeetingSituationGetModelAndView(request, payMeetingSituation,MEETING_TYPE);
Class<?> aClass = payMeetingSituationService.getaClass(MEETING_TYPE);
return super.exportListXls(objects, aClass, "参会人员信息");
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/entity/PayMeeting.java
+3 -3
View File
@@ -163,9 +163,9 @@ public class PayMeeting implements Serializable {
private String meetingContent;
/**报名截止时间*/
@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "报名截止时间")
private java.util.Date registerDeadline;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java
+2
View File
@@ -71,4 +71,6 @@ public interface IPayMeetingService extends IService<PayMeeting> {
IPage<PayMeeting> queryPageList(PayMeeting payMeeting, Integer pageNo, Integer pageSize, HttpServletRequest req);
void uploadFileSendMsg(UploadFileVO uploadFileVO, Integer meetingCommon);
Class<?> getaClass(Integer meetingType);
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java
+17
View File
@@ -692,4 +692,21 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
sendMessageService.SendMessageService(sendMessageDTO);
}
}
@Override
public Class<?> getaClass(Integer meetingType) {
Class<?> classToExport = null;
if (meetingType.equals(MeetingCommon.WORKING_GROUP_MEETING_INT)){
classToExport = WorkingGroupMeetingExcel.class;
}else if (meetingType.equals(MeetingCommon.STANDARD_MEETING_INT)){
classToExport = StandardsMeetingExcel.class;
}else if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING_INT)){
classToExport = InternationalMeetingExcel.class;
}else if (meetingType.equals(MeetingCommon.OTHER_MEETING_INT)){
classToExport = OtherMeetingExcel.class;
}else if (meetingType.equals(MeetingCommon.COMMITTEE_MEETING_INT)){
classToExport = CommitteeMeetingExcel.class;
}
return classToExport;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+37 -21
View File
@@ -1,5 +1,6 @@
package com.jero.meeting.service.impl;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -137,9 +138,12 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
throw new JeroBootException("只有会议负责人可以新增参会人");
if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
if (!Objects.equals(payMeeting1.getDirectorId(),loginUser.getId())) {
throw new JeroBootException("只有会议负责人可以新增参会人");
}
}
payMeetingSituation.setStatus(MeetingSubitemCommon.STATUS_3);
//payMeetingSituation.setNeedInvoice(PayProjectCommon.NO);
payMeetingSituation.setAmountReceivable(new BigDecimal("0"));
@@ -251,7 +255,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
private void saveMeetingSituation(PayMeetingSituation payMeetingSituation1) {
payMeetingSituation1.setCheckIn(PayProjectCommon.NO);
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
payMeetingSituation1.setPaidAmount(new BigDecimal("0"));
//到账
@@ -272,10 +275,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
String meetingId = payMeetingSituation.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
//判断报名时间
Date registerDeadline = payMeeting.getRegisterDeadline();
DateTime registerDeadline = DateUtil.endOfSecond(payMeeting.getRegisterDeadline());
registerDeadline.offset(DateField.SECOND,59);
DateTime date = DateUtil.date();
if ((DateUtil.compare(date, registerDeadline) > 0)) {
throw new JeroBootException("报名截止时间为：" + DateUtil.formatDate(registerDeadline));
throw new JeroBootException("报名截止时间为：" + DateUtil.format(registerDeadline,"yyyy-MM-dd HH:mm"));
}
//会议类型
Integer meetingType = payMeeting.getMeetingType();
@@ -348,6 +352,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//不是汇款或线上缴费
if (!payModeBoolean) {
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG4, "C_OPEN_TYPE4");
}else {
sendMessage(payMeeting, payMeetingSituation, CompanyMessageEnums.MSG3, "C_OPEN_TYPE3");
}
} else {
//不是汇款或线上缴费
@@ -418,8 +424,8 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
extracted(payMeetingSituation, payMeeting);
Integer registerCheckResult = payMeetingSituation.getRegisterCheckResult();
if (registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_0)) {
throw new JeroBootException("报名信息未审核");
if (!registerCheckResult.equals(MeetingSubitemCommon.SIGNUP_STATUS_1)) {
throw new JeroBootException("报名信息未审核通过");
}
String paymentRecord = payMeetingSituation.getPaymentRecord();
if (StrUtil.isBlank(paymentRecord)) {
@@ -470,15 +476,17 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String sysUserId = sysUser.getId();
String meetingType = payMeeting.getMeetingType().toString();
if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)) {
//只有会议负责人，对接人可以审批
if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
throw new JeroBootException("只有会议负责人，对接人可以审批");
}
} else {
//只有会议负责人可以审批
if (!directorId.equals(sysUserId)) {
throw new JeroBootException("只有会议负责人可以审批");
if (!rolePermissionService.getRolePermission("committeeMeetingSituation:add")) {
if (meetingType.equals(MeetingCommon.INTERNATIONAL_MEETING)) {
//只有会议负责人，对接人可以审批
if (!directorId.equals(sysUserId) && !sysUserId.equals(payMeetingSituation.getCompanyContactId())) {
throw new JeroBootException("只有会议负责人，对接人可以审批");
}
} else {
//只有会议负责人可以审批
if (!directorId.equals(sysUserId)) {
throw new JeroBootException("只有会议负责人可以审批");
}
}
}
}
@@ -841,6 +849,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
//要保存的对象
PayMeetingSituation payMeetingSituation1 = new PayMeetingSituation();
payMeetingSituation1.setAmountReceivable(new BigDecimal("0"));
if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
&&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_1);
}
//会议校验基础类
MeetingEntity meetingEntity = new MeetingEntity();
BeanUtils.copyProperties(payMeetingSituation, meetingEntity);
@@ -959,7 +971,10 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
}
}
payMeetingSituation1.setPaymentRecord(paymentRecord);
if (!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_1)
&&!Objects.equals(payMeetingSituation.getCheckResult(),MeetingSubitemCommon.SIGNUP_STATUS_2)) {
payMeetingSituation1.setCheckResult(MeetingSubitemCommon.SIGNUP_STATUS_0);
}
payMeetingSituation1.setOrderCode(orderCode);
payMeetingSituation1.setNeedInvoice(payMeetingSituation.getNeedInvoice());
@@ -1207,6 +1222,11 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
@Override
public List<Object> MeetingSituationGetModelAndView(HttpServletRequest request, PayMeetingSituation payMeetingSituation, Integer meetingType) {
String meetingId = payMeetingSituation.getMeetingId();
PayMeeting payMeeting = meetingService.getById(meetingId);
if (!Objects.equals(payMeeting.getMeetingType(),meetingType)){
throw new JeroBootException("数据权限不足");
}
QueryWrapper<PayMeetingSituation> queryWrapper = QueryGenerator.initQueryWrapper(payMeetingSituation, request.getParameterMap());
String particularYear = request.getParameter("particularYear");
if (StringUtils.isNotBlank(particularYear)){
@@ -1221,9 +1241,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
String meetingType1 = getMeetingType(payMeetingSituation);
List<Object> exportList = new ArrayList<>();
for (PayMeetingSituation meetingSituation : pageList) {
@@ -1274,7 +1291,6 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
return exportList;
}
@Nullable
@Override
public Class<?> getaClass(Integer meetingType) {
Class<?> classToExport = null;
jero-boot-incoming-payment/src/main/java/com/jero/meeting/vo/PayMeetingVO.java
+3 -3
View File
@@ -148,9 +148,9 @@ public class PayMeetingVO implements Serializable {
private String meetingContent;
/**报名截止时间*/
@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@Excel(name = "报名截止时间", width = 20, format = "yyyy-MM-dd HH:mm")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "报名截止时间")
@NotNull(message = "报名截止时间不能为空")
private java.util.Date registerDeadline;
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectController.java
+7 -3
View File
@@ -209,6 +209,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@ApiOperation(value = "会员项目表-编辑", notes = "会员项目表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@Validated @RequestBody PayMemberProject payMemberProject) {
memberProjectService.check(payMemberProject.getId(),"memberProject:edit");
memberProjectService.editById(payMemberProject);
return Result.OK("编辑成功!");
}
@@ -221,6 +222,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@ApiOperation(value = "会员项目表-通过id删除", notes = "会员项目表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
memberProjectService.check(id,"memberProject:delete");
memberProjectService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -233,6 +235,10 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@ApiOperation(value = "会员项目表-批量删除", notes = "会员项目表-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
memberProjectService.check(id,"memberProject:batchDel");
}
this.memberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功!");
}
@@ -244,6 +250,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
@ApiOperation(value = "会员项目表-通过id查询", notes = "会员项目表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
memberProjectService.check(id,"memberProject:search");
PayMemberProject payMemberProject = memberProjectService.queryById(id);
if (payMemberProject == null) {
return Result.error("未找到对应数据");
@@ -269,9 +276,6 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
if (pageList.isEmpty()) {
throw new JeroBootException("没有数据");
}
for (PayMemberProject memberProject : pageList) {
LoginUser user = sysBaseAPI.getUserById(memberProject.getDirectorId());
memberProject.setDirectorName(user.getRealname());
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/PayMemberProjectSubitemController.java
+37 -3
View File
@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.util.NumberUtil;
import com.jero.common.api.vo.Result;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.RolePermissionService;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel;
@@ -19,7 +20,9 @@ import com.jero.common.util.oConvertUtils;
import com.jero.company.entity.PayCompanyManagement;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.member.entity.PayMemberProject;
import com.jero.member.entity.PayMemberProjectSubitem;
import com.jero.member.service.IPayMemberProjectService;
import com.jero.member.service.IPayMemberProjectSubitemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -52,9 +55,13 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@Resource
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource
private IPayMemberProjectService memberProjectService;
@Resource
private IPayContactsManagementService contactsManagementService;
@Resource
private ISysBaseAPI sysBaseAPI;
@Resource
private RolePermissionService rolePermissionService;
/**
* 分页列表查询
@@ -67,8 +74,12 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission("safeguardMember:search")) {
queryWrapper.eq("pmp.director_id",sysUser.getId());
}
Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.getPage(page, queryWrapper);
return Result.OK(pageList);
}
@@ -123,6 +134,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "会员项目成员表-添加", notes = "会员项目成员表-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
memberProjectService.check(payMemberProjectSubitem.getProjectId(),"safeguardMember:add");
ValidUtil.validate(payMemberProjectSubitem);
memberProjectSubitemService.add(payMemberProjectSubitem);
return Result.OK("添加成功！");
@@ -136,6 +148,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "会员项目成员表-编辑", notes = "会员项目成员表-编辑")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
memberProjectSubitemService.check(payMemberProjectSubitem.getId(),"safeguardMember:edit");
ValidUtil.validate(payMemberProjectSubitem);
memberProjectSubitemService.editById(payMemberProjectSubitem);
return Result.OK("编辑成功!");
@@ -149,6 +162,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "会员项目成员表-通过id删除", notes = "会员项目成员表-通过id删除")
@GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) {
memberProjectSubitemService.check(id,"safeguardMember:delete");
memberProjectSubitemService.deleteById(id);
return Result.OK("删除成功!");
}
@@ -161,7 +175,11 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "会员项目成员表-批量删除", notes = "会员项目成员表-批量删除")
@GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
List<String> idList = Arrays.asList(ids.split(","));
for (String id : idList) {
memberProjectSubitemService.check(id,"safeguardMember:batchDel");
}
this.memberProjectSubitemService.deleteByIds(idList);
return Result.OK("批量删除成功!");
}
@@ -172,6 +190,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@ApiOperation(value = "会员项目成员表-通过id查询", notes = "会员项目成员表-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) {
memberProjectSubitemService.check(id,"safeguardMember:search");
PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.queryById(id);
if (payMemberProjectSubitem == null) {
return Result.error("未找到对应数据");
@@ -186,7 +205,21 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
@AutoLog(value = "会员项目成员表-导出数据")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, PayMemberProjectSubitem payMemberProjectSubitem) {
return super.exportXls(request, payMemberProjectSubitem, PayMemberProjectSubitem.class, "会员项目成员表");
QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, request.getParameterMap());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission("safeguardMember:export")) {
queryWrapper.eq("pmp.director_id",sysUser.getId());
}
Page<PayMemberProjectSubitem> page = new Page<>(-1, -1);
IPage<PayMemberProjectSubitem> getPage = memberProjectSubitemService.getPage(page, queryWrapper);
List<PayMemberProjectSubitem> pageList = getPage.getRecords();
// 过滤选中数据
String selections = request.getParameter("selections");
if (oConvertUtils.isNotEmpty(selections)) {
List<String> selectionList = Arrays.asList(selections.split(","));
pageList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
}
return super.exportListXls(pageList, PayMemberProjectSubitem.class, "会员项目成员表");
}
/**
@@ -211,6 +244,7 @@ public class PayMemberProjectSubitemController extends JeroController<PayMemberP
if (StringUtils.isBlank(projectId)) {
throw new JeroBootException("项目id为空");
}
memberProjectService.check(projectId,"safeguardMember:import");
List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);
if (excelData.isEmpty()) {
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/PayMemberProjectSubitemMapper.java
+2
View File
@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
public interface PayMemberProjectSubitemMapper extends BaseMapper<PayMemberProjectSubitem> {
IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<PayMemberProjectSubitem> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/PayMemberProjectSubitemMapper.xml
+5
View File
@@ -39,4 +39,9 @@
left join pay_member_project pmp on pmps.project_id = pmp.id
${ew.customSqlSegment}
</select>
<select id="getPage" resultMap="MemberProjectSubitemResultMap">
select pmps.* from pay_member_project_subitem pmps left join pay_member_project pmp on pmps.project_id = pmp.id
${ew.customSqlSegment}
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectService.java
+2
View File
@@ -83,4 +83,6 @@ public interface IPayMemberProjectService extends IService<PayMemberProject> {
* @Exception
*/
IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page, String companyId, String projectName, String projectType, Integer pack, String packYear);
void check(String projectId, String permission);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+4
View File
@@ -69,4 +69,8 @@ public interface IPayMemberProjectSubitemService extends IService<PayMemberProje
List<PayMemberProjectSubitem> queryList();
IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper);
IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper);
void check(String subitemId, String permission);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectServiceImpl.java
+16
View File
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.RolePermissionService;
import com.jero.common.system.vo.LoginUser;
import com.jero.contract.service.IPayIncomeContractAssociatedService;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.member.entity.PayMemberProject;
@@ -15,9 +17,11 @@ import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.mapper.SysUserMapper;
import org.apache.commons.collections.CollectionUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Objects;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +47,8 @@ public class PayPayMemberProjectServiceImpl extends ServiceImpl<PayMemberProject
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Autowired
private IPayIncomeContractService payIncomeContractService;
@Resource
private RolePermissionService rolePermissionService;
/**
* 保存
*
@@ -153,4 +159,14 @@ public class PayPayMemberProjectServiceImpl extends ServiceImpl<PayMemberProject
public IPage<PayMemberProject> queryListByCompany(Page<PayMemberProject> page, String companyId, String projectName, String projectType, Integer pack, String packYear) {
return payMemberProjectMapper.queryListByCompany(page,companyId, projectName,projectType, pack, packYear);
}
@Override
public void check(String projectId,String permission){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission(permission)) {
PayMemberProject payMemberProject = payMemberProjectMapper.selectById(projectId);
if (!Objects.equals(payMemberProject.getDirectorId(),sysUser.getId())){
throw new JeroBootException("权限不足");
}
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/PayPayMemberProjectSubitemServiceImpl.java
+24
View File
@@ -9,12 +9,15 @@ import com.jero.common.common.ProjectCommon;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.ContractCreateProjectSendMessageService;
import com.jero.common.service.ProjectDetailService;
import com.jero.common.service.RolePermissionService;
import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ValidUtil;
import com.jero.common.vo.ProjectStatusVO;
import com.jero.company.entity.PayContactsManagement;
import com.jero.company.service.IPayContactsManagementService;
import com.jero.contract.entity.PayIncomeContract;
import com.jero.contract.service.IPayIncomeContractService;
import com.jero.member.mapper.PayMemberProjectMapper;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.project.common.PayProjectCommon;
@@ -30,6 +33,7 @@ import com.jero.member.service.IPayMemberProjectSubitemService;
import com.jero.valid.group.ChargeNotice;
import com.jero.valid.group.Contract;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -69,6 +73,10 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
private ContractCreateProjectSendMessageService contractCreateProjectSendMessageService;
@Resource
private IPayMemberProjectSubitemService memberProjectSubitemService;
@Resource
private RolePermissionService rolePermissionService;
@Resource
private PayMemberProjectMapper payMemberProjectMapper;
/**
* 保存
*/
@@ -446,4 +454,20 @@ public class PayPayMemberProjectSubitemServiceImpl extends ServiceImpl<PayMember
public IPage<PayMemberProjectSubitem> queryPageListCompany(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper) {
return baseMapper.queryPageListCompany(page,queryWrapper);
}
@Override
public IPage<PayMemberProjectSubitem> getPage(Page<PayMemberProjectSubitem> page, QueryWrapper<PayMemberProjectSubitem> queryWrapper) {
return baseMapper.getPage(page, queryWrapper);
}
@Override
public void check(String subitemId,String permission){
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!rolePermissionService.getRolePermission(permission)) {
PayMemberProjectSubitem payMemberProjectSubitem = baseMapper.selectById(subitemId);
PayMemberProject payMemberProject = payMemberProjectMapper.selectById(payMemberProjectSubitem.getProjectId());
if (!Objects.equals(payMemberProject.getDirectorId(),sysUser.getId())){
throw new JeroBootException("权限不足");
}
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayCommonProjectMapper.xml
-1
View File
@@ -80,7 +80,6 @@
LEFT JOIN pay_pack_company ppc ON ppc.id = ppcp.pack_id
LEFT JOIN pay_income_contract_associated pica ON pica.project_id = pcp.id
${ew.customSqlSegment}
AND ( ppc.id IS NULL OR ppc.id = '' )
AND ( pica.id IS NULL OR pica.id = '' )
<if test="pack == 1 and packYear != '' and packYear != null">
AND (ppc.pack_year=#{packYear} or ppc.pack_year is null or ppc.pack_year = '')
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/AllProjectStatisticsController.java
+15 -14
View File
@@ -89,8 +89,7 @@ public class AllProjectStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -98,8 +97,9 @@ public class AllProjectStatisticsController {
} else {
return Result.OK();
}
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, idList );
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageList(page,allProjectStatisticsSearch, listNew );
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
@@ -160,8 +160,7 @@ public class AllProjectStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -170,7 +169,8 @@ public class AllProjectStatisticsController {
return Result.OK();
}
Page<AllProjectStatistics> page = new Page<>(pageNo, pageSize);
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
IPage<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListForProject(page,allProjectStatisticsSearch,listNew);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
@@ -229,8 +229,7 @@ public class AllProjectStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -244,7 +243,8 @@ public class AllProjectStatisticsController {
String year = String.valueOf(calendar.get(Calendar.YEAR));
allProjectStatisticsSearch.setYear(year);
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, listNew);
if (pageList != null) {
for (AllProjectStatistics s : pageList) {
String key = String.valueOf(s.getChargeUse());
@@ -270,7 +270,7 @@ public class AllProjectStatisticsController {
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -285,7 +285,8 @@ public class AllProjectStatisticsController {
String year = String.valueOf(calendar.get(Calendar.YEAR));
allProjectStatisticsSearch.setYear(year);
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList,strings);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, listNew,strings);
if (pageList != null) {
for (AllProjectStatistics s : pageList) {
String key = String.valueOf(s.getChargeUse());
@@ -320,8 +321,7 @@ public class AllProjectStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -330,7 +330,8 @@ public class AllProjectStatisticsController {
ArrayList<AllProjectStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, AllProjectStatistics.class, "企业来款统计");
}
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<AllProjectStatistics> pageList = payWorkingGroupService.queryPageListExcel(allProjectStatisticsSearch, listNew);
if (pageList != null) {
for (AllProjectStatistics s : pageList) {
String key = String.valueOf(s.getChargeUse());
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java
+12 -12
View File
@@ -76,8 +76,7 @@ public class CompanyComeMoneyStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
@@ -87,7 +86,8 @@ public class CompanyComeMoneyStatisticsController {
return Result.OK();
}
Page<CompanyComeMoneyList> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
IPage<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompany(page,companyComeMoneySearch,listNew);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
@@ -140,8 +140,7 @@ public class CompanyComeMoneyStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
@@ -151,7 +150,8 @@ public class CompanyComeMoneyStatisticsController {
return Result.OK();
}
Page<CompanyComeMoneyDetail> page = new Page<>(pageNo, pageSize);
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
IPage<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetail(page, companyComeMoneyDetailSearch,listNew);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
@@ -203,8 +203,7 @@ public class CompanyComeMoneyStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -213,7 +212,8 @@ public class CompanyComeMoneyStatisticsController {
ArrayList<CompanyComeMoneyList> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyList.class, "企业来款统计");
}
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<CompanyComeMoneyList> pageList = payWorkingGroupService.queryPageListForCompanyExcel(companyComeMoneySearch, listNew);
return AmountUtil.exportListXls(pageList, CompanyComeMoneyList.class, "企业来款统计");
@@ -238,8 +238,7 @@ public class CompanyComeMoneyStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -248,7 +247,8 @@ public class CompanyComeMoneyStatisticsController {
ArrayList<CompanyComeMoneyDetail> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, CompanyComeMoneyDetail.class, "企业来款详情统计");
}
List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<CompanyComeMoneyDetail> pageList = payWorkingGroupService.queryPageListForCompanyDetailExcel(companyComeMoneyDetailSearch, listNew);
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
+9 -11
View File
@@ -52,8 +52,6 @@ import java.util.stream.Collectors;
@RequestMapping("/project/payWorkingGroupStatistics")
@Slf4j
public class PayWorkingGroupStatisticsController {
@Resource
private SysUserMapper userMapper;
@Autowired
private ISysBaseAPI sysBaseAPI;
@Autowired
@@ -89,8 +87,7 @@ public class PayWorkingGroupStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -98,7 +95,8 @@ public class PayWorkingGroupStatisticsController {
} else {
return Result.OK();
}
IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
IPage<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatistics(page, payWorkingGroupSearch,listNew);
List<PayWorkingGroupStatistics> records = pageList.getRecords();
for (PayWorkingGroupStatistics payWorkingGroupStatistics:records){
if(payWorkingGroupStatistics.getComeAllMoney()==null||payWorkingGroupStatistics.getComeAllMoney()==""){
@@ -155,8 +153,7 @@ public class PayWorkingGroupStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -165,7 +162,8 @@ public class PayWorkingGroupStatisticsController {
ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, listNew);
//处理为空数据为0
for (PayWorkingGroupStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
@@ -193,8 +191,7 @@ public class PayWorkingGroupStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
String userId = sysUser.getId();
@@ -203,7 +200,8 @@ public class PayWorkingGroupStatisticsController {
ArrayList<PayWorkingGroupStatistics> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PayWorkingGroupStatistics.class, "工作组项目统计");
}
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, idList,strings);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<PayWorkingGroupStatistics> pageList = payWorkingGroupService.queryPageListForStatisticsExcel(payWorkingGroupSearch, listNew,strings);
//处理为空数据为0
for (PayWorkingGroupStatistics s : pageList) {
if (s.getAllMoney() == null || s.getAllMoney().equals("")) {
jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/PrincipalPeopleStatisticsController.java
+6 -11
View File
@@ -69,11 +69,6 @@ public class PrincipalPeopleStatisticsController {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
// if (principalPeopleSearch.getYear() == null || principalPeopleSearch.getYear().equals("")) {
// Calendar calendar = Calendar.getInstance();
// String year = String.valueOf(calendar.get(Calendar.YEAR));
// principalPeopleSearch.setYear(year);
// }
//根据不同角色加载不同列表的参数
List<String> idList = new ArrayList<>();
//判断登录角色，显示特定内容，判断依据为登录用户的角色和机构编码
@@ -85,8 +80,7 @@ public class PrincipalPeopleStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
@@ -97,7 +91,8 @@ public class PrincipalPeopleStatisticsController {
}
Page<PrincipalPeopleList> page = new Page<>(pageNo, pageSize);
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
IPage<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipal(page,principalPeopleSearch,listNew);
HashMap<String, Object> hashMap = new HashMap<>();
double sum=0;
double sumTwo =0;
@@ -198,8 +193,7 @@ public class PrincipalPeopleStatisticsController {
idList = null;
//部门负责人
} else if (roleCodes.contains(constant.BMFZR)||roleCodes.contains(constant.SLD)) {
String departIds = sysUser.getDepartIds();
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(departIds);
List<String> allDepartIds = sysBaseAPI.getAllDepartIds(sysUser.getDepartIds(),sysUser.getOrgCode(),idList);
idList.addAll(allDepartIds);
//项目负责人
} else if (roleCodes.contains(constant.XMFZR)) {
@@ -209,7 +203,8 @@ public class PrincipalPeopleStatisticsController {
ArrayList<PrincipalPeopleList> objects = new ArrayList<>();
return AmountUtil.exportListXls(objects, PrincipalPeopleList.class, "个人来款");
}
List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, idList);
List<String> listNew = new ArrayList<>(new TreeSet<>(idList));
List<PrincipalPeopleList> pageList = payWorkingGroupService.queryPageListForPrincipalExcel(principalPeopleSearch, listNew);
return AmountUtil.exportListXls(pageList, PrincipalPeopleList.class, "个人来款");
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/CommonController.java
+9 -2
View File
@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
import com.jero.common.api.vo.Result;
import com.jero.common.constant.CommonConstant;
import com.jero.common.system.api.ISysBaseAPI;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -170,7 +171,10 @@ public class CommonController {
response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1"));
response.setContentType("application/force-download");// 设置强制下载不打开
if (type == null) {
if (fileName.contains(".jpg") || fileName.contains(".png") || fileName.contains(".gif") || fileName.contains(".jpeg")) {
fileName = StringUtils.lowerCase(fileName);
if (fileName.contains(".jpg") || fileName.contains(".gif") || fileName.contains(".jpeg")) {
response.setContentType("image/jpeg;image/jpg;image/gif;image/png");
} else if (fileName.contains(".png")) {
response.setContentType("image/png;image/jpg;image/gif;image/jpeg");
}
}
@@ -279,7 +283,10 @@ public class CommonController {
response.addHeader("Content-Disposition", "attachment;fileName=" + new String(fileName.getBytes("UTF-8"),"iso-8859-1"));
response.setContentType("application/force-download");// 设置强制下载不打开
if (type == null) {
if (fileName.contains(".jpg") || fileName.contains(".png") || fileName.contains(".gif") || fileName.contains(".jpeg")) {
fileName = StringUtils.lowerCase(fileName);
if (fileName.contains(".jpg") || fileName.contains(".gif") || fileName.contains(".jpeg")) {
response.setContentType("image/jpeg;image/jpg;image/gif;image/png");
} else if (fileName.contains(".png")) {
response.setContentType("image/png;image/jpg;image/gif;image/jpeg");
}
}
jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java
+1 -1
View File
@@ -404,7 +404,7 @@ public class SysDepartController {
//导入Excel格式校验，看匹配的字段文本概率
Boolean t = ExcelImportCheckUtil.check(file.getInputStream(), SysDepartExcel.class, params,1.0);
if(!t){
return Result.error("文件格式有误！");
return Result.error("表头有误！");
}
try {
// orgCode编码长度
jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java
+14 -10
View File
@@ -103,6 +103,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
private ISysPermissionDataRuleService sysPermissionDataRuleService;
@Resource
private HuaWeiSmsUtil huaWeiSmsUtil;
@Override
// @Cacheable(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
@CacheEvict(cacheNames=CacheConstant.SYS_USERS_CACHE, key="#username")
@@ -1066,17 +1067,20 @@ public class SysBaseApiImpl implements ISysBaseAPI {
}
@Override
public List<String> getAllDepartIds(String departId) {
List<String> ids = new ArrayList<>();
//获取子部门全部成员(不包含本部门)
public List<String> getAllDepartIds(String departId,String orgcode,List<String> idList) {
//获取子部门全部成员(不包含本部门),会有重复id被加入ids
List<SysDepartTreeModel> sysDepartTreeModels =listSonDepartsByDepId(departId);
for(SysDepartTreeModel s:sysDepartTreeModels) {
ids.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
}
//获取本部门成员
ids.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", departId))).stream().map(SysUser::getId).collect(Collectors.toList()));
if(!(sysDepartTreeModels.size()==0)) {
for (SysDepartTreeModel s : sysDepartTreeModels) {
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", s.getOrgCode()))).stream().map(SysUser::getId).collect(Collectors.toList()));
getAllDepartIds(s.getId(),s.getOrgCode(),idList);
}
//获取本部门成员
idList.addAll((userMapper.selectList(new QueryWrapper<SysUser>().eq("status", 1).eq("del_flag", 0).eq("org_code", orgcode))).stream().map(SysUser::getId).collect(Collectors.toList()));
return ids;
return idList;
}
return idList;
}
@Override
@@ -1103,7 +1107,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
/**
* 42根据部门id查询部门所有的子级(不包含自己)
* 42根据部门id查询部门所有的子级(不包含自己)且不包含下级的下级
* @author 马志朝
* @date 2021/3/24 8:54
* @param departId 部门id