dcs 10 mesi fa
parent
commit
594dea6399

+ 23 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/controller/PaymentController.java

@@ -1,8 +1,12 @@
 package com.bosshand.virgo.api.controller;
 
-import com.bosshand.virgo.api.model.*;
+import com.bosshand.virgo.api.model.Payment;
+import com.bosshand.virgo.api.model.PaymentInvoice;
+import com.bosshand.virgo.api.model.PaymentOrdinary;
+import com.bosshand.virgo.api.model.PaymentRecord;
 import com.bosshand.virgo.api.service.PaymentService;
 import com.bosshand.virgo.api.service.ProjectItemTargetRoomService;
+import com.bosshand.virgo.core.config.OperationControllerLog;
 import com.bosshand.virgo.core.response.Response;
 import com.bosshand.virgo.core.utils.StringUtil;
 import io.swagger.annotations.Api;
@@ -26,6 +30,7 @@ public class PaymentController {
     @Autowired
     ProjectItemTargetRoomService projectItemTargetRoomService;
 
+    @OperationControllerLog(module = "账单管理", operation = "合同账单-收款账单列表")
     @ApiOperation("分页获取")
     @RequestMapping(value = "/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response list(@RequestBody Payment payment, @PathVariable int currPage, @PathVariable int pageSize) {
@@ -38,12 +43,14 @@ public class PaymentController {
 
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "合同账单-详情")
     @ApiOperation("详情")
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public Response get(@PathVariable long id) {
         return Response.ok(paymentService.get(id));
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "合同账单-状态操作")
     @ApiOperation("更新状态")
     @RequestMapping(value = "/updateStatus/{id}/{status}", method = RequestMethod.PUT)
     public Response update(@PathVariable long id, @PathVariable Integer status) {
@@ -51,6 +58,7 @@ public class PaymentController {
         return Response.ok();
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "合同账单-生成账单")
     @ApiOperation("生成账单")
     @RequestMapping(value = "/generate/{contractId}", method = RequestMethod.GET)
     public Response generate(@PathVariable long contractId) {
@@ -65,6 +73,7 @@ public class PaymentController {
     /**
      * 发票记录
      */
+    @OperationControllerLog(module = "发票管理", operation = "合同发票-详情")
     @ApiOperation("发票记录详情")
     @RequestMapping(value = "/invoice/{id}", method = RequestMethod.GET)
     public Response getInvoice(@PathVariable long id) {
@@ -76,6 +85,7 @@ public class PaymentController {
         return Response.ok(invoice);
     }
 
+    @OperationControllerLog(module = "发票管理", operation = "合同发票-新增")
     @ApiOperation("保存发票记录")
     @RequestMapping(value = "/invoice", method = RequestMethod.POST)
     public Response insertInvoice(@RequestBody PaymentInvoice paymentInvoice) {
@@ -83,6 +93,7 @@ public class PaymentController {
         return Response.ok();
     }
 
+    @OperationControllerLog(module = "发票管理", operation = "合同发票-收款发票列表")
     @ApiOperation("分页获取发票记录")
     @RequestMapping(value = "/invoice/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response list(@RequestBody PaymentInvoice paymentInvoice, @PathVariable int currPage, @PathVariable int pageSize) {
@@ -101,6 +112,7 @@ public class PaymentController {
         return Response.ok(paymentService.getInvoiceList(paymentInvoice));
     }
 
+    @OperationControllerLog(module = "发票管理", operation = "合同发票-状态操作")
     @ApiOperation("更新发票记录")
     @RequestMapping(value = "/invoice/update", method = RequestMethod.PUT)
     public Response updateInvoice(@RequestBody PaymentInvoice paymentInvoice) {
@@ -108,6 +120,7 @@ public class PaymentController {
         return Response.ok();
     }
 
+    @OperationControllerLog(module = "发票管理", operation = "合同发票-删除")
     @ApiOperation("删除发票记录")
     @RequestMapping(value = "/invoice/delete/{id}", method = RequestMethod.DELETE)
     public Response deleteInvoice(@PathVariable long id) {
@@ -127,12 +140,14 @@ public class PaymentController {
     /**
      * 付款记录
      */
+    @OperationControllerLog(module = "合同管理", operation = "付款-详情")
     @ApiOperation("付款记录详情")
     @RequestMapping(value = "/record/{id}", method = RequestMethod.GET)
     public Response getPaymentRecord(@PathVariable long id) {
         return Response.ok(paymentService.getPaymentRecord(id));
     }
 
+    @OperationControllerLog(module = "合同管理", operation = "付款-新增")
     @ApiOperation("保存付款记录")
     @RequestMapping(value = "/record", method = RequestMethod.POST)
     public Response insertPaymentRecord(@RequestBody PaymentRecord paymentRecord) {
@@ -146,6 +161,7 @@ public class PaymentController {
         return Response.ok(paymentService.getPaymentRecordList(paymentRecord));
     }
 
+    @OperationControllerLog(module = "合同管理", operation = "付款-状态")
     @ApiOperation("更新付款记录")
     @RequestMapping(value = "/record/update", method = RequestMethod.PUT)
     public Response updatePaymentRecord(@RequestBody PaymentRecord paymentRecord) {
@@ -163,6 +179,7 @@ public class PaymentController {
     /**
      * 普通账单
      */
+    @OperationControllerLog(module = "账单管理", operation = "常规账单-收款账单列表")
     @ApiOperation("普通账单分页获取")
     @RequestMapping(value = "/ordinary/{currPage}/{pageSize}", method = RequestMethod.POST)
     public Response list(@RequestBody PaymentOrdinary paymentOrdinary, @PathVariable int currPage, @PathVariable int pageSize) {
@@ -174,12 +191,15 @@ public class PaymentController {
         return Response.ok(result);
     }
 
+
+    @OperationControllerLog(module = "账单管理", operation = "常规账单-详情")
     @ApiOperation("普通账单详情")
     @RequestMapping(value = "/ordinary/{id}", method = RequestMethod.GET)
     public Response getPaymentOrdinary(@PathVariable long id) {
         return Response.ok(paymentService.getPaymentOrdinary(id));
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "常规账单-新增")
     @ApiOperation("普通账单保存")
     @RequestMapping(value = "/ordinary", method = RequestMethod.POST)
     public Response insertPaymentOrdinary(@RequestBody PaymentOrdinary paymentOrdinary) {
@@ -187,6 +207,7 @@ public class PaymentController {
         return Response.ok();
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "常规账单-编辑")
     @ApiOperation("普通账单更新")
     @RequestMapping(value = "/ordinary", method = RequestMethod.PUT)
     public Response updatePaymentOrdinary(@RequestBody PaymentOrdinary paymentOrdinary) {
@@ -194,6 +215,7 @@ public class PaymentController {
         return Response.ok();
     }
 
+    @OperationControllerLog(module = "账单管理", operation = "常规账单-删除")
     @ApiOperation("普通账单删除")
     @RequestMapping(value = "/ordinary/{id}", method = RequestMethod.DELETE)
     public Response update(@PathVariable long id) {

+ 1 - 1
virgo.core/src/main/java/com/bosshand/virgo/core/model/UserContext.java

@@ -8,7 +8,7 @@ import java.util.Set;
 
 public class UserContext implements BaseModel{
 
-	public static final String IDENTITY_OWNER_DATA = "{\"name\": \"所有者\",\"remark\": \"组织的所有者\",\"id\": 1}";
+	public static final String IDENTITY_OWNER_DATA = "{\"name\": \"所有者\",\"remark\": \"组织的所有者\",\"id\": 6}";
 	
 	private long userId;