普通报销事件修改

zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/event/CommonCostEvent.java

@@ -196,13 +196,13 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
-    @PostMapping("/lessThan2000")
+    @PostMapping("/le2000")
     public String lessThan2000(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
             CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
             if (entity != null && entity.getTotalAmount() != null
-                    && entity.getTotalAmount().compareTo(new BigDecimal(2000)) < 0) {
+                    && entity.getTotalAmount().compareTo(new BigDecimal(2000)) <= 0) {
                 return "true";
             }
             return "false";
@@ -211,13 +211,13 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
-    @PostMapping("/ge2000")
+    @PostMapping("/gt2000")
     public String ge2000(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
             CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
             if (entity != null && entity.getTotalAmount() != null
-                    && entity.getTotalAmount().compareTo(new BigDecimal(2000)) >= 0) {
+                    && entity.getTotalAmount().compareTo(new BigDecimal(2000)) > 0) {
                 return "true";
             }
             return "false";
@@ -226,13 +226,13 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
-    @PostMapping("/lessThan10000")
+    @PostMapping("/le10000")
     public String lessThan10000(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
             CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
             if (entity != null && entity.getTotalAmount() != null
-                    && entity.getTotalAmount().compareTo(new BigDecimal(10000)) < 0) {
+                    && entity.getTotalAmount().compareTo(new BigDecimal(10000)) <= 0) {
                 return "true";
             }
             return "false";
@@ -241,13 +241,13 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
-    @PostMapping("/ge10000")
+    @PostMapping("/gt10000")
     public String ge10000(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {
             String flowInstanceId = flowInstance.get("id").toString();
             CommonCostDO entity = commonCostService.findByInstanceId(flowInstanceId);
             if (entity != null && entity.getTotalAmount() != null
-                    && entity.getTotalAmount().compareTo(new BigDecimal(10000)) >= 0) {
+                    && entity.getTotalAmount().compareTo(new BigDecimal(10000)) > 0) {
                 return "true";
             }
             return "false";