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

全所统计

Browse Source
This commit is contained in:
zhangqinlin
2021-09-27 16:44:05 +08:00
parent fd420bdf77
commit 1ecd1f78a8
9 changed files with 183 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailBillController.java
+36 -3
View File
@@ -309,10 +309,43 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
*/
@ApiOperation(value="邮寄票据-导出", notes="邮寄票据-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(@RequestParam(name = "ids",required = false) String ids) {
public ModelAndView exportXls(
PayMailBillSearch payMailBillSearch,
@RequestParam(name = "ids",required = false) String ids
) {
if(StringUtils.isBlank(ids)){
QueryWrapper<PayMailBill> queryWrapper = Wrappers.query();
List<PayMailBill> pageList = payMailBillService.list(queryWrapper);
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
Calendar calendar= Calendar.getInstance();
calendar.setTime(payMailBillSearch.getEndTime());
calendar.add(Calendar.HOUR,23);//时
calendar.add(Calendar.MINUTE,59);//时
calendar.add(Calendar.SECOND,59);//秒
queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
queryWrapper.le("send_date", calendar.getTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime())){
queryWrapper.ge("send_date", payMailBillSearch.getStartTime());
}else if (ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())){
Calendar calendar= Calendar.getInstance();
calendar.setTime(payMailBillSearch.getEndTime());
calendar.add(Calendar.HOUR,23);//时
calendar.add(Calendar.MINUTE,59);//时
calendar.add(Calendar.SECOND,59);//秒
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
}
List<PayMailBill> pageList = payMailBillService.pageListTwo(queryWrapper);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+90 -72
View File
@@ -1,11 +1,10 @@
package com.jero.mail.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Objects;
import java.util.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
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;
@@ -19,6 +18,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
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.PayMailContract;
import com.jero.mail.service.IPayMailContractService;
@@ -45,49 +45,47 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping("/payMailContract/payMailContract")
@Slf4j
public class PayMailContractController extends JeroController<PayMailContract, IPayMailContractService> {
@Resource
private IPayMailContractService payMailContractService;
@Resource
private IPayIncomeContractService payIncomeContractService;
@Resource
private SendMessageService sendMessageService;
/**
* 邮寄合同-分页列表查询
*
*/
@AutoLog(value = "邮寄合同-分页列表查询")
@ApiOperation(value="邮寄合同-分页列表查询", notes="邮寄合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList( PayMailBillList payMailBillList,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMailBillList> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap());
Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
queryWrapper.orderByAsc("post_status");
queryWrapper.orderByDesc("pc.create_time");
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
return Result.OK(pageList);
}
@Resource
private IPayMailContractService payMailContractService;
@Resource
private IPayIncomeContractService payIncomeContractService;
@Resource
private SendMessageService sendMessageService;
/**
* 邮寄合同-分页列表查询
*/
@AutoLog(value = "邮寄合同-分页列表查询")
@ApiOperation(value = "邮寄合同-分页列表查询", notes = "邮寄合同-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(PayMailBillList payMailBillList,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<PayMailBillList> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap());
Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
queryWrapper.orderByAsc("post_status");
queryWrapper.orderByDesc("pc.create_time");
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
return Result.OK(pageList);
}
/**
* 邮寄合同-编辑（邮寄和修改按钮统一接口）
*
* 邮寄合同-编辑（邮寄和修改按钮统一接口）
*/
@ApiOperation(value="邮寄合同-编辑（邮寄和修改按钮统一接口）", notes="邮寄合同-编辑（邮寄和修改按钮统一接口）")
@ApiOperation(value = "邮寄合同-编辑（邮寄和修改按钮统一接口）", notes = "邮寄合同-编辑（邮寄和修改按钮统一接口）")
@PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayMailContract payMailContract
) {
@@ -95,21 +93,21 @@ public class PayMailContractController extends JeroController<PayMailContract, I
payMailContract.setPostStatus(1);
payMailContractService.updateById(payMailContract);
if(!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)){
if (!Objects.isNull(payMailContractData) && Objects.equals(payMailContractData.getPostStatus(), ProjectCommon.POST_STATUS0)) {
PayIncomeContract payIncomeContract = payIncomeContractService.getById(payMailContractData.getContractId());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
// 发送消息
SendMessageDTO sendMessageDTO = new SendMessageDTO();
if(!StringUtils.isBlank(payMailContractData.getEmail())){
if (!StringUtils.isBlank(payMailContractData.getEmail())) {
sendMessageDTO.setEmail(PasswordUtil.decrypt(payMailContractData.getEmail()));
}
if(!StringUtils.isBlank(payMailContractData.getMobile())){
if (!StringUtils.isBlank(payMailContractData.getMobile())) {
sendMessageDTO.setToUser(PasswordUtil.decrypt(payMailContractData.getMobile()));
sendMessageDTO.setPhone(PasswordUtil.decrypt(payMailContractData.getMobile()));
}
HashMap<String,String> map = new HashMap<>();
if(Objects.isNull(payIncomeContract)){
map.put("contractName",payIncomeContract.getContractName());
HashMap<String, String> map = new HashMap<>();
if (Objects.isNull(payIncomeContract)) {
map.put("contractName", payIncomeContract.getContractName());
}
sendMessageDTO.setFromUser(sysUser.getUsername());
sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG10.getCode());
@@ -119,7 +117,7 @@ public class PayMailContractController extends JeroController<PayMailContract, I
}
return Result.OK("操作成功!");
}
// /**
// * 通过id删除
// *
@@ -165,29 +163,49 @@ public class PayMailContractController extends JeroController<PayMailContract, I
// return Result.OK(payMailContract);
// }
/**
* 导出excel
*
*/
@AutoLog(value = "邮寄合同-导出")
@ApiOperation(value="邮寄合同-导出", notes="邮寄合同-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls() {
QueryWrapper<PayMailBillList> queryWrapper = new QueryWrapper<>();
List<PayMailBillList> pageList = payMailContractService.pageContractExcel(queryWrapper);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
return AmountUtil.exportListXls(pageList,PayMailBillList.class,"邮寄合同");
}
/**
* 导出excel
*/
@AutoLog(value = "邮寄合同-导出")
@ApiOperation(value = "邮寄合同-导出", notes = "邮寄合同-导出")
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids,HttpServletRequest req) {
if (StringUtils.isBlank(ids)) {
QueryWrapper<PayMailBillList> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillList, req.getParameterMap());
queryWrapper.orderByAsc("post_status");
queryWrapper.orderByDesc("pc.create_time");
List<PayMailBillList> pageList = payMailContractService.pageContractTwo(queryWrapper);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
return AmountUtil.exportListXls(pageList, PayMailBillList.class, "邮寄合同");
} else {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
List<PayMailBillList> list = payMailContractService.getOneExcel(strings);
if (!CollectionUtils.isEmpty(list)) {
try {
list.forEach(p -> {
if (!org.apache.commons.lang3.StringUtils.isBlank(p.getMobile())) {
p.setMobile(PasswordUtil.decrypt(p.getMobile()));
}
});
} catch (Exception e) {
log.error("手机号解密异常！", e);
}
}
return AmountUtil.exportListXls(list, PayMailBillList.class, "邮寄合同");
}
}
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
+3
View File
@@ -51,4 +51,7 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
*/
IPage<PayMailBill> pageList(Page<PayMailBill> page, @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper<PayMailBill> queryWrapper);
List<PayMailBill> pageList( @org.apache.ibatis.annotations.Param(Constants.WRAPPER) QueryWrapper<PayMailBill> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java
+5
View File
@@ -10,6 +10,7 @@ import com.jero.mail.entity.PayMailBillList;
import com.jero.mail.entity.PayMailContract;
import org.apache.ibatis.annotations.Param;
import java.util.ArrayList;
import java.util.List;
/**
@@ -22,6 +23,10 @@ public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, @Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContract( @Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> getOneExcel(@Param("strings") ArrayList<String> strings);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+25
View File
@@ -35,4 +35,29 @@ pic.principal_name as principalName,
pic.contract_amount as contractAmount FROM pay_mail_contract as pc left join pay_income_contract as pic on(pc.contract_id=pic.id)
${ew.customSqlSegment}
</select>
<select id="getOneExcel" resultType="com.jero.mail.entity.PayMailBillList">
SELECT
pc.id,
pc.post_status as postStatus,
pc.send_method as sendMethod,
pc.post_no as postNo,
pc.liaison_man as liaisonMan,
pc.mobile,
pic.contract_num as contractNum,
pic.contract_name as contractName,
pic.signed_company_temporary_name as signedCompanyTemporaryName,
pic.principal_name as principalName,
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="strings != null and strings != ''">
pc.id in
<foreach item="item" open="(" separator="," close=")" collection="strings">
#{item}
</foreach>
</if>
</where>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+3
View File
@@ -72,4 +72,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
*/
IPage<PayMailBill> pageList(Page<PayMailBill> page, QueryWrapper<PayMailBill> queryWrapper);
List<PayMailBill> pageListTwo(QueryWrapper<PayMailBill> queryWrapper);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+5
View File
@@ -11,6 +11,7 @@ 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;
/**
@@ -26,4 +27,8 @@ public interface IPayMailContractService extends IService<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContractTwo(QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> getOneExcel(ArrayList<String> strings);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+5
View File
@@ -258,6 +258,11 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
return payMailBillMapper.pageList(page,queryWrapper);
}
@Override
public List<PayMailBill> pageListTwo(QueryWrapper<PayMailBill> queryWrapper) {
return payMailBillMapper.pageList(queryWrapper);
}
//校验不同项目是否属于同一个公司
private String checkCompanyProject(List<PayMailBillProject> bmpList) {
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java
+11
View File
@@ -11,6 +11,7 @@ import com.jero.mail.service.IPayMailContractService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -35,4 +36,14 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
public List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper) {
return payMailContractMapper.pageContractExcel(queryWrapper);
}
@Override
public List<PayMailBillList> pageContractTwo(QueryWrapper<PayMailBillList> queryWrapper) {
return payMailContractMapper.pageContract(queryWrapper);
}
@Override
public List<PayMailBillList> getOneExcel(ArrayList<String> strings) {
return payMailContractMapper.getOneExcel(strings);
}
}