Merge remote-tracking branch 'origin/master'

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

@@ -58,4 +58,7 @@ public class BusVehicleApplyVo implements Vo {
     private String purchaseSystemName;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
 }

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

@@ -19,7 +19,8 @@
                         bva.applyTypeKey,
                         bva.id,
                         bva.orgDeptSid,
-                        bva.createOrgSid useOrgSid
+                        bva.createOrgSid useOrgSid,
+                        bva.createBySid
         FROM bus_vehicle_apply bva
                  LEFT JOIN bus_vehicle_apply_detail bvad
                            ON bva.sid = bvad.`applySid`

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

@@ -231,6 +231,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                         record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
                     }
                 }
+                if(query.getUserSid().equals(record.getCreateBySid())){
+                    record.setAllowModify(true);
+                }else{
+                    record.setAllowModify(false);
+                }
             }
         }
         PagerVo<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java

@@ -75,5 +75,9 @@ public class BusDeliveredApplyVo implements Vo {
     @ApiModelProperty("流程定义id")
     private String procDefId;
 
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
+
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -106,6 +106,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -297,6 +300,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         IPage<BusDeliveredApply> page = PagerUtil.queryToPage(pq);
         IPage<BusDeliveredApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BusDeliveredApplyVo> records = pagging.getRecords();
+        for (BusDeliveredApplyVo record : records) {
+            if(query.getApplySid().equals(record.getCreateBySid())){
+                record.setAllowModify(true);
+            }else{
+                record.setAllowModify(false);
+            }
+        }
         PagerVo<BusDeliveredApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java

@@ -54,4 +54,8 @@ public class ScmVehicleGressionPageVo implements Vo {
     @ApiModelProperty("流程实例id")
     private String procInstId;
 
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -34,7 +34,8 @@
                svg.operator,
                svg.procDefId,
                svg.procInstId,
-               svg.temporaryCard
+               svg.temporaryCard,
+               svg.createBySid
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -299,6 +299,11 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
+            if(query.getUserSid().equals(record.getCreateBySid())){
+                record.setAllowModify(true);
+            }else{
+                record.setAllowModify(false);
+            }
             String sid = record.getSid();
             String type1 = "04"; //保单照片
             String type2 = "05"; //现场照片