admin/wisdomisitezw_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
pengjie 2023-11-24 17:23:19 +08:00
parent c7072bed10
commit 6dc4082829
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentApplyController.java
View File

@ -1,7 +1,9 @@
package com.zhgd.xmgl.modules.basicdata.controller.government;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
@ -9,12 +11,14 @@ import com.zhgd.xmgl.modules.basicdata.dto.EngineeringPageDto;
import com.zhgd.xmgl.modules.basicdata.dto.ProjectPageDto;
import com.zhgd.xmgl.modules.safety.entity.InvestmentApply;
import com.zhgd.xmgl.modules.safety.service.IInvestmentApplyService;
import com.zhgd.xmgl.modules.safety.vo.InvestmentApplyVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -116,7 +120,7 @@ public class GovInvestmentApplyController {
/**
* 列表查询
*
* @param investmentApply
* @param investmentApplyVo
* @return
*/
@OperLog(operModul = "投资支付申报管理", operType = "列表查询", operDesc = "列表查询未支付投资申报信息")
@ -126,10 +130,16 @@ public class GovInvestmentApplyController {
@ApiImplicitParam(name = "investmentPaymentId", value = "投资支付记录ID", paramType = "body", required = true, dataType = "String")
})
@PostMapping(value = "/unPayList")
public Result<List<InvestmentApply>> unPayList(@RequestBody InvestmentApply investmentApply) {
QueryWrapper<InvestmentApply> queryWrapper = QueryGenerator.initQueryWrapper(investmentApply);
queryWrapper.lambda().isNull(InvestmentApply::getInvestmentPaymentId);
public Result<List<InvestmentApply>> unPayList(@RequestBody InvestmentApplyVo investmentApplyVo) {
LambdaQueryWrapper<InvestmentApply> queryWrapper = Wrappers.<InvestmentApply>lambdaQuery();
if (StringUtils.isNotBlank(investmentApplyVo.getEngineeringSn())) {
queryWrapper.eq(InvestmentApply::getEngineeringSn, investmentApplyVo.getEngineeringSn());
}
queryWrapper.isNull(InvestmentApply::getInvestmentPaymentId);
List<InvestmentApply> list = investmentApplyService.list(queryWrapper);
if (investmentApplyVo.getApplyIds() != null && investmentApplyVo.getApplyIds().size() > 0) {
list.addAll(investmentApplyService.list(Wrappers.<InvestmentApply>lambdaQuery().in(InvestmentApply::getId, investmentApplyVo.getApplyIds())));
}
return Result.success(list);
}

54
src/main/java/com/zhgd/xmgl/modules/safety/vo/InvestmentApplyVo.java Normal file
View File

@ -0,0 +1,54 @@
package com.zhgd.xmgl.modules.safety.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.util.List;
/**
* @Description: 投资支付申报
* @author： pengj
* @date： 2023-07-05
* @version： V1.0
*/
@Data
@ApiModel(value = "InvestmentApplyVo", description = "InvestmentApplyVo")
public class InvestmentApplyVo {
@ApiModelProperty(value = "投资支付申报ID(主键ID)")
private Long id;
@ApiModelProperty(value = "申报时段名称")
private String name;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "申报时间")
private Date applyTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "申报时段开始时间")
private Date applyStartTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "申报时段结束时间")
private Date applyEndTime;
@ApiModelProperty(value = "投资支付记录ID")
private Long investmentPaymentId;
@ApiModelProperty(value = "项目sn")
private String projectSn;
@ApiModelProperty(value = "工程sn")
private String engineeringSn;
@ApiModelProperty(value = "集合")
private List<String> applyIds;
}