add:变更
This commit is contained in:
+8
-5
@@ -64,7 +64,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
private Environment env;
|
||||
@Resource
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
@@ -105,7 +105,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
IPage<PaySpendingContract> pageList = paySpendingContractService.queryPageList(page, paySpendingContract,startTime,endTime,chargeStatus);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
@@ -120,7 +120,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
PaySpendingContract paySpendingContract = paySpendingContractService.addPaySpendingContractInput(input);
|
||||
return Result.OK("添加成功!",paySpendingContract);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
@@ -228,7 +228,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
paySpendingContractService.deletePaySpendingContractInputById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
@@ -251,7 +251,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
paySpendingContractService.deleteSpendingContractInputByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
@@ -400,6 +400,9 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
|
||||
filedsList.add(new ExcelExportEntity("签订联系人", "signedContactsTemporaryName"));
|
||||
filedsList.add(new ExcelExportEntity("是否开口", "opening"));
|
||||
filedsList.add(new ExcelExportEntity("负责人", "principalName"));
|
||||
filedsList.add(new ExcelExportEntity("联系电话", "phone"));
|
||||
filedsList.add(new ExcelExportEntity("邮寄地址", "address"));
|
||||
filedsList.add(new ExcelExportEntity("邮编", "postCode"));
|
||||
filedsList.add(new ExcelExportEntity("部门名称", "departmentName"));
|
||||
filedsList.add(new ExcelExportEntity("签订合同总金额", "contractAmount"));
|
||||
filedsList.add(new ExcelExportEntity("税率", "rate"));
|
||||
|
||||
+1
-1
@@ -137,7 +137,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
|
||||
PayMailContract payMailContract = new PayMailContract();
|
||||
payMailContract.setContractId(paySpendingContract.getId());
|
||||
payMailContract.setPostStatus(PayIncomeContractCommon.POST_STATUS0);
|
||||
payMailContract.setMobile(paySpendingContract.getPhone());
|
||||
payMailContract.setMobile(PasswordUtil.encrypt(paySpendingContract.getPhone()));
|
||||
payMailContract.setEmail("");
|
||||
payMailContract.setLiaisonMan(paySpendingContract.getSignedContactsTemporaryName());
|
||||
payMailContract.setContractType(PayIncomeContractCommon.CONTRACT_TYPE1);
|
||||
|
||||
+10
@@ -38,6 +38,16 @@ public class PaySpendingContractExcelModel implements Serializable {
|
||||
/**未税金额*/
|
||||
@Excel(name = "未税金额", width = 15)
|
||||
private String noTaxAmount;
|
||||
|
||||
@Excel(name = "联系电话", width = 15)
|
||||
private String phone;
|
||||
|
||||
@Excel(name = "邮寄地址", width = 15)
|
||||
private String address;
|
||||
|
||||
@Excel(name = "邮编", width = 15)
|
||||
private String postCode;
|
||||
|
||||
/**合同签订日期*/
|
||||
@Excel(name = "合同签订日期", width = 15, format = "yyyy-MM-dd")
|
||||
private Date contractDate;
|
||||
|
||||
Reference in New Issue
Block a user