移动端分享

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@@ -94,7 +94,7 @@ public interface BusVehicleApplyFeign {
     @PostMapping(value = "/abandonApply")
     ResultBean abandonApply(@RequestBody String[] sids);
 
-    @ApiOperation(value = "分享厂家采购")
+   /* @ApiOperation(value = "分享厂家采购")
     @PostMapping(value = "/shareBusVehicleApply")
-    ResultBean shareBusVehicleApply(@RequestBody ShareBusVehicleApplyQuery shareQuery);
+    ResultBean shareBusVehicleApply(@RequestBody ShareBusVehicleApplyQuery shareQuery);*/
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java

@@ -106,9 +106,4 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
     public ResultBean abandonApply(String[] sids) {
         return null;
     }
-
-    @Override
-    public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
-        return null;
-    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/app/AppVehicleApplyVo.java

@@ -54,6 +54,6 @@ public class AppVehicleApplyVo implements Vo {
     @ApiModelProperty("附件信息")
     private List<String> fileList = new ArrayList<>();
 
-    @ApiModelProperty("是否存在分享按钮")
-    private boolean haveShare;
+ /*   @ApiModelProperty("是否存在分享按钮")
+    private boolean haveShare;*/
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -77,8 +77,7 @@
                ba.createOrgName,
                ba.applyType,
                ba.payRemarks,
-               ba.orgDeptName,
-               if(length(ba.nodeState) > 0, true, false) as haveShare
+               ba.orgDeptName
         from bus_vehicle_apply ba
         where sid = #{sid}
     </select>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java

@@ -118,10 +118,10 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
         return busVehicleApplyService.abandonApply(sids);
     }
 
-    @Override
+/*    @Override
     public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
         return busVehicleApplyService.shareBusVehicleApply(shareQuery);
-    }
+    }*/
 
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.base.biz.busvehicleapply;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -54,7 +53,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysuser.ShareUserQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -66,7 +64,6 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.messagecenter.api.message.MessageFeign;
 import com.yxt.messagecenter.api.message.MessageFlowVo;
 import com.yxt.messagecenter.api.message.MessageFlowableQuery;
-import com.yxt.messagecenter.api.message.MessageFlowableQueryForCC;
 import com.yxt.messagecenter.api.messagelist.MessageListFeign;
 import com.yxt.messagecenter.api.messagetype.MessageTypeFeign;
 import org.apache.commons.lang3.StringUtils;
@@ -953,7 +950,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         return baseMapper.getActualAndOrgDept(vehicleOrderSid, modelSid, configSid);
     }
 
-    public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
+  /*  public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
         ResultBean rb = ResultBean.fireSuccess();
         log.info("分享功能，厂家采购参数：{}", JSONObject.toJSONString(shareQuery));
         //根据业务sid查询业务参数
@@ -1018,12 +1015,12 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             mfq.setModuleName(flowResultBean.getData().get("NAME_"));
             mfq.setMsgTitle(flowResultBean.getData().get("NAME_"));
         }
-        /*if("Event_end".equals(uff.getTaskDefKey())){
+        if("Event_end".equals(uff.getTaskDefKey())){
             mfq.setModuleAction("com.anrui.android.plugin.supplychain.activity.DetailPlanProductionActivity");
             mfq.setModuleAction2("/scm/#/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo");
             mfq.setModuleSid("98ff0724-5df4-4fc7-ab6d-3996e7706acd");
 
-        }*/
+        }
         ResultBean<String> stringResultBean = messageFeign.pushMessageShare(mfq);
         log.info("分享成功-resultBean:{}", resultBean);
         if (!resultBean.getSuccess()) {
@@ -1031,5 +1028,5 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return rb.setMsg("分享失败，推送消息异常！");
         }
         return rb.success().setMsg("分享成功！");
-    }
+    }*/
 }

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@@ -327,6 +327,7 @@ public class FlowableRest implements FlowableFeign {
                         HashMap<String, Object> map = new HashMap<>();
                         map.put("bv", dto);
                         UpdateFlowFieldVo ufVo = updateFlowFieldVoResultBean.getData();
+                        ufVo.setTaskId(dto.getTaskId());
                         map.put("uff", ufVo);
                         cc(map,dto.getTaskDefKey());
                     });
@@ -689,7 +690,7 @@ public class FlowableRest implements FlowableFeign {
         mfq.setUfVo(messageFlowVo);
         mfq.setModuleName(process.get("NAME_"));
         mfq.setMsgTitle(process.get("NAME_"));
-        ResultBean<String> resultBean = messageFeign.pushMessageCC(mfq);
+        ResultBean<String> resultBean = messageFeign.pushMessageShare(mfq);
         log.info("分享成功-resultBean:{}", resultBean);
         if (!resultBean.getSuccess()) {
             log.info("分享失败，分享消息异常！:{}", JSONObject.toJSONString(resultBean));

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java

@@ -58,8 +58,8 @@ public interface VehicleApplyFeign {
     @ResponseBody
     ResultBean<String> getFlowOperateTitle(@SpringQueryMap VehicleApplyQuery query);
 
-    @ApiOperation("厂家采购分享")
+  /*  @ApiOperation("厂家采购分享")
     @PostMapping("/shareMessage")
     @ResponseBody
-    ResultBean shareMessage(@RequestBody ShareVehicleApplyQuery shareQuery);
+    ResultBean shareMessage(@RequestBody ShareVehicleApplyQuery shareQuery);*/
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyVo.java

@@ -62,8 +62,8 @@ public class VehicleApplyVo implements Vo {
     @ApiModelProperty("附件信息")
     private List<String> fileList = new ArrayList<>();
 
-    @ApiModelProperty("是否存在分享按钮")
-    private boolean haveShare;
+/*    @ApiModelProperty("是否存在分享按钮")
+    private boolean haveShare;*/
 
 
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java

@@ -61,8 +61,8 @@ public class VehicleApplyRest implements VehicleApplyFeign {
         return vehicleApplyService.getFlowOperateTitle(query);
     }
 
-    @Override
+/*    @Override
     public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) {
         return vehicleApplyService.shareMessage(shareQuery);
-    }
+    }*/
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java

@@ -174,7 +174,7 @@ public class VehicleApplyService {
         return rb.success().setData(resultBean.getData());
     }
 
-    public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) {
+   /* public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) {
         ResultBean rb = ResultBean.fireFail();
         ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery();
         BeanUtil.copyProperties(shareQuery,shareBusVehicleApplyQuery);
@@ -183,5 +183,5 @@ public class VehicleApplyService {
             return rb.setMsg(resultBean.getMsg());
         }
         return rb.success();
-    }
+    }*/
 }