Merge remote-tracking branch 'origin/master'

zjugis-business/src/main/java/com/zjugis/business/flow/common/event/CommonEvent.java

@@ -6,6 +6,7 @@ import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.workflow.exception.BusinessException;
 import com.zjugis.framework.workflow.model.BaseController;
 import com.zjugis.framework.workflow.model.IActivityInsParticiPantDto;
+import com.zjugis.framework.workflow.model.IFlowInstance;
 import com.zjugis.framework.workflow.model.IFlowInstanceReq;
 import com.zjugis.framework.workflow.rpc.remote.WorkflowClient;
 import com.zjugis.framework.workflow.spring.resovler.ParamModel;
@@ -102,6 +103,33 @@ public class CommonEvent extends BaseController {
             throw new BusinessException("执行事件出错，请联系管理员！");
         }
     }
-
+    /**
+     * 打印消息
+     * @param flowInstance
+     * @param activityInstance
+     * @return
+     */
+    @PostMapping("/send-ding-print-message")
+    public String sendDingPrintMessage(@ParamModel Map flowInstance, @ParamModel Map activityInstance) {
+        try {
+            if (!Objects.isNull(activityInstance) && activityInstance.containsKey("id")) {
+                String flowName = flowInstance.get("name").toString();
+                String flowInstanceId = flowInstance.get("id").toString();
+                String activityInstanceId = activityInstance.get("id").toString();
+                CommonResult<List<IActivityInsParticiPantDto>> parRes = workflowClient.getActivityParticipants(activityInstanceId);
+                List<IActivityInsParticiPantDto> parts = parRes.getCheckedData();
+                CommonResult<IFlowInstance> desc = workflowClient.flowInstance(flowInstanceId);
+                for (int i = 0; i < parts.size(); i++) {
+                    String content = "您的" + flowName + "：["+desc.getCheckedData().getDescribtion()+"]，已经可以打印了，请及时打印并黏贴发票。";
+                    DingMessageDto message = new DingMessageDto(desc.getCheckedData().getCreateWorker(),content);
+                    dingApi.sendMessage(message);
+                }
+            }
+            return ok("true");
+        } catch (Exception e) {
+            log.error(e.getMessage(),e);
+            throw new BusinessException("执行事件出错，请联系管理员！");
+        }
+    }
 
 }

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/event/UseMoneyEvent.java

@@ -119,7 +119,7 @@ public class UseMoneyEvent extends BaseController {
                     flowDesc += "/" + LocalDateTimeUtils.format(entity.getCreateTime(), null);
                 }
                 if (entity.getTotalAmount()!=null) {
-                    flowDesc += "/" + entity.getTotalAmount();
+                    flowDesc += "/¥" + entity.getTotalAmount();
                 }
                 if (!Strings.isNullOrEmpty(entity.getRemark())) {
                     flowDesc += "/" + entity.getRemark();