修改

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java

@@ -41,4 +41,6 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper<LoanRepurchaseAppl
     String selFundAllByBusVinSid(@Param("busVinSid") String busVinSid);
 
     int updateBus(@Param("busVinSid") String busVinSid);
+
+    String selectNum(String billNo);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml

@@ -204,4 +204,12 @@
         AND p.busVinSid = #{busVinSid}
         AND p.dueDate <= NOW()) AS a) as b
     </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from loan_repurchase_apply
+        where billNo LIKE concat(#{billNo}, '%')
+        order by billNo desc
+            limit 1
+    </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
+import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo;
@@ -427,19 +429,27 @@ public class LoanRepurchaseApplyService extends MybatisBaseService<LoanRepurchas
             sid = apply.getSid();
             apply.setCreateBySid(dto.getUserSid());
             apply.setOrgSidPath(dto.getOrgPath());
-            ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath());
-            if (orgSidByPath.getSuccess()) {
-                String userOrgSid = orgSidByPath.getData();
-                apply.setUseOrgSid(userOrgSid);
-                ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(userOrgSid);
-                if (organizationVo.getSuccess()) {
-                    SysOrganizationVo organizationVoData = organizationVo.getData();
-                    if (null != organizationVoData) {
-                        apply.setUseOrgName(organizationVoData.getName());
-                    }
+            String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
+            apply.setUseOrgSid(useOrgSid);
+            ResultBean<SysOrganizationVo> organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid);
+            if (organizationVo.getSuccess()) {
+                SysOrganizationVo organizationVoData = organizationVo.getData();
+                if (null != organizationVoData) {
+                    apply.setUseOrgName(organizationVoData.getName());
                 }
             }
             apply.setNodeState("待提交");
+            String billNo = "";
+            String date = DateUtil.format(DateUtil.date(), "yyyyMM");
+            SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            billNo = "HG" + sysOrganizationVo.getOrgCode() + date;
+            String i = baseMapper.selectNum(billNo);
+            if (StringUtils.isNotBlank(i)) {
+                billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
+            } else {
+                billNo = Rule.getBillNo(billNo, 0);
+            }
+            apply.setBillNo(billNo);
             baseMapper.insert(apply);
             LoanRepurchaseBankCostVo bankCostVo = dto.getBankCostVo();
             LoanRepurchaseCost bankCost = new LoanRepurchaseCost();