Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1621,8 +1621,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         if (StringUtils.isNotBlank(resultBean.getData())) {
             qw.eq("bv.createOrgSid", resultBean.getData());
         }
-        qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
-        qw.and(wrapper -> wrapper.eq("bv.witPinState", VehicleState.ShuntingEnum.UN_SHUNTING.getCode()).or().eq("bv.witPinState", VehicleState.ShuntingEnum.WITPURCHASE));
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         List<AppScmWarehouseVinVo> list = baseMapper.getVinByWarehouseSid(warehouseSid, qw);
         if (list.size() <= 0) {
             return rb.setMsg("该存放地点，暂无车辆");
@@ -1633,9 +1632,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
         ResultBean rb = ResultBean.fireFail();
         String userOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        //条件：本分公司、非删除、库存或采购退库中
+        //条件：本分公司、非删除、库存或采购退库中或调入或调出中
         QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
-        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()));
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.RETURNING_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
         List<AppScmInventoryRecordsVo> list = baseMapper.selectInventoryRecords(userOrgSid, qw);
         return rb.success().setData(list);
     }
@@ -2158,6 +2157,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
     }
 
     public BaseVehicle selVehicleByVinNoAndOrgSid(String vinNo, String createOrgSid) {
-        return baseMapper.selVehicleByVinNoAndOrgSid(vinNo,createOrgSid);
+        return baseMapper.selVehicleByVinNoAndOrgSid(vinNo, createOrgSid);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml

@@ -95,7 +95,6 @@
                 </if>
             </where>
         </if>
-        order by bmd.id desc
     </select>
 
     <delete id="deleteVirtualOrder">

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@@ -12,7 +12,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
     @ApiModelProperty("收款账号")
     private String collectionNum;
     @ApiModelProperty("状态")
-    private String collectionBillState;
+    private int collectionBillState;
     @ApiModelProperty("收款银行")
     private String collectionBank;
     @ApiModelProperty("收款类型")
@@ -34,7 +34,7 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
     @ApiModelProperty("是否显示删除")
     private boolean showDelete;
     @ApiModelProperty("认款状态")
-    private String state;
+    private int state;
 
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@@ -93,6 +93,10 @@ public interface FinCollectionConfirmationFeign {
     @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
     public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端—款项确认申请详情")
+    @GetMapping("/getCollectionConfirmDetail/{collectionBillSid}")
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid);
+
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitCollectionConfirm")
     public ResultBean submitCollectionConfirm(@RequestBody AppFinCollectionConfirmationDto dto);

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@@ -47,65 +47,70 @@ import org.springframework.stereotype.Component;
 @Component
 public class FinCollectionConfirmationFeignFallback implements FinCollectionConfirmationFeign {
 
-	@Override
-	public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(PagerQuery<FinCollectionConfirmationQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
-	}
+    @Override
+    public ResultBean<PagerVo<FinCollectionConfirmationVo>> listPage(PagerQuery<FinCollectionConfirmationQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincollectionconfirmation/listPage无法访问");
+    }
 
-	@Override
-	public ResultBean save(FinCollectionConfirmationDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");
-	}
+    @Override
+    public ResultBean save(FinCollectionConfirmationDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/save无法访问");
+    }
 
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问");
-	}
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-fin/fincollectionconfirmation/delBySids无法访问");
+    }
 
-	@Override
-	public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问");
-	}
+    @Override
+    public ResultBean<FinCollectionConfirmationDetailsVo> fetchBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-fin/fincollectionconfirmation/fetchBySid无法访问");
+    }
 
-	@Override
-	public ResultBean cashierConfirm(String sid) {
-		return null;
-	}
+    @Override
+    public ResultBean cashierConfirm(String sid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean cashierReject(String sid) {
-		return null;
-	}
+    @Override
+    public ResultBean cashierReject(String sid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<AppFinCollectionConfirmationPageVo>> getCollectionConfirmList(PagerQuery<AppFinCollectionConfirmationQuery> pagerQuery) {
+        return null;
+    }
 
-	@Override
-	public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
-		return null;
-	}
+    @Override
+    public ResultBean addCollectionConfirm(AppFinCollectionConfirmationDto dto) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<AppFinCollectionConfirmationInitVo> initCollectionConfirm(String collectionBillSid, String userSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
-		return null;
-	}
+    @Override
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+        return null;
+    }
 
