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-29 15:11:58 +08:00
parent 10643ce469
commit 1527ed897d
15 changed files with 54 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAssociatedController.java
-6
View File
@@ -42,7 +42,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param req
* @return
*/
// @AutoLog(value = "收入合同关联-分页列表查询")
// // @ApiOperation(value="收入合同关联-分页列表查询", notes="收入合同关联-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractAssociated payIncomeContractAssociated,
@@ -61,7 +60,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param payIncomeContractAssociated
* @return
*/
// @AutoLog(value = "收入合同关联-添加")
//// @ApiOperation(value="收入合同关联-添加", notes="收入合同关联-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
@@ -75,7 +73,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param payIncomeContractAssociated
* @return
*/
// @AutoLog(value = "收入合同关联-编辑")
// // @ApiOperation(value="收入合同关联-编辑", notes="收入合同关联-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractAssociated payIncomeContractAssociated) {
@@ -89,7 +86,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param id
* @return
*/
// @AutoLog(value = "收入合同关联-通过id删除")
// // @ApiOperation(value="收入合同关联-通过id删除", notes="收入合同关联-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -103,7 +99,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param ids
* @return
*/
// @AutoLog(value = "收入合同关联-批量删除")
// // @ApiOperation(value="收入合同关联-批量删除", notes="收入合同关联-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -117,7 +112,6 @@ public class PayIncomeContractAssociatedController extends JeroController<PayInc
* @param id
* @return
*/
// @AutoLog(value = "收入合同关联-通过id查询")
// // @ApiOperation(value="收入合同关联-通过id查询", notes="收入合同关联-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractAuditController.java
-6
View File
@@ -41,7 +41,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param req
* @return
*/
// @AutoLog(value = "审核记录-分页列表查询")
// // @ApiOperation(value="审核记录-分页列表查询", notes="审核记录-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractAudit payIncomeContractAudit,
@@ -60,7 +59,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param payIncomeContractAudit
* @return
*/
// @AutoLog(value = "审核记录-添加")
// // @ApiOperation(value="审核记录-添加", notes="审核记录-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -74,7 +72,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param payIncomeContractAudit
* @return
*/
// @AutoLog(value = "审核记录-编辑")
// // @ApiOperation(value="审核记录-编辑", notes="审核记录-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractAudit payIncomeContractAudit) {
@@ -88,7 +85,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param id
* @return
*/
// @AutoLog(value = "审核记录-通过id删除")
// // @ApiOperation(value="审核记录-通过id删除", notes="审核记录-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -102,7 +98,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param ids
* @return
*/
// @AutoLog(value = "审核记录-批量删除")
// // @ApiOperation(value="审核记录-批量删除", notes="审核记录-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -116,7 +111,6 @@ public class PayIncomeContractAuditController extends JeroController<PayIncomeCo
* @param id
* @return
*/
// @AutoLog(value = "审核记录-通过id查询")
// // @ApiOperation(value="审核记录-通过id查询", notes="审核记录-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+9 -15
View File
@@ -109,7 +109,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param input 收入合同
*/
@AutoLog(value = "收入合同-添加")
@AutoLog(value = "收入合同-添加",operateType = 2)
@RequiresPermissions("revenueContract:add")
@ApiOperation(value="收入合同-添加", notes="收入合同-添加")
@PostMapping(value = "/add")
@@ -124,7 +124,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractNum 合同编号
* @return
*/
@AutoLog(value = "收入合同-验证合同编号是否存在")
@ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
@GetMapping(value = "/getContractNum")
public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -150,7 +149,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractName 合同名称
* @return
*/
@AutoLog(value = "收入合同-验证合同名称是否存在")
@ApiOperation(value="收入合同-验证合同名称是否存在", notes="收入合同-验证合同名称是否存在")
@GetMapping(value = "/getContractName")
public Result<?> getContractName(@RequestParam(name="contractName") String contractName) {
@@ -177,7 +175,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param id 普通项目管理id
* @return
*/
@AutoLog(value = "收入合同-查询该项目是否关联了合同")
@ApiOperation(value="收入合同-通过id查询该项目是否关联了合同", notes="收入合同-通过id查询该项目是否关联了合同")
@GetMapping(value = "/getContractById")
public Result<?> getContractById(@RequestParam(name="id") String id) {
@@ -203,8 +200,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param input 收入合同
*/
@AutoLog(value = "收入合同-编辑")
@AutoLog(value = "收入合同-修改",operateType = 3)
@RequiresPermissions("revenueContract:edit")
@ApiOperation(value="收入合同-编辑", notes="收入合同-编辑")
@PostMapping(value = "/edit")
@@ -219,7 +215,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param contractId 合同id
* @return
*/
// @AutoLog(value = "收入合同-关联项目列表")
@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
@GetMapping(value = "/getAssociated")
public Result<?> getAssociated(@RequestParam("contractId") String contractId) {
@@ -240,7 +235,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param listPayIncomeContractAssociated 关联项目集合
* @return
*/
// @AutoLog(value = "收入合同-关联")
@AutoLog(value = "收入合同-关联",operateType = 2)
@RequiresPermissions("revenueContractModule:chooseProject")
@ApiOperation(value="收入合同-关联", notes="收入合同-关联")
@PostMapping(value = "/associated")
@@ -255,7 +250,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param payIncomeContractAssociated 关联项目
* @return
*/
// @AutoLog(value = "收入合同-取消关联")
@AutoLog(value = "收入合同-取消关联",operateType = 4)
@RequiresPermissions("revenueContractModule:unlinkProject")
@ApiOperation(value="收入合同-取消关联", notes="收入合同-取消关联")
@PostMapping(value = "/cancelAssociated")
@@ -269,7 +264,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param payIncomeContract 收入合同
*/
// @AutoLog(value = "收入合同-提交审核")
@AutoLog(value = "收入合同-提交审核",operateType = 3)
@ApiOperation(value="收入合同-提交审核", notes="收入合同-提交审核")
@PostMapping(value = "/submitAudit")
public Result<?> submitAudit(@RequestBody PayIncomeContract payIncomeContract) {
@@ -282,7 +277,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param payIncomeContractAudit 审核记录
*/
@AutoLog(value = "收入合同-审核")
@AutoLog(value = "收入合同-合同审核",operateType = 7)
@RequiresPermissions("revenueContract:aduit")
@ApiOperation(value="收入合同-审核", notes="收入合同-审核")
@PostMapping(value = "/audit")
@@ -299,7 +294,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param payIncomeContractAudit 审核记录
*/
@AutoLog(value = "收入合同-归档")
@AutoLog(value = "收入合同-归档",operateType = 8)
@RequiresPermissions("revenueContract:archive")
@ApiOperation(value="收入合同-归档", notes="收入合同-归档")
@PostMapping(value = "/archive")
@@ -316,7 +311,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param id 合同id
*/
@AutoLog(value = "收入合同-删除")
@AutoLog(value = "收入合同-删除",operateType = 4)
@RequiresPermissions("revenueContract:delete")
@ApiOperation(value="收入合同-通过id删除", notes="收入合同-通过id删除")
@GetMapping(value = "/delete")
@@ -333,7 +328,6 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
*
* @param ids 合同id逗号分隔
*/
@AutoLog(value = "收入合同-批量删除")
@RequiresPermissions("revenueContract:batchDel")
@ApiOperation(value="收入合同-批量删除", notes="收入合同-批量删除")
@GetMapping(value = "/deleteBatch")
@@ -427,7 +421,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
* @param request
* @param payIncomeContract 收入合同
*/
@AutoLog(value = "收入合同-导出excel")
@AutoLog(value = "收入合同-导出excel",operateType = 6)
@RequiresPermissions("revenueContract:export")
@ApiOperation(value="收入合同-导出excel", notes="收入合同-导出excel")
@RequestMapping(value = "/exportXls")
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractInstallmentController.java
-6
View File
@@ -43,7 +43,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param req
* @return
*/
// @AutoLog(value = "分期信息-分页列表查询")
// // @ApiOperation(value="分期信息-分页列表查询", notes="分期信息-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PayIncomeContractInstallment payIncomeContractInstallment,
@@ -62,7 +61,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param payIncomeContractInstallment
* @return
*/
// @AutoLog(value = "分期信息-添加")
// // @ApiOperation(value="分期信息-添加", notes="分期信息-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
@@ -76,7 +74,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param payIncomeContractInstallment
* @return
*/
// @AutoLog(value = "分期信息-编辑")
// // @ApiOperation(value="分期信息-编辑", notes="分期信息-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PayIncomeContractInstallment payIncomeContractInstallment) {
@@ -90,7 +87,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param id
* @return
*/
// @AutoLog(value = "分期信息-通过id删除")
// // @ApiOperation(value="分期信息-通过id删除", notes="分期信息-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -104,7 +100,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param ids
* @return
*/
// @AutoLog(value = "分期信息-批量删除")
// // @ApiOperation(value="分期信息-批量删除", notes="分期信息-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -118,7 +113,6 @@ public class PayIncomeContractInstallmentController extends JeroController<PayIn
* @param id
* @return
*/
// @AutoLog(value = "分期信息-通过id查询")
// // @ApiOperation(value="分期信息-通过id查询", notes="分期信息-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java
+5 -9
View File
@@ -99,7 +99,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param input 支出合同
* @return
*/
@AutoLog(value = "支出合同-添加")
@AutoLog(value = "支出合同-添加",operateType = 2)
@RequiresPermissions("expenditureContract:add")
@ApiOperation(value="支出合同-添加", notes="支出合同-添加")
@PostMapping(value = "/add")
@@ -114,7 +114,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param input 支出合同
* @return
*/
@AutoLog(value = "支出合同-编辑")
@AutoLog(value = "支出合同-编辑",operateType = 3)
@RequiresPermissions("expenditureContract:edit")
@ApiOperation(value="支出合同-编辑", notes="支出合同-编辑")
@PostMapping(value = "/edit")
@@ -128,7 +128,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param contractNum 合同编号
* @return
*/
@AutoLog(value = "支出合同-验证合同编号是否存在")
@ApiOperation(value="收入合同-验证合同编号是否存在", notes="收入合同-验证合同编号是否存在")
@GetMapping(value = "/getContractNum")
public Result<?> getContractNum(@RequestParam(name="contractNum") String contractNum) {
@@ -154,7 +153,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param id
* @return
*/
@AutoLog(value = "支出合同-删除")
@AutoLog(value = "支出合同-删除",operateType = 4)
@RequiresPermissions("expenditureContract:delete")
@ApiOperation(value="支出合同-通过id删除", notes="支出合同-通过id删除")
@GetMapping(value = "/delete")
@@ -172,7 +171,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param ids
* @return
*/
@AutoLog(value = "支出合同-批量删除")
@RequiresPermissions("expenditureContract:batchDel")
@ApiOperation(value="支出合同-批量删除", notes="支出合同-批量删除")
@GetMapping(value = "/deleteBatch")
@@ -196,7 +194,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param id
* @return
*/
// @AutoLog(value = "支出合同-查询详情")
@ApiOperation(value="支出合同-通过id查询", notes="支出合同-通过id查询")
@GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id") String id) {
@@ -229,7 +226,6 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
*
* @return
*/
@AutoLog(value = "支出合同-模板下载")
@RequiresPermissions("expenditureContract:downTemplate")
@ApiOperation(value="支出合同-模板下载", notes="支出合同-模板下载")
@GetMapping(value = "/downloadExcelModel")
@@ -243,7 +239,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param request
* @param paySpendingContract
*/
@AutoLog(value = "支出合同-导出excel")
@AutoLog(value = "支出合同-导出excel",operateType = 6)
@RequiresPermissions("expenditureContract:export")
@GetMapping(value = "/exportXls")
@ApiOperation(value="支出合同-导出excel", notes="支出合同-导出excel")
@@ -355,7 +351,7 @@ public class PaySpendingContractController extends JeroController<PaySpendingCon
* @param response
* @return
*/
@AutoLog(value = "支出合同-excel导入数据")
@AutoLog(value = "支出合同-excel导入数据",operateType = 5)
@RequiresPermissions("expenditureContract:import")
@PostMapping(value = "/importExcel")
@ApiOperation(value="支出合同-通过excel导入数据", notes="支出合同-通过excel导入数据")
jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractInstallmentController.java
-6
View File
@@ -41,7 +41,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param req
* @return
*/
// @AutoLog(value = "pay_spending_contract_installment-分页列表查询")
//// @ApiOperation(value="pay_spending_contract_installment-分页列表查询", notes="pay_spending_contract_installment-分页列表查询")
// @GetMapping(value = "/list")
public Result<?> queryPageList(PaySpendingContractInstallment paySpendingContractInstallment,
@@ -60,7 +59,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param paySpendingContractInstallment
* @return
*/
// @AutoLog(value = "pay_spending_contract_installment-添加")
//// @ApiOperation(value="pay_spending_contract_installment-添加", notes="pay_spending_contract_installment-添加")
// @PostMapping(value = "/add")
public Result<?> add(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
@@ -74,7 +72,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param paySpendingContractInstallment
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-编辑")
// @ApiOperation(value="pay_spending_contract_installment-编辑", notes="pay_spending_contract_installment-编辑")
// @PostMapping(value = "/edit")
public Result<?> edit(@RequestBody PaySpendingContractInstallment paySpendingContractInstallment) {
@@ -88,7 +85,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param id
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-通过id删除")
// @ApiOperation(value="pay_spending_contract_installment-通过id删除", notes="pay_spending_contract_installment-通过id删除")
// @GetMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -102,7 +98,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param ids
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-批量删除")
// @ApiOperation(value="pay_spending_contract_installment-批量删除", notes="pay_spending_contract_installment-批量删除")
// @GetMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -116,7 +111,6 @@ public class PaySpendingContractInstallmentController extends JeroController<Pay
* @param id
* @return
*/
@AutoLog(value = "pay_spending_contract_installment-通过id查询")
// @ApiOperation(value="pay_spending_contract_installment-通过id查询", notes="pay_spending_contract_installment-通过id查询")
// @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {