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:
梁琦涛
2021-09-06 10:59:58 +08:00
parent 07528ce0fa
commit ffef58d00e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/company/entity/PayCompanyManagement.java
+5 -5
View File
@@ -54,11 +54,11 @@ public class PayCompanyManagement implements Serializable {
@Pattern(regexp = "^(([0-9]{3,4}-)?[0-9]{7,8})|(((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\\d{8})$",message = "公司电话格式错误")
private String companyPhone;
/**邮编*/
@Excel(name = "邮编", width = 15)
@ApiModelProperty(value = "邮编")
@NotEmpty(message = "邮编不能为空！")
@Size(min=6,max = 6,message = "邮编长度必须为6个字符")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮编格式错误")
@Excel(name = "邮政编码", width = 15)
@ApiModelProperty(value = "邮政编码")
@NotEmpty(message = "邮政编码不能为空！")
@Size(min=6,max = 6,message = "邮政编码长度必须为6个字符")
@Pattern(regexp = "^[0-9]\\d{5}$",message = "邮政编码格式错误")
private String postalCode;
/**银行户名*/
@Excel(name = "银行户名", width = 15)
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+9
View File
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.exception.JeroBootException;
import com.jero.common.system.api.ISysBaseAPI;
import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.DateUtils;
@@ -77,6 +78,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
private IPayIncomeContractAuditService payIncomeContractAuditService;
@Autowired
private Environment env;
@Autowired
private ISysBaseAPI sysBaseAPI;
/**
* 分页列表查询
@@ -379,6 +383,9 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
exportList.forEach(p->{
String str = JSON.toJSONString(p);
Map<String,String> map = JSONObject.parseObject(str,Map.class);
map.put("opening",sysBaseAPI.translateDict("revenue_contract_open",String.valueOf(p.getOpening())));
map.put("accountStatus",sysBaseAPI.translateDict("revenue_contract_account_status",String.valueOf(p.getAccountStatus())));
map.put("pack",sysBaseAPI.translateDict("pack_status",String.valueOf(p.getPack())));
List<PayIncomeContractInstallment> listSub = listPayIncomeContractInstallment.stream().filter(item->
Objects.equals(p.getId(),item.getContractId())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(listSub)){
@@ -416,6 +423,8 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
filedsList.add(new ExcelExportEntity("合同签订日期", "contractDate"));
filedsList.add(new ExcelExportEntity("合同终止日期", "terminationDate"));
filedsList.add(new ExcelExportEntity("合同约定主要时点", "contractTimePoints"));
filedsList.add(new ExcelExportEntity("是否打包", "pack"));
filedsList.add(new ExcelExportEntity("打包年份", "packYear"));
int count = mapCount.get("count");
if(count > 0){
for (int i = 1; i <= count; i++){