-	@Override
-	public ResultBean deleteCollectionConfirm(String collectionBillSid) {
-		return null;
-	}
+    @Override
+    public ResultBean submitCollectionConfirm(AppFinCollectionConfirmationDto dto) {
+        return null;
+    }
 
-	@Override
-	public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
-		return null;
-	}
+    @Override
+    public ResultBean deleteCollectionConfirm(String collectionBillSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppFinUncollectedReceivablesDetailedVo>> getPaymentDetailsList(PagerQuery<AppFinSelectedReceivablesPaymentDetailsQuery> pagerQuery) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@@ -87,5 +87,13 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
     void cashierConfirm(String sid);
 
     @Update("update fin_collection_confirmation set paymentState = #{paymentState} where sid = #{sid}")
-    void updatePaymentStateBySid(@Param("sid") String sid,@Param("paymentState") int paymentState);
+    void updatePaymentStateBySid(@Param("sid") String sid, @Param("paymentState") int paymentState);
+
+    /**
+     * 手机端—款项确认申请详情
+     *
+     * @param collectionBillSid
+     * @return
+     */
+    AppFinCollectionConfirmationDetailedVo getCollectionConfirmDetail(String collectionBillSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@@ -18,9 +18,11 @@
     <!--手机端—获取款项确认列表-->
     <select id="getCollectionConfirmList"
             resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationPageVo">
-        select sid AS collectionBillSid,
+        SELECT
+        sid AS collectionBillSid,
         collectionBankNum AS collectionNum,
-        subscriptionState AS collectionBillState,
+        auditState AS collectionBillState,
+        paymentState AS `state`,
         collectionBank,
         collectionTypeValue AS collectionType,
         collectionDate,
@@ -28,7 +30,10 @@
         collectionMoney,
         remarks,
         balance
-        from fin_collection_confirmation
+        FROM
+        fin_collection_confirmation
+        ORDER BY
+        id DESC
         <where>
             ${ew.sqlSegment}
         </where>
@@ -49,4 +54,17 @@
         WHERE sid = #{collectionBillSid}
           AND useOrgSid = #{useOrgSid}
     </select>
+    <select id="getCollectionConfirmDetail"
+            resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinCollectionConfirmationDetailedVo">
+        SELECT collectionBank,
+               collectionDate,
+               payerName           AS paymentName,
+               collectionBankNum   AS collectionNum,
+               collectionTypeValue AS collectionType,
+               collectionMoney AS paymentMoney,
+               paymentVoucherUrl,
+               remarks
+        FROM fin_collection_confirmation
+        WHERE sid = #{collectionBillSid}
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@@ -135,6 +135,17 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
         return finCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
     }
 
+    /**
+     * 手机端—款项确认申请详情
+     *
+     * @param collectionBillSid
+     * @return
+     */
+    @Override
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+        return finCollectionConfirmationService.getCollectionConfirmDetail(collectionBillSid);
+    }
+
     /**
      * 手机端—提交款项确认申请
      *

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -347,13 +347,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         IPage<AppFinCollectionConfirmationPageVo> collectionConfirmList = baseMapper.getCollectionConfirmList(page, qw);
         for (AppFinCollectionConfirmationPageVo record : collectionConfirmList.getRecords()) {
             Integer balance = record.getBalance();
-            String collectionBillState = record.getCollectionBillState();
-            if (balance <= 0 || collectionBillState.equals("1") || collectionBillState.equals("3")) {
+            int collectionBillState = record.getCollectionBillState();
+            if (balance <= 0 || collectionBillState == 1 || collectionBillState == 3) {
                 record.setShowHandle(false);
             }
             record.setShowDownload(false);
             List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos = finSelectedReceivablesDetailedService.fetchByCillSid(record.getCollectionBillSid());
-            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != "1") {
+            if (finSelectedReceivablesDetailedVos.size() > 0 || collectionBillState != 1) {
                 record.setShowDelete(false);
             }
         }
@@ -410,7 +410,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
                 commonAppendixFeign.save(commonAppendixDto);
             }
-            payFilePath += payFilePath + ",";
+            payFilePath = payFilePath + ",";
         }
         if (StringUtils.isNotBlank(payFilePath)) {
             finCollectionConfirmation.setPaymentVoucherUrl(payFilePath);
@@ -427,6 +427,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             return rb.setMsg("已选应收款项金额已超出该确认单应收金额总额，请重新核对");
         }
         finCollectionConfirmation.setBalance(totalSubscriptionMone);
+        finCollectionConfirmation.setPaymentState(1);
         finCollectionConfirmation.setAuditState(1);
         save(finCollectionConfirmation);
         return rb.success();
@@ -449,6 +450,26 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         return rb.success().setData(vo);
     }
 
+    /**
+     * 手机端—款项确认申请详情
+     *
+     * @param collectionBillSid
+     * @return
+     */
+    public ResultBean<AppFinCollectionConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+        ResultBean<AppFinCollectionConfirmationDetailedVo> rb = ResultBean.fireFail();
+        List<String> payFiles = new ArrayList<>();
+        AppFinCollectionConfirmationDetailedVo vo = baseMapper.getCollectionConfirmDetail(collectionBillSid);
+        if (StringUtils.isNotBlank(vo.getPaymentVoucherUrl())) {
+            String[] split = vo.getPaymentVoucherUrl().split(",");
+            for (String s : split) {
+                payFiles.add(fileUploadComponent.getUrlPrefix() + s);
+            }
+            vo.setPayFiles(payFiles);
+        }
+        return rb.success().setData(vo);
+    }
+
     /**
      * 手机端—提交款项确认申请
      *

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeign.java

@@ -132,5 +132,8 @@ public interface SysStaffinfoFeign {
     @PostMapping("/getUserList")
     ResultBean<PagerVo<AppSysStaffVo>> getUserList(@RequestBody PagerQuery<AppSysStaffQuery> pagerQuery);
 
-
+    @ApiOperation("移动端-存放地点变更-获取人员列表")
+    @ResponseBody
+    @GetMapping("/getGressionUserList/{userSid}")
+    ResultBean<List<AppSysStaffVo>> getGressionUserList(@PathVariable("userSid") String userSid);
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstaffinfo/SysStaffinfoFeignFallback.java

@@ -88,4 +88,9 @@ public class SysStaffinfoFeignFallback implements SysStaffinfoFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
+        return null;
+    }
+
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -120,4 +120,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
     List<Map<String, String>> getStaffNameByDeptSid(@Param(Constants.WRAPPER) Wrapper<Map<String, Object>> qw);
 
     IPage<AppSysStaffVo> getUserList(IPage<SysStaffinfo> page, @Param(Constants.WRAPPER) QueryWrapper<AppSysStaffVo> qw, @Param("orgSid") String orgSid);
+
+    List<AppSysStaffVo> getGressionUserList(@Param("userOrgSid")String userOrgSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.xml

@@ -9,21 +9,21 @@
         SELECT staff.sid, staff.name, staff.mobile, staff.pinYinName, staff.firstPinYinLabel, user.headImage
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         ORDER BY staff.firstPinYinLabel = '#', staff.firstPinYinLabel ASC, staff.pinYinName
     </select>
 
     <select id="searchAppContactsPageList"
             resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoAppContactsSearchVo">
         SELECT staff.sid,
-               staff.name,
-               staff.mobile,
-               staff.position,
-               user.headImage,
-               GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
+        staff.name,
+        staff.mobile,
+        staff.position,
+        user.headImage,
+        GROUP_CONCAT(org.orgName SEPARATOR '/') orgName
         FROM sys_staffinfo staff
-                 LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
-                 LEFT JOIN sys_user user ON staff.sid = user.staffSid
+        LEFT JOIN sys_staff_org org ON org.staffSid = staff.sid
+        LEFT JOIN sys_user user ON staff.sid = user.staffSid
         WHERE 1 = 1
         <if test="mobileStr != null and mobileStr != ''">
             AND staff.mobile LIKE concat('%', #{mobileStr}, '%')
@@ -49,8 +49,8 @@
                GROUP_CONCAT(org.orgNamePath SEPARATOR '/') orgNamePath
         FROM sys_staffinfo staff
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
-                 LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
+        ON staff.sid = user.staffSid
+            LEFT JOIN sys_staff_org org ON staff.sid = org.staffSid
         WHERE staff.sid = #{staffSid}
         GROUP BY staff.sid
     </select>
@@ -68,15 +68,14 @@
         FROM sys_staff_org org
                  INNER JOIN sys_staffinfo staff ON org.staffSid = staff.sid
                  LEFT JOIN sys_user user
-                           ON staff.sid = user.staffSid
+        ON staff.sid = user.staffSid
         WHERE org.orgSid = #{sid}
     </select>
     <!--根据员工类型key查询员工工号的最大号-->
     <select id="selectJobNumber" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
         select *
         from sys_staffinfo
-        order by jobNumber desc
-        limit 1
+        order by jobNumber desc limit 1
     </select>
     <!--根据手机号查询员工是否重复-->
     <select id="selectByMobile" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@@ -105,24 +104,24 @@
         DATE_FORMAT(si.joinCompnyDate, '%Y-%m-%d') AS joinCompnyDate,
         <!--所在部门-->
         (select GROUP_CONCAT(orgName SEPARATOR ',') orgName from sys_staff_org so where so.staffSid = si.sid) as
-            orgName,
+        orgName,
         <!--所在部门sid-->
         (select GROUP_CONCAT(orgSid SEPARATOR ',') orgSid from sys_staff_org so where so.staffSid = si.sid) as
-            orgSid,
+        orgSid,
         <!--岗位-->
         (select GROUP_CONCAT(sp.name SEPARATOR ',') postName
-         from sys_staff_post ssp
-                  left join sys_post sp on
-                 sp.sid =
-                 ssp.postSid
-         where ssp.staffSid = si.sid
-         group by ssp.id) as postName
+        from sys_staff_post ssp
+        left join sys_post sp on
+        sp.sid =
+        ssp.postSid
+        where ssp.staffSid = si.sid
+        group by ssp.id) as postName
         from sys_staffinfo si
-                 LEFT JOIN sys_staff_org so
-                           ON so.staffSid = si.sid
-                 LEFT JOIN sys_staff_post ssp
-                           ON ssp.staffSid = si.sid
-            ${ew.customSqlSegment}
+        LEFT JOIN sys_staff_org so
+        ON so.staffSid = si.sid
+        LEFT JOIN sys_staff_post ssp
+        ON ssp.staffSid = si.sid
+        ${ew.customSqlSegment}
     </select>
     <!--根据员工手机号和sid查询员工信息是否已存在-->
     <select id="selectByMobileAndSid" resultType="com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfo">
@@ -250,8 +249,8 @@
         isHaveInsurance,
         <!--意外险参保：1是，0否-->
         case isHaveInsurance
-            when 1 then '是'
-            when 0 then '否' end as isHaveInsuranceValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInsuranceValue,
         <!--意外险参保时间-->
         DATE_FORMAT(insuranceStartDate, '%Y-%m-%d') as insuranceStartDate,
         <!--意外险参保终止日期-->
@@ -262,26 +261,26 @@
         isHaveAged,
         <!--养老:1是，0否-->
         case isHaveAged
-            when 1 then '是'
-            when 0 then '否' end as isHaveAgedValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveAgedValue,
         <!--医疗:1是，0否-->
         isHaveMedical,
         <!--医疗:1是，0否-->
         case isHaveMedical
-            when 1 then '是'
-            when 0 then '否' end as isHaveMedicalValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveMedicalValue,
         <!--工伤：1是，0否-->
         isHaveInjury,
         <!--工伤：1是，0否-->
         case isHaveInjury
-            when 1 then '是'
-            when 0 then '否' end as isHaveInjuryValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveInjuryValue,
         <!--失业：1是，0否-->
         isHaveUnemploy,
         <!--失业：1是，0否-->
         case isHaveUnemploy
-            when 1 then '是'
-            when 0 then '否' end as isHaveUnemployValue,
+        when 1 then '是'
+        when 0 then '否' end as isHaveUnemployValue,
         <!--社保参保地-->
         insuredPlace,
         <!--纸质档案保管地-->
@@ -329,24 +328,46 @@
     </select>
 
     <select id="getUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
-        select su.sid         userSid,
-               si.name        userName,
-               su.headImage,
-               si.mobile      userMobile,
-               sso.orgName as department,
-               sp.name
+        select su.sid userSid,
+        si.name userName,
+        su.headImage,
+        si.mobile userMobile,
+        sso.orgName as department,
+        sp.name
         from sys_staff_org sso
-                 left join sys_staffinfo si on sso.staffSid = si.sid
-                 left join sys_user su on si.sid = su.staffSid
-                 left join sys_staff_post ssp on si.sid = ssp.staffSid
-                 left join sys_post sp on sp.sid = ssp.postSid
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
         <where>
             ${ew.sqlSegment}
             <if test="orgSid != null and orgSid != ''">
                 and find_in_set(#{orgSid}
-                  , replace (sso.orgSidPath
-                  , '/'
-                  , ','))
+                , replace (sso.orgSidPath
+                , '/'
+                , ','))
+            </if>
+        </where>
+    </select>
+
+    <select id="getGressionUserList" resultType="com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo">
+        select su.sid as userSid,
+        si.name as userName,
+        su.headImage,
+        si.mobile as userMobile,
+        sso.orgName as department,
+        sp.name
+        from sys_staff_org sso
+        left join sys_staffinfo si on sso.staffSid = si.sid
+        left join sys_user su on si.sid = su.staffSid
+        left join sys_staff_post ssp on si.sid = ssp.staffSid
+        left join sys_post sp on sp.sid = ssp.postSid
+        <where>
+            <if test="userOrgSid != null and userOrgSid != ''">
+                and find_in_set(#{userOrgSid}
+                , replace (sso.orgSidPath
+                , '/'
+                , ','))
             </if>
         </where>
     </select>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoRest.java

@@ -194,5 +194,10 @@ public class SysStaffinfoRest implements SysStaffinfoFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
+        return sysStaffinfoService.getGressionUserList(userSid);
+    }
+
 
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java

@@ -633,4 +633,11 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         PagerVo<AppSysStaffVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean<List<AppSysStaffVo>> getGressionUserList(String userSid) {
+        ResultBean<List<AppSysStaffVo>> rb = ResultBean.fireFail();
+        String userOrgSid = sysStaffOrgService.getPathSidByUserSid(userSid).getData();
+        List<AppSysStaffVo> list = baseMapper.getGressionUserList(userOrgSid);
+        return rb.success().setData(list);
+    }
 }

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

@@ -31,6 +31,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -91,9 +92,9 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("保单照片")
-    private List<String> policyImage;
+    private List<String> policyImage = new ArrayList<>();
     @ApiModelProperty("现场照片")
-    private List<String> image;
+    private List<String> image = new ArrayList<>();
     @ApiModelProperty("地址")
     private String address;
     @ApiModelProperty("经纬度")
@@ -105,4 +106,9 @@ public class AppScmVehicleGressionDetailsVo implements Vo {
     @ApiModelProperty("实例id")
     private String procInstId;
 
+    @ApiModelProperty("调出方负责人名称")
+    private String staffName;
+    @ApiModelProperty("调出方负责人用户sid")
+    private String personUserSid;
+
 }

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

@@ -104,4 +104,9 @@ public class AppScmVehicleGressionInfoVo implements Vo {
     @ApiModelProperty("现场照片")
     private List<String> image;
 
+    @ApiModelProperty("调出方负责人名称")
+    private String staffName;
+    @ApiModelProperty("调出方负责人用户sid")
+    private String personUserSid;
+
 }

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

@@ -434,14 +434,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         List<String> image = new ArrayList<>();
         AppScmVehicleGressionDetailsVo vo = baseMapper.getCarTransfer(sid);
         List<ScmFile> scmFiles1 = scmFileService.selectByLinkSid(sid, type1);
-        for (ScmFile scmFile : scmFiles1) {
-            policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        if (scmFiles1.size() > 0) {
+            for (ScmFile scmFile : scmFiles1) {
+                policyImage.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            }
         }
         vo.setPolicyImage(policyImage);
 
         List<ScmFile> scmFiles2 = scmFileService.selectByLinkSid(sid, type2);
-        for (ScmFile scmFile : scmFiles2) {
-            image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+        if (scmFiles2.size() > 0) {
+            for (ScmFile scmFile : scmFiles2) {
+                image.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath());
+            }
         }
         vo.setImage(image);
         return vo;
@@ -605,7 +609,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         if (scmVehicleGressionVos.size() > 0) {
             if (StringUtils.isNotBlank(scmVehicleGressionVos.get(0).getNodeState())) {
                 if (!(scmVehicleGressionVos.get(0).getNodeState().contains("已办结") || scmVehicleGressionVos.get(0).getNodeState().contains("终止") || scmVehicleGressionVos.get(0).getNodeState().contains("申请"))) {
-                    return rb.setMsg("该申请已存在，请务重复提交！");
+                    return rb.setMsg("该申请已存在，请勿重复提交！");
                 }
             }
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -291,8 +291,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         scmVehicleInventory.setInventoryDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
         String loginName = dto.getLoginName();
         String loginSid = dto.getLoginSid();
-        inventoryName += "、" + loginName;
-        inventorySid += "," + loginSid;
+        if (StringUtils.isNotBlank(loginName)) {
+            inventoryName += "、" + loginName;
+        }
+        if (StringUtils.isNotBlank(loginSid)) {
+            inventorySid += "," + loginSid;
+        }
         scmVehicleInventory.setCreateOrgSid(loginSid);
         scmVehicleInventory.setInventoryName(inventoryName);
         scmVehicleInventory.setInventorySid(inventorySid);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -283,7 +283,7 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         }
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
         String sid = scmVehiclePatrolinspectionsheet.getSid();
-        BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet);
+        BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet,"sid");
         scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
         scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
         List<String> images = dto.getImages();

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeign.java

@@ -68,6 +68,10 @@ public interface AppFinCollectionConfirmationFeign {
     @GetMapping("/initCollectionConfirm/{collectionBillSid}/{userSid}")
     public ResultBean<ConfirmationInitVo> initCollectionConfirm(@PathVariable("collectionBillSid") String collectionBillSid, @PathVariable("userSid") String userSid);
 
+    @ApiOperation("手机端—款项确认申请详情")
+    @GetMapping("/getCollectionConfirmDetail/{collectionBillSid}")
+    public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(@PathVariable("collectionBillSid") String collectionBillSid);
+
     @ApiOperation("手机端—提交款项确认申请")
     @PostMapping("/submitCollectionConfirm")
     public ResultBean submitCollectionConfirm(@RequestBody ConfirmationDto dto);

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/AppFinCollectionConfirmationFeignFallback.java

@@ -64,6 +64,11 @@ public class AppFinCollectionConfirmationFeignFallback implements AppFinCollecti
 		return null;
 	}
 
+	@Override
+	public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean submitCollectionConfirm(ConfirmationDto dto) {
 		return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationRest.java

@@ -50,6 +50,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Api(tags = "收款确认表")
 @RequestMapping("finance/v1/collectionConfirm")
+@RestController
 public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirmationFeign {
 
     @Autowired
@@ -90,6 +91,17 @@ public class AppFinCollectionConfirmationRest implements AppFinCollectionConfirm
         return appfinCollectionConfirmationService.initCollectionConfirm(collectionBillSid, userSid);
     }
 
+    /**
+     * 手机端—款项确认申请详情
+     *
+     * @param collectionBillSid
+     * @return
+     */
+    @Override
+    public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+        return appfinCollectionConfirmationService.getCollectionConfirmDetail(collectionBillSid);
+    }
+
     /**
      * 手机端—提交款项确认申请
      *

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/finance/collectionConfirm/AppFinCollectionConfirmationService.java

@@ -29,10 +29,7 @@ package com.yxt.anrui.terminal.biz.finance.collectionConfirm;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.*;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*;
-import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationDto;
-import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationInitVo;
-import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageQuery;
-import com.yxt.anrui.terminal.api.finance.collectionConfirm.ConfirmationPageVo;
+import com.yxt.anrui.terminal.api.finance.collectionConfirm.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -108,6 +105,24 @@ public class AppFinCollectionConfirmationService {
         return rb.success().setData(vo);
     }
 
+    /**
+     * 手机端—款项确认申请详情
+     *
+     * @param collectionBillSid
+     * @return
+     */
+    public ResultBean<ConfirmationDetailedVo> getCollectionConfirmDetail(String collectionBillSid) {
+        ResultBean<ConfirmationDetailedVo> rb = ResultBean.fireFail();
+        ConfirmationDetailedVo vo = new ConfirmationDetailedVo();
+        ResultBean<AppFinCollectionConfirmationDetailedVo> resultBean = finCollectionConfirmationFeign.getCollectionConfirmDetail(collectionBillSid);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        AppFinCollectionConfirmationDetailedVo data = resultBean.getData();
+        BeanUtil.copyProperties(data, vo);
+        return rb.success().setData(vo);
+    }
+
     /**
      * 手机端—提交款项确认申请
      *