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

修改搜索%bug

Browse Source
This commit is contained in:
zhangqinlin
2021-10-13 09:06:19 +08:00
parent 2ca83cd686
commit af9f017752
10 changed files with 179 additions and 71 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
+69 -47
View File
@@ -22,6 +22,7 @@ import com.jero.common.service.SendMessageService;
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.constant;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
@@ -82,7 +83,53 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@Resource
private SendMessageService sendMessageService;
/**
// /**
// * 分页列表查询
// *
// * @param payMailBillSearch
// * @param pageNo
// * @param pageSize
// * @param
// * @return
// */
// @ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
// @GetMapping(value = "/list")
// public Result<?> queryPageList( PayMailBillSearch payMailBillSearch,
// @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
// @RequestParam(name="pageSize", defaultValue="10") Integer pageSize
// ) {
//// QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
// Page<PayMailBill> page = new Page<>(pageNo, pageSize);
// if(ObjectUtils.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);//秒
// payMailBillSearch.setEndTime(calendar.getTime());
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
// payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
// }
// if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
// payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
// }
// IPage<PayMailBill> pageList = payMailBillService.pageLists(page, payMailBillSearch);
// if (!CollectionUtils.isEmpty(pageList.getRecords())) {
// try {
// pageList.getRecords().forEach(p -> {
// if (!org.apache.commons.lang3.StringUtils.isBlank(p.getContactMobile())) {
// p.setContactMobile(PasswordUtil.decrypt(p.getContactMobile()));
// }
// });
// } catch (Exception e) {
// log.error("手机号解密异常！", e);
// }
// }
// return Result.OK(pageList);
// }
/**
* 分页列表查询
*
* @param payMailBillSearch
@@ -94,9 +141,9 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@ApiOperation(value="邮寄票据-分页列表查询", notes="邮寄票据-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList( PayMailBillSearch payMailBillSearch,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize
) {
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
Page<PayMailBill> page = new Page<>(pageNo, pageSize);
@@ -121,15 +168,13 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
queryWrapper.le("send_date", calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
//queryWrapper.apply("charge_company_name"+"like{0}"+"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName())+"%","escape '/'");
queryWrapper.like("charge_company_name", SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
queryWrapper.like("charge_company_name", oConvertUtils.replaceAllPercent(payMailBillSearch.getChargeCompanyName()));
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.eq("principal_id",payMailBillSearch.getPrincipalId());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
//queryWrapper.apply("project_name"+" like{0}" +"{1}","%"+SearchUtil.exchenge(payMailBillSearch.getProjectName())+"%"+"escape '/'");
queryWrapper.like("project_name",SearchUtil.exchenge(payMailBillSearch.getProjectName()));
queryWrapper.like("project_name",oConvertUtils.replaceAllPercent(payMailBillSearch.getProjectName()));
}
IPage<PayMailBill> pageList = payMailBillService.pageList(page, queryWrapper);
@@ -149,8 +194,6 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
/**
* 邮寄合同-修改
*
@@ -314,41 +357,23 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
@GetMapping(value = "/exportXls")
public ModelAndView exportXls(
PayMailBillSearch payMailBillSearch,
@RequestParam(name = "ids",required = false) String ids
) {
@RequestParam(name = "ids",required = false) String ids) {
if(StringUtils.isBlank(ids)){
QueryWrapper<PayMailBill> queryWrapper = new QueryWrapper<>();
if (ObjectUtil.isNotEmpty(payMailBillSearch.getStartTime()) && ObjectUtil.isNotEmpty(payMailBillSearch.getEndTime())) {
Calendar calendar= Calendar.getInstance();
if(ObjectUtils.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());
calendar.add(Calendar.HOUR, 23);//时
calendar.add(Calendar.MINUTE, 59);//时
calendar.add(Calendar.SECOND, 59);//秒
payMailBillSearch.setEndTime(calendar.getTime());
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getChargeCompanyName())){
queryWrapper.like("charge_company_name",payMailBillSearch.getChargeCompanyName());
if(ObjectUtils.isNotEmpty(payMailBillSearch.getChargeCompanyName())) {
payMailBillSearch.setChargeCompanyName(SearchUtil.exchenge(payMailBillSearch.getChargeCompanyName()));
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getPrincipalId())){
queryWrapper.like("principal_id",payMailBillSearch.getPrincipalId());
if(ObjectUtils.isNotEmpty(payMailBillSearch.getProjectName())) {
payMailBillSearch.setProjectName(SearchUtil.exchenge(payMailBillSearch.getProjectName()));
}
if (ObjectUtil.isNotEmpty(payMailBillSearch.getProjectName())){
queryWrapper.like("project_name",payMailBillSearch.getProjectName());
}
List<PayMailBill> pageList = payMailBillService.pageListTwo(queryWrapper);
List<PayMailBill> pageList = payMailBillService.pageListTwo(payMailBillSearch);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
@@ -363,13 +388,10 @@ public class PayMailBillController extends JeroController<PayMailBill, IPayMailB
return AmountUtil.exportListXls(pageList,PayMailBill.class,"邮寄票据");
}else {
ArrayList<String> strings = new ArrayList<>(Arrays.asList(ids.split(",")));
ArrayList<PayMailBill> list = new ArrayList<>();
for (String id : strings) {
LambdaQueryWrapper<PayMailBill> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
objectLambdaQueryWrapper.eq(StringUtils.isNotBlank(ids), PayMailBill::getId, id);
PayMailBill one = payMailBillService.getOne(objectLambdaQueryWrapper, false);
list.add(one);
}
List<PayMailBill> list = payMailBillService.listByIds(strings);
if (!CollectionUtils.isEmpty(list)) {
try {
list.forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/mail/controller/PayMailContractController.java
+12 -11
View File
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.util.AmountUtil;
import com.jero.util.SearchUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -60,13 +61,13 @@ public class PayMailContractController extends JeroController<PayMailContract, I
@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());
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize
) {
payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
Page<PayMailBillList> page = new Page<>(pageNo, pageSize);
queryWrapper.orderByAsc("post_status");
queryWrapper.orderByDesc("pc.create_time");
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page, queryWrapper);
IPage<PayMailBillList> pageList = payMailContractService.pageContract(page,payMailBillList);
if (!CollectionUtils.isEmpty(pageList.getRecords())) {
try {
pageList.getRecords().forEach(p -> {
@@ -188,12 +189,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,HttpServletRequest req) {
public ModelAndView exportXls(PayMailBillList payMailBillList, @RequestParam(name = "ids", required = false) String ids) {
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);
payMailBillList.setContractName(SearchUtil.exchenge(payMailBillList.getContractName()));
payMailBillList.setContractNum(SearchUtil.exchenge(payMailBillList.getContractNum()));
payMailBillList.setSignedCompanyTemporaryName(SearchUtil.exchenge(payMailBillList.getSignedCompanyTemporaryName()));
List<PayMailBillList> pageList = payMailContractService.pageContractTwo(payMailBillList);
if (!CollectionUtils.isEmpty(pageList)) {
try {
pageList.forEach(p -> {
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailBillMapper.java
+4 -1
View File
@@ -53,7 +53,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);
List<PayMailBill> pageListss(@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch);
/**
* @Description 获取更用户相关的项目id
@@ -65,4 +65,7 @@ public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
* @Exception
*/
List<String> getCompanyCommonProject(@Param("projectType") String projectType,@Param("userId") String userId);
IPage<PayMailBill> pageLists(Page<PayMailBill> page,@Param("payMailBillSearch") PayMailBillSearch payMailBillSearch);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/PayMailContractMapper.java
+2 -2
View File
@@ -21,9 +21,9 @@ import java.util.List;
*/
public interface PayMailContractMapper extends BaseMapper<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, @Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, @Param("payMailBillList") PayMailBillList payMailBillList);
List<PayMailBillList> pageContract( @Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContract(@Param("payMailBillList") PayMailBillList payMailBillList);
List<PayMailBillList> pageContractExcel(@Param(Constants.WRAPPER) QueryWrapper<PayMailBillList> queryWrapper);
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailBillMapper.xml
+59
View File
@@ -61,4 +61,63 @@ on(pmb.id=pmbp.bill_id)
group by pmb.id ORDER BY post_status ASC,create_time DESC
</select>
<select id="getCompanyCommonProject" resultType="java.lang.String"></select>
<select id="pageLists" resultType="com.jero.mail.entity.PayMailBill">
select * from pay_mail_bill pmb
<where>
<if test="payMailBillSearch.chargeCompanyName!='' and payMailBillSearch.chargeCompanyName!= null">
pmb.charge_company_name like concat('%',concat(#{payMailBillSearch.chargeCompanyName},'%')) escape '/'
</if>
<if test="payMailBillSearch.projectName!='' and payMailBillSearch.projectName!= null">
and pmb.project_name like concat('%',concat(#{payMailBillSearch.projectName},'%')) escape '/'
</if>
<if test="payMailBillSearch.principalId!='' and payMailBillSearch.principalId!= null">
and pmb.principal_id =#{payMailBillSearch.principalId}
</if>
<choose>
<when test="payMailBillSearch.startTime != null and payMailBillSearch.endTime != null">
AND pmb.send_date >= #{payMailBillSearch.startTime} and pmb.send_date <![CDATA[<]]>= #{payMailBillSearch.endTime}
</when>
<otherwise>
<if test="payMailBillSearch.startTime != null ">
AND pmb.send_date >= #{payMailBillSearch.startTime}
</if>
<if test="payMailBillSearch.endTime != null ">
AND pmb.send_date <![CDATA[<]]>= #{payMailBillSearch.endTime}
</if>
</otherwise>
</choose>
</where>
</select>
<select id="pageListss" resultType="com.jero.mail.entity.PayMailBill">
select * from pay_mail_bill pmb
<where>
<if test="payMailBillSearch.chargeCompanyName!='' and payMailBillSearch.chargeCompanyName!= null">
pmb.charge_company_name like concat('%',concat(#{payMailBillSearch.chargeCompanyName},'%')) escape '/'
</if>
<if test="payMailBillSearch.projectName!='' and payMailBillSearch.projectName!= null">
and pmb.project_name like concat('%',concat(#{payMailBillSearch.projectName},'%')) escape '/'
</if>
<if test="payMailBillSearch.principalId!='' and payMailBillSearch.principalId!= null">
and pmb.principal_id =#{payMailBillSearch.principalId}
</if>
<choose>
<when test="payMailBillSearch.startTime != null and payMailBillSearch.endTime != null">
AND pmb.send_date >= #{payMailBillSearch.startTime} and pmb.send_date <![CDATA[<]]>= #{payMailBillSearch.endTime}
</when>
<otherwise>
<if test="payMailBillSearch.startTime != null ">
AND pmb.send_date >= #{payMailBillSearch.startTime}
</if>
<if test="payMailBillSearch.endTime != null ">
AND pmb.send_date <![CDATA[<]]>= #{payMailBillSearch.endTime}
</if>
</otherwise>
</choose>
</where>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/mail/mapper/xml/PayMailContractMapper.xml
+15 -1
View File
@@ -18,7 +18,21 @@ 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) left join pay_company_management pcm
on(pic.signed_company_id=pcm.id)
${ew.customSqlSegment}
<where>
<if test="payMailBillList.contractNum !='' and payMailBillList.contractNum !=null">
pic.contract_num like concat('%',concat(#{payMailBillList.contractNum},'%')) escape '/'
</if>
<if test="payMailBillList.contractName !='' and payMailBillList.contractName !=null">
pic.contract_name like concat('%',concat(#{payMailBillList.contractName},'%')) escape '/'
</if>
<if test="payMailBillList.signedCompanyTemporaryName !='' and payMailBillList.signedCompanyTemporaryName !=null">
pcm.company_name like concat('%',concat(#{payMailBillList.signedCompanyTemporaryName},'%')) escape '/'
</if>
<if test="payMailBillList.principalId !='' and payMailBillList.principalId !=null">
pic.principal_id = #{payMailBillList.principalId}
</if>
</where>
order by post_status ASC , pc.create_time DESC
</select>
<select id="checkOne" resultType="com.jero.mail.entity.PayMailBillList">
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+4 -1
View File
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.common.api.vo.Result;
import com.jero.mail.PayMailBillVO;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.payment.entity.PayPaymentRecord;
import java.util.List;
@@ -82,5 +83,7 @@ public interface IPayMailBillService extends IService<PayMailBill> {
IPage<PayMailBill> pageList(Page<PayMailBill> page, QueryWrapper<PayMailBill> queryWrapper);
List<PayMailBill> pageListTwo(QueryWrapper<PayMailBill> queryWrapper);
List<PayMailBill> pageListTwo(PayMailBillSearch payMailBillSearch);
IPage<PayMailBill> pageLists(Page<PayMailBill> page, PayMailBillSearch payMailBillSearch);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailContractService.java
+2 -2
View File
@@ -24,11 +24,11 @@ public interface IPayMailContractService extends IService<PayMailContract> {
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, QueryWrapper<PayMailBillList> queryWrapper);
IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, PayMailBillList payMailBillList);
List<PayMailBillList> pageContractExcel(QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContractTwo(QueryWrapper<PayMailBillList> queryWrapper);
List<PayMailBillList> pageContractTwo(PayMailBillList payMailBillList);
List<PayMailBillList> getOneExcel(ArrayList<String> strings);
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+8 -2
View File
@@ -22,6 +22,7 @@ import com.jero.mail.PayMailBillVO;
import com.jero.mail.entity.BillingInfo;
import com.jero.mail.entity.PayMailBill;
import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.entity.PayMailBillSearch;
import com.jero.mail.mapper.PayMailBillMapper;
import com.jero.mail.mapper.PayMailBillProjectMapper;
import com.jero.mail.service.IPayMailBillProjectService;
@@ -265,8 +266,13 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
}
@Override
public List<PayMailBill> pageListTwo(QueryWrapper<PayMailBill> queryWrapper) {
return payMailBillMapper.pageList(queryWrapper);
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);
}
jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailContractServiceImpl.java
+4 -4
View File
@@ -28,8 +28,8 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
@Override
public IPage<PayMailBillList> pageContract(Page<PayMailBillList> page, QueryWrapper<PayMailBillList> queryWrapper) {
return payMailContractMapper.pageContract(page,queryWrapper);
public IPage<PayMailBillList> pageContract(Page<PayMailBillList> page,PayMailBillList payMailBillList) {
return payMailContractMapper.pageContract(page,payMailBillList);
}
@Override
@@ -38,8 +38,8 @@ public class PayMailContractServiceImpl extends ServiceImpl<PayMailContractMappe
}
@Override
public List<PayMailBillList> pageContractTwo(QueryWrapper<PayMailBillList> queryWrapper) {
return payMailContractMapper.pageContract(queryWrapper);
public List<PayMailBillList> pageContractTwo(PayMailBillList payMailBillList) {
return payMailContractMapper.pageContract(payMailBillList);
}
@Override