Merge branch 'branch20211008' into xuqiubiangeng1026
# Conflicts: # jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java # jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java # jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
This commit is contained in:
梁琦涛
+5
@@ -585,6 +585,10 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
|
||||
if(Objects.equals(chargeStatus,PayIncomeContractCommon.CHARGE_STATUS0)){
|
||||
chargeStatus = "";
|
||||
}
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
|
||||
payIncomeContract.setPrincipalId(sysUser.getId());
|
||||
}
|
||||
List<PayIncomeContract> pageList = payIncomeContractService.queryList( payIncomeContract,chargeStatus,projectName,startTime,endTime);
|
||||
List<PayIncomeContract> exportList = null;
|
||||
|
||||
@@ -596,6 +600,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
|
||||
} else {
|
||||
exportList = pageList;
|
||||
}
|
||||
|
||||
List<Map<String,String>> list = new ArrayList<>();
|
||||
// excel字段长度
|
||||
Map<String,Integer> mapCount = new HashMap<>();
|
||||
|
||||
+5
-6
@@ -3,11 +3,9 @@ package com.jero.contract.controller;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
@@ -23,7 +21,6 @@ import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.common.util.DateUtils;
|
||||
import com.jero.common.util.oConvertUtils;
|
||||
import com.jero.contract.common.PayIncomeContractCommon;
|
||||
import com.jero.contract.entity.*;
|
||||
import com.jero.contract.service.IPaySpendingContractAuditService;
|
||||
import com.jero.contract.service.IPaySpendingContractInstallmentService;
|
||||
@@ -322,8 +319,11 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
@RequestParam(name="startTime",required = false) String startTime,
|
||||
@RequestParam(name="endTime",required = false) String endTime) {
|
||||
|
||||
|
||||
List<PaySpendingContract> pageList = paySpendingContractService.queryList( paySpendingContract.getContractNum(),
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
if(!sysUser.getRoleCode().contains(RoleCommon.CWRY)){
|
||||
paySpendingContract.setPrincipalId(sysUser.getId());
|
||||
}
|
||||
List<PaySpendingContract> pageList = paySpendingContractService.queryList(paySpendingContract.getPrincipalId(), paySpendingContract.getContractNum(),
|
||||
paySpendingContract.getContractName(),startTime,endTime);
|
||||
List<PaySpendingContract> exportList = null;
|
||||
|
||||
@@ -352,7 +352,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
map.put("terminationDate",DateUtils.date2Str(p.getTerminationDate(),new SimpleDateFormat("yyyy-MM-dd")));
|
||||
map.put("opening",sysBaseAPI.translateDict("yn",String.valueOf(p.getOpening())));
|
||||
map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus())));
|
||||
map.put("pack",sysBaseAPI.translateDict("yn",String.valueOf(p.getPack())));
|
||||
List<PaySpendingContractInstallment> listSub = listPaySpendingContractInstallment.stream().filter(item->
|
||||
Objects.equals(p.getId(),item.getContractId())).collect(Collectors.toList());
|
||||
if(!CollectionUtils.isEmpty(listSub)){
|
||||
|
||||
+14
-14
@@ -134,25 +134,25 @@ public class PaySpendingContract implements Serializable {
|
||||
@ApiModelProperty(value = "合同约定主要时点")
|
||||
@Size(max = 200, message = "合同约定主要时点不能大于200个字符")
|
||||
private String contractTimePoints;
|
||||
/**应付金额*/
|
||||
@Excel(name = "应付金额", width = 15)
|
||||
@ApiModelProperty(value = "应付金额")
|
||||
@NotNull(message = "应付金额不能为空")
|
||||
/**应收金额*/
|
||||
@Excel(name = "应收金额", width = 15)
|
||||
@ApiModelProperty(value = "应收金额")
|
||||
@NotNull(message = "应收金额不能为空")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "应付金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "应收金额格式错误")
|
||||
private BigDecimal accountsReceivableAmount;
|
||||
/**已付金额*/
|
||||
@Excel(name = "已付金额", width = 15)
|
||||
@ApiModelProperty(value = "已付金额")
|
||||
@NotNull(message = "已付金额不能为空")
|
||||
/**已收金额*/
|
||||
@Excel(name = "已收金额", width = 15)
|
||||
@ApiModelProperty(value = "已收金额")
|
||||
@NotNull(message = "已收金额不能为空")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "已付金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "已收金额格式错误")
|
||||
private BigDecimal amountReceived;
|
||||
/**未付金额*/
|
||||
@Excel(name = "未付金额", width = 15)
|
||||
@ApiModelProperty(value = "未付金额")
|
||||
/**未收金额*/
|
||||
@Excel(name = "未收金额", width = 15)
|
||||
@ApiModelProperty(value = "未收金额")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
@DecimalMax(value = "9999999999.99",message = "未付金额格式错误")
|
||||
@DecimalMax(value = "9999999999.99",message = "未收金额格式错误")
|
||||
private BigDecimal outstandingAmount;
|
||||
/**账款状态（1：未支付，2：部分支付，3：已付全款）*/
|
||||
@Excel(name = "账款状态（1：未支付，2：部分支付，3：已付全款）", width = 15)
|
||||
|
||||
+15
-15
@@ -47,30 +47,30 @@ public class PaySpendingContractInstallment implements Serializable {
|
||||
@NotEmpty(message = "阶段不能为空")
|
||||
@Size(max = 50, message = "阶段长度不能大于50个字符")
|
||||
private String phaseName;
|
||||
/**应付金额*/
|
||||
@Excel(name = "阶段应付金额", width = 15)
|
||||
@ApiModelProperty(value = "应付金额")
|
||||
@NotNull(message = "阶段应付不能为空")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段应付格式错误")
|
||||
/**应收金额*/
|
||||
@Excel(name = "阶段应收金额", width = 15)
|
||||
@ApiModelProperty(value = "应收金额")
|
||||
@NotNull(message = "阶段应收不能为空")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段应收格式错误")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private BigDecimal accountsReceivableAmount;
|
||||
/**应付时间*/
|
||||
@Excel(name = "阶段应付时间", width = 15, format = "yyyy-MM-dd")
|
||||
/**应收时间*/
|
||||
@Excel(name = "阶段应收时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "应付时间")
|
||||
@ApiModelProperty(value = "应收时间")
|
||||
private Date accountsReceivableTime;
|
||||
/**实付金额*/
|
||||
@Excel(name = "阶段实付金额", width = 15)
|
||||
@ApiModelProperty(value = "阶段实付金额")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段实付格式错误")
|
||||
/**实收金额*/
|
||||
@Excel(name = "阶段实收金额", width = 15)
|
||||
@ApiModelProperty(value = "阶段实收金额")
|
||||
@DecimalMax(value = "9999999999.99",message = "阶段实收格式错误")
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING)
|
||||
private BigDecimal paidAmount;
|
||||
/**实付时间*/
|
||||
@Excel(name = "实付时间", width = 15, format = "yyyy-MM-dd")
|
||||
/**实收时间*/
|
||||
@Excel(name = "实收时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "实付时间")
|
||||
@ApiModelProperty(value = "实收时间")
|
||||
private Date paidTime;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
|
||||
+1
-1
@@ -36,7 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContrac
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
List<PaySpendingContract> queryList(@Param("contractNum") String contractNum,
|
||||
List<PaySpendingContract> queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum,
|
||||
@Param("contractName") String contractName,@Param("startTime") String startTime,
|
||||
@Param("endTime") String endTime);
|
||||
|
||||
|
||||
+3
@@ -293,6 +293,9 @@
|
||||
<if test="projectName != null and projectName != ''">
|
||||
AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
|
||||
</if>
|
||||
<if test="payIncomeContract.principalId != null and payIncomeContract.principalId != ''">
|
||||
AND aa.principalId = #{payIncomeContract.principalId}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
|
||||
</select>
|
||||
|
||||
+3
@@ -117,6 +117,9 @@
|
||||
<if test="endTime != null and endTime != ''">
|
||||
AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{endTime}
|
||||
</if>
|
||||
<if test="principalId != null and principalId != ''">
|
||||
AND principal_id = #{principalId}
|
||||
</if>
|
||||
</where>
|
||||
ORDER BY chargeStatus desc,create_time desc
|
||||
</select>
|
||||
|
||||
+3
-5
@@ -344,9 +344,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
});
|
||||
int count1 = count - listSpendingContract.size();
|
||||
if(count1 != 0){
|
||||
Pattern p = Pattern.compile("[0-9]*");
|
||||
Matcher m = p.matcher(String.valueOf(count1 / 5));
|
||||
if (!m.matches()){
|
||||
if (count1 % 5 != 0){
|
||||
throw new JeroBootException("文件格式有误,请下载模板后上传！");
|
||||
}
|
||||
int count2 = count1 / listSpendingContractInstallment.size();
|
||||
@@ -570,8 +568,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<PaySpendingContract> queryList(String contractNum, String contractName, String startTime, String endTime) {
|
||||
return paySpendingContractMapper.queryList( contractNum, contractName, startTime, endTime);
|
||||
public List<PaySpendingContract> queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) {
|
||||
return paySpendingContractMapper.queryList(principalId, contractNum, contractName, startTime, endTime);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user