优化

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

@@ -34,4 +34,6 @@ public class AppDeliveredApplyPageVo implements Vo {
     @ApiModelProperty("车架号")
     private String vinNo;
 
+    private String createBySid;
+
 }

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

@@ -51,7 +51,8 @@
                DATE_FORMAT(bd.createTime, '%Y-%m-%d')         as `date`,
                (select CONCAT_WS(',', group_concat(vinNo))
                 from bus_delivered_apply_details bss
-                where bss.applySid = bd.sid)                  as vinNo
+                where bss.applySid = bd.sid)                  as vinNo,
+        bd.createBySid
         FROM bus_delivered_apply bd
         <where>
             ${ew.sqlSegment}

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

@@ -1582,6 +1582,23 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         IPage<AppDeliveredApplyPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppDeliveredApplyPageVo> iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName());
+        List<AppDeliveredApplyPageVo> records = iPage.getRecords();
+        records.removeAll(Collections.singleton(null));
+        if(!records.isEmpty()){
+            for (AppDeliveredApplyPageVo appDeliveredApplyPageVo : records){
+                if(query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowDelete()){
+                    appDeliveredApplyPageVo.setShowDelete(true);
+                }else{
+                    appDeliveredApplyPageVo.setShowDelete(false);
+                }
+                if(query.getUserSid().equals(appDeliveredApplyPageVo.getCreateBySid()) && appDeliveredApplyPageVo.isShowUpdata()){
+                    appDeliveredApplyPageVo.setShowUpdata(true);
+                }else{
+                    appDeliveredApplyPageVo.setShowUpdata(false);
+                }
+            }
+
+        }
         PagerVo<AppDeliveredApplyPageVo> p = PagerUtil.pageToVo(iPage, null);
         return p;
     }
@@ -2129,6 +2146,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     }else{
                         variables.put("isDanBao",false);
                     }
+                }else{
+                    variables.put("isDanBao",false);
                 }
             }else{
                 variables.put("isDanBao",false);

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

@@ -86,4 +86,6 @@ public class AppScmVehicleGressionPageVo implements Vo {
     @ApiModelProperty("实例id")
     private String procInstId;
 
+    private String createBySid;
+
 }

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

@@ -57,7 +57,8 @@
                svg.applicantDate                               as applyDate,
                svg.applicantFunds                              as applyPrice,
                svg.taskId,
-               svg.procInstId
+               svg.procInstId,
+        svg.createBySid
         FROM scm_vehicle_gression svg
                  left join scm_vehicle_gression_veh svgg on svg.sid = svgg.mainSid
         <where>

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

@@ -481,6 +481,16 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         for (AppScmVehicleGressionPageVo record : records) {
             List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
             record.setScmVehicleGressionVehs(scmVehicleGressionVehVos);
+            if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowDetectBtn()){
+                record.setShowDetectBtn(true);
+            }else{
+                record.setShowDetectBtn(false);
+            }
+            if(query.getUserSid().equals(record.getCreateBySid()) && record.isShowUpdateBtn()){
+                record.setShowUpdateBtn(true);
+            }else{
+                record.setShowUpdateBtn(false);
+            }
             if ("已办结".equals(record.getState())) {
                 record.setShowDownloadBtn(true);
                 //查询出门证