修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -28,6 +28,7 @@ public enum BillTypeEnum {
     GCRK("GCRK","挂车入库"),
     SZRK("SZRK","上装入库"),
     XSDDTCSQ("XSDDTCSQ","销售订单退车申请"),
+    QKTCSQ("QKTCSQ","欠款提车申请"),
     ;
 
     private String billType;

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

@@ -256,6 +256,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
+        if(StringUtils.isBlank(dto.getApplyTypeKey())){
+            return rb.setMsg("采购类型不能为空");
+        }
         List<CommonAppendixDto> commonAppendixs = dto.getCommonAppendixs();
         if (StringUtils.isBlank(sid)) {//新增
             //=======================================

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java

@@ -76,4 +76,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper<BusArrears
     int updateFlowFiled(Map<String, Object> map);
 
     void updateType(@Param("businessSid") String businessSid);
+
+    String selectNum(String bill);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml

@@ -86,7 +86,7 @@
     <update id="updateFlowFiled">
         UPDATE bus_arrears_carry_vehicle_apply
         SET nodeState=#{nodeState}
-        , nodeId=#{taskDefKey}
+        , taskDefKey=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -104,4 +104,12 @@
         set `type` = '2'
         where sid = #{businessSid}
     </update>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT(billNo, 4)
+        from bus_arrears_carry_vehicle_apply
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+        limit 1
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -16,7 +16,10 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
 import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto;
@@ -1205,6 +1208,25 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         return rb.success().setData(busArrearsCarryVehicleApply.getSid());*/
     }
 
+    public String getApplyCode(String orgSidPath) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.QKTCSQ.getBillType());
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) {
         ResultBean rb = ResultBean.fireFail();
        /* //根据用户sid获取staffSid

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.portal.api.sysorganization;
+
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:29
+ * @Description
+ */
+@Data
+public class SysFinanceVo {
+
+    private String userSid;
+
+    private String name;
+}

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java

@@ -184,4 +184,10 @@ public interface SysOrganizationFeign {
     @ResponseBody
     @ApiOperation("根据code查询组织信息")
     ResultBean<SysOrganization> selectByOrgCode(@RequestParam("orgCode") String orgCode);
+
+    @GetMapping("/selectFinance")
+    @ResponseBody
+    @ApiOperation("查询金融部主管人员")
+    ResultBean<List<SysFinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.portal.api.sysorganization;
 
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -187,4 +186,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign {
     public ResultBean<SysOrganization> selectByOrgCode(String orgCode) {
         return null;
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        return null;
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java

@@ -1,11 +1,12 @@
 package com.yxt.anrui.portal.biz.sysorganization;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.portal.api.sysorganization.*;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -92,7 +93,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
      * @param sid
      * @return
      */
-    SysOrganizationVo getUseOrgBySid(@Param("sid")String sid);
+    SysOrganizationVo getUseOrgBySid(@Param("sid") String sid);
 
     int updateQrCodePath(@Param("sid") String sid, @Param("path") String path);
 
@@ -106,6 +107,7 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     SysOrgVo getListOrgByBrand(String sid);
 
     List<SysOrganizationListVo> selectOrgList(String orgSid);
+
     List<SysOrganizationListsVo> selectOrgLists(String orgSid);
 
     List<SysOrgStaffVo> selectByOrgDeptSid(String orgDeptSid);
@@ -122,4 +124,6 @@ public interface SysOrganizationMapper extends BaseMapper<SysOrganization> {
     List<SysOrganizationVo> selectOrgByPSid(String psid);
 
     int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath);
+
+    List<SysFinanceVo> selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@@ -231,4 +231,8 @@
         where orgSid = #{orgSid}
           and manageType = '3'
     </update>
+
+    <select id="selectBy" resultType="com.yxt.anrui.portal.api.sysorganization.SysFinanceVo">
+        select managerSid as userSid,managerName as name from sys_organization where psid = #{useOrgSid} and name = #{name}
+    </select>
 </mapper>

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.QRCodeUtil;
@@ -443,4 +444,12 @@ public class SysOrganizationRest implements SysOrganizationFeign {
         SysOrganization sysOrganization = sysOrganizationService.selectByOrgCode(orgCode);
         return rb.success().setData(sysOrganization);
     }
+
+    @Override
+    public ResultBean<List<SysFinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<SysFinanceVo>> rb = ResultBean.fireFail();
+        String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData();
+        List<SysFinanceVo> list = sysOrganizationService.selectBy("金融服务部",useOrgSid);
+        return rb.success().setData(list);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService;
 import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.terminal.api.base.common.FinanceVo;
 import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -212,16 +213,16 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
             if (StringUtils.isNotBlank(sysStaffOrg.getOrgSidPath())) {
                 StringBuilder orgName = new StringBuilder();
                 List<String> split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/"));
-                if(split.size()>1){
-                    for(int i = 0;i<split.size();i++){
+                if (split.size() > 1) {
+                    for (int i = 0; i < split.size(); i++) {
                         SysOrganization sysOrganization = fetchBySid(split.get(i));
-                        if(i == 0){
+                        if (i == 0) {
                             orgName = orgName.append(sysOrganization.getName());
-                        }else{
+                        } else {
                             orgName = orgName.append("/").append(sysOrganization.getName());
                         }
                     }
-                }else{
+                } else {
                     SysOrganization sysOrganization = fetchBySid(split.get(0));
                     orgName = orgName.append(sysOrganization.getName());
                 }
@@ -276,7 +277,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         }
         entity.setOrgSidPath(sysOrganization.getOrgSidPath() + "/" + entity.getSid());
         //根据主管人员sid获取主管姓名
-        if(StringUtils.isNotBlank(zgStaffSid)){
+        if (StringUtils.isNotBlank(zgStaffSid)) {
             SysStaffinfo sysStaffinfo = sysStaffInfoService.fetchBySid(zgStaffSid);
             entity.setManagerName(sysStaffinfo.getName());
             SysUserVo sysUser = sysUserService.selectByStaffsid(zgStaffSid);
@@ -305,7 +306,7 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         SysOrganizationVo vo = new SysOrganizationVo();
         BeanUtil.copyProperties(entity, vo);
         SysUser sysUser = sysUserService.fetchBySid(entity.getManagerSid());
-        if(sysUser != null){
+        if (sysUser != null) {
             vo.setZgStaffSid(sysUser.getStaffSid());
             vo.setZgNames(entity.getManagerName());
         }
@@ -323,9 +324,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         for (int i = 0; i < orgSidPathArr.length; i++) {
             Map<String, Object> m = new HashMap<>();
             // app选择组织时 map 存值key要求这个是空字符串
-            if("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])){//河北安瑞集团的sid
+            if ("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])) {//河北安瑞集团的sid
                 m.put("sid", "");
-            }else{
+            } else {
                 m.put("sid", orgSidPathArr[i]);
             }
 //            m.put("sid", orgSidPathArr[i]);
@@ -572,9 +573,9 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSid = getOrgSid(orgDeptSid);*/
         String orgSid = "";
         String orgDeptSid = "";
-        if(StringUtils.isNotBlank(query.getOrgPath())){
+        if (StringUtils.isNotBlank(query.getOrgPath())) {
             orgSid = sysStaffOrgService.getOrgSidByPath(query.getOrgPath()).getData();
-        }else{
+        } else {
             orgDeptSid = sysStaffOrgService.selectByUserSid(query.getUserSid());
             orgSid = getOrgSid(orgDeptSid);
         }
@@ -639,26 +640,30 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
         String orgSidPath = entity.getOrgSidPath();
         //部门名称全路径
         String orgNamePath = "";
-        if(StringUtils.isNotBlank(orgSidPath)){
+        if (StringUtils.isNotBlank(orgSidPath)) {
             StringBuilder orgNamePath1 = new StringBuilder();
             List<String> split = Arrays.asList(orgSidPath.split("/"));
-            if(split.size()>1){
-                for(int i = 0;i<split.size();i++){
+            if (split.size() > 1) {
+                for (int i = 0; i < split.size(); i++) {
                     SysOrganization sysOrganization = fetchBySid(split.get(i));
-                    if(i == 0){
+                    if (i == 0) {
                         orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
-                    }else{
+                    } else {
                         orgNamePath1 = orgNamePath1.append("/").append(sysOrganization.getName());
                     }
                 }
-            }else{
+            } else {
                 SysOrganization sysOrganization = fetchBySid(split.get(0));
                 orgNamePath1 = orgNamePath1.append(sysOrganization.getName());
             }
             orgNamePath = orgNamePath1.toString();
         }
         //更新关联该部门的所有员工的关联表中的部门名称、部门全路径以及名称全路径
-        baseMapper.updateOrgBySid(entity.getSid(),orgName,orgSidPath,orgNamePath);
+        baseMapper.updateOrgBySid(entity.getSid(), orgName, orgSidPath, orgNamePath);
         return rb.success();
     }
+
+    public List<SysFinanceVo> selectBy(String name, String useOrgSid) {
+        return baseMapper.selectBy(name,useOrgSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java

@@ -37,4 +37,9 @@ public interface CommonFeign {
     @ResponseBody
     @GetMapping("/getSystem")
     ResultBean<List<SystemVo>> getSystem(@RequestParam("orgPath")String orgPath);
+
+    @ApiOperation(value = "获取金融部门主管")
+    @ResponseBody
+    @GetMapping("/selectFinance")
+    ResultBean<List<FinanceVo>> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid);
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.base.common;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/4/28 10:25
+ * @Description
+ */
+@Data
+public class FinanceVo {
+
+    @JsonProperty("dictKey")
+    private String userSid;
+    @JsonProperty("dictValue")
+    private String name;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java

@@ -25,8 +25,8 @@ public class CommonRest implements CommonFeign {
     private CommonService commonService;
 
     @Override
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
-        return commonService.getPublicModelList(modelSid,orgPath);
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
+        return commonService.getPublicModelList(modelSid, orgPath);
     }
 
     @Override
@@ -38,4 +38,9 @@ public class CommonRest implements CommonFeign {
     public ResultBean<List<SystemVo>> getSystem(String orgPath) {
         return commonService.getSystem(orgPath);
     }
+
+    @Override
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        return commonService.selectFinance(orgPath, userSid);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java

@@ -9,10 +9,9 @@ import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery;
 import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo;
 import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign;
-import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
-import com.yxt.anrui.terminal.api.base.common.SystemVo;
-import com.yxt.anrui.terminal.api.base.common.TopConfigQuery;
-import com.yxt.anrui.terminal.api.base.common.TopConfigVo;
+import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.terminal.api.base.common.*;
 import com.yxt.anrui.terminal.config.CoverUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -39,10 +38,12 @@ public class CommonService {
     private BaseVehinstallmodelFeign baseVehinstallmodelFeign;
     @Autowired
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
-    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid,String orgPath) {
+    public ResultBean<List<PublicModelVo>> getPublicModelList(String modelSid, String orgPath) {
         ResultBean<List<PublicModelVo>> rb = ResultBean.fireFail();
-        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid,orgPath);
+        ResultBean<List<AnnouncementVo>> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid, orgPath);
         List<PublicModelVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
@@ -64,4 +65,11 @@ public class CommonService {
         List<SystemVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList());
         return rb.success().setData(list);
     }
+
+    public ResultBean<List<FinanceVo>> selectFinance(String orgPath, String userSid) {
+        ResultBean<List<FinanceVo>> rb = ResultBean.fireFail();
+        ResultBean<List<SysFinanceVo>> resultBean = sysOrganizationFeign.selectFinance(orgPath, userSid);
+        List<FinanceVo> list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinanceVo.class)).collect(Collectors.toList());
+        return rb.success().setData(list);
+    }
 }