Bladeren bron

普通报销相关修改

chenjun 1 jaar geleden
bovenliggende
commit
10268b145d

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

@@ -353,6 +353,22 @@ public class CommonCostEvent extends BaseController {
         }
     }
 
+    @PostMapping("/toDriver")
+    public String toDriver(@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);
+            List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
+            Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
+            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "sj"))) {
+                return "true";
+            }
+            return "false";
+        } catch (Exception ex) {
+            return error(ex.getMessage(), ErrorCode.DEFAULT);
+        }
+    }
+
     @PostMapping("/toCTO")
     public String toCTO(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {

+ 16 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/travelcost/event/TravelCostEvent.java

@@ -277,6 +277,22 @@ public class TravelCostEvent extends BaseController {
         }
     }
 
+    @PostMapping("/toDriver")
+    public String toDriver(@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();
+            TravelCostDO entity = travelCostService.findByInstanceId(flowInstanceId);
+            List<PostRespDTO> postList = postApi.getPostByUser(entity.getUserId()).getCheckedData();
+            Set<String> postCodes = convertSet(postList, PostRespDTO::getCode);
+            if (entity != null && (CollectionUtil.isEmpty(postCodes) || CollectionUtil.contains(postCodes, "sj"))) {
+                return "true";
+            }
+            return "false";
+        } catch (Exception ex) {
+            return error(ex.getMessage(), BaseController.ErrorCode.DEFAULT);
+        }
+    }
+
     @PostMapping("/toCommon")
     public String toCommon(@ParamModel Map flowInstance, @ParamModel Map flowDirectionInstance, @ParamModel Map previousActivityInstance, @ParamModel Map previousGatewayInstance, @ParamModel Map nextActivityTemplate, @ParamModel Map nextGatewayInstance) {
         try {

+ 2 - 2
zjugis-business/src/main/resources/templates/CommonCost/js/index.js

@@ -362,8 +362,8 @@
             }
 
         }
-        z.ui.input("[name='createReqVO$totalAmount']").setValue(jeSum);
-        z.ui.input("[name='createReqVO$totalAmountCn']").setValue(convertCurrency(jeSum));
+        z.ui.input("[name='createReqVO$totalAmount']").setValue(jeSum.toFixed(2));
+        z.ui.input("[name='createReqVO$totalAmountCn']").setValue(convertCurrency(jeSum.toFixed(2)));
     }
 
     //注册业务保存事件