Merge remote-tracking branch 'origin/master'

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/PortalApplication.java

@@ -14,7 +14,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.portal"
 })
 @EnableDiscoveryClient
-@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter"})
+//@EnableFeignClients(basePackages = {"com.yxt.anrui.crm", "com.yxt.anrui.flowable", "com.yxt.messagecenter", "com.yxt.anrui.terminal", "com.yxt.anrui.base", "com.yxt.anrui.scm", "com.yxt.anrui.fin", "com.yxt.anrui.buscenter", "com.yxt.anrui.riskcenter","com.yxt.*"})
+@EnableFeignClients(basePackages = {"com.yxt.*"})
 public class PortalApplication {
 
     public static void main(String[] args) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java

@@ -15,10 +15,9 @@ public class AppIndexEnum {
          * 供应链
          */
         GYL("98ff0724-5df4-4fc7-ab6d-3996e7706acd", "供应链"),
-
         YW("e25e13b5-f2ed-421f-bdb3-6f2eca2a3028", "业务"),
-
-        FK("fec4e243-491a-11ec-94cd-fa163e0cb33c", "风控");
+        FK("fec4e243-491a-11ec-94cd-fa163e0cb33c", "风控"),
+        SH("fea6ee02-05cc-11ef-9a84-8032536963eb", "售后服务");
         /**
          * code值
          */
@@ -55,6 +54,9 @@ public class AppIndexEnum {
         JFKC("a204a3fa-c8ac-4795-966c-df1d0e131bcf", "家访考察"),
         FKZLSC("65dc12e0-9213-4364-ae81-18afa9c7e1ee", "放款资料上传"),
         DYBL("ab7df5a0-9708-48b1-b58a-60d7e024d0a2", "抵押办理"),
+        WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕-售后"),
+        SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架-售后"),
+        PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收-售后"),
         ;
 
         /**

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java

@@ -17,6 +17,10 @@ import com.yxt.anrui.portal.biz.sysmobilemenu.SysMobileMenuService;
 import com.yxt.anrui.portal.biz.sysmobilemenurole.SysMobileMenuRoleService;
 import com.yxt.anrui.portal.biz.sysuser.SysUserService;
 import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
+import com.yxt.anrui.portal.fegin.as.AsBusrepairBillFeign;
+import com.yxt.anrui.portal.fegin.as.AsToDoNumQuery;
+import com.yxt.anrui.portal.fegin.wms.WmsShelfBillFeign;
+import com.yxt.anrui.portal.fegin.wms.WmsToDoNumQuery;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
@@ -27,12 +31,12 @@ import com.yxt.anrui.scm.api.scmvehicleexamine.ScmVehicleExamineFeign;
 import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionFeign;
 import com.yxt.anrui.scm.api.scmvehicleinventory.ScmVehicleInventoryFeign;
 import com.yxt.anrui.scm.api.scmvehiclepatrolinspection.ScmVehiclePatrolinspectionFeign;
-import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.LoanHomeVisitInvestigateFeign;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -74,6 +78,11 @@ public class AppIndexService {
     private LoanFileexamineFeign loanFileexamineFeign;
     @Autowired
     private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign;
+    @Resource
+    private WmsShelfBillFeign wmsShelfBillFeign;
+    @Resource
+    private AsBusrepairBillFeign asBusrepairBillFeign;
+
     public ResultBean<List<AppIndexNewVo>> getBusinessList(String userSid, String appSid, String orgPath) {
         ResultBean<List<AppIndexNewVo>> rb = ResultBean.fireFail();
         if (StringUtils.isBlank(userSid) || StringUtils.isBlank(appSid)) {
@@ -135,9 +144,13 @@ public class AppIndexService {
         CommonToDoNumQuery commonToDoNumQuery = new CommonToDoNumQuery();
         BusToDoNumQuery busToDoNumQuery = new BusToDoNumQuery();
         RiskToDoNumQuery riskToDoNumQuery = new RiskToDoNumQuery();
+        WmsToDoNumQuery wmsToDoNumQuery = new WmsToDoNumQuery();
+        AsToDoNumQuery asToDoNumQuery = new AsToDoNumQuery();
         BeanUtil.copyProperties(appToDoNumQuery, commonToDoNumQuery);
         BeanUtil.copyProperties(appToDoNumQuery, busToDoNumQuery);
         BeanUtil.copyProperties(appToDoNumQuery, riskToDoNumQuery);
+        BeanUtil.copyProperties(appToDoNumQuery, wmsToDoNumQuery);
+        BeanUtil.copyProperties(appToDoNumQuery, asToDoNumQuery);
         //根据appSid查询菜单的信息
         List<SysMobileMenu> sysMobileMenus = sysMobileMenuService.getMenu(appSid);
         List<AppIndexNumVo> list = new ArrayList<>();
@@ -217,6 +230,28 @@ public class AppIndexService {
                 }
                 list.add(appIndexNumVo);
             }
+        }else if (AppIndexEnum.AppVersionSubAppSid.SH.getCode().equals(appSid)){
+            //售后服务
+            for (SysMobileMenu menu : sysMobileMenus) {
+                AppIndexNumVo appIndexNumVo = new AppIndexNumVo();
+                appIndexNumVo.setSid(menu.getSid());
+                //商品上架
+                if (AppIndexEnum.AppMenu.SPSJ.getRemarks().equals(menu.getTitle())) {
+                    String num = wmsShelfBillFeign.getToDoNum(wmsToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
+                //配件接收
+                if (AppIndexEnum.AppMenu.PJJS.getRemarks().equals(menu.getTitle())) {
+                    String num = asBusrepairBillFeign.getToDoNum(asToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
+                //维修完毕
+                if (AppIndexEnum.AppMenu.WXWB.getRemarks().equals(menu.getTitle())) {
+                    String num = asBusrepairBillFeign.getToDoNum2(asToDoNumQuery).getData();
+                    appIndexNumVo.setNum(num);
+                }
+                list.add(appIndexNumVo);
+            }
         }
 
         return rb.success().setData(list);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsBusrepairBillFeign.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.portal.fegin.as;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+        contextId = "yxt-as-AsBusrepairBill",
+        name = "yxt-as",
+        path = "v1/AsBusrepairBill")
+public interface AsBusrepairBillFeign {
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum2")
+    @ResponseBody
+    ResultBean<String> getToDoNum2(@SpringQueryMap AsToDoNumQuery asToDoNumQuery);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/as/AsToDoNumQuery.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.fegin.as;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AsToDoNumQuery {
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsShelfBillFeign.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.portal.fegin.wms;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+/**
+ * @description: 售后商品上架
+ * @author: fzz
+ * @date: 2024/3/7
+ **/
+@FeignClient(
+        contextId = "yxt-wms-WmsShelfBill",
+        name = "yxt-wms",
+        path = "/apiadmin/WmsShelfBill"
+)
+public interface WmsShelfBillFeign {
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery);
+}

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsToDoNumQuery.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.portal.fegin.wms;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsToDoNumQuery {
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.java

@@ -101,4 +101,6 @@ public interface LoanRepaymentPlanDetailsMapper extends BaseMapper<LoanRepayment
     List<AppRepaymentPlanRecord> selByMainSidAndVinNo(@Param("scheduleSid") String scheduleSid, @Param("vinNo") String vinNo);
 
     void updatePaymentMoneyBySids(@Param("planSids") List<String> planSids);
+
+    int updateDataTime(@Param("format") String format);
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -603,6 +603,10 @@
             #{planSid}
         </foreach>
     </update>
+    <update id="updateDataTime">
+        update loan_repayment_plan_details
+        set updateTime =#{format}
+    </update>
 
 
     <select id="selVehSidAndPeriod"

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java

@@ -368,4 +368,8 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService<LoanRepa
     public void updatePaymentMoneyBySids(List<String> sids) {
         baseMapper.updatePaymentMoneyBySids(sids);
     }
+
+    public int updateDataTime(String format) {
+        return baseMapper.updateDataTime(format);
+    }
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java

@@ -1,9 +1,6 @@
 package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.math.Money;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
@@ -12,21 +9,16 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
-import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.riskcenter.api.loanfundday.LoanFundDay;
-import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
-import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.utils.CollectorsUtil;
+import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.HistoryOverDueVo;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForLateVoucher;
-import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
-import com.yxt.anrui.riskcenter.biz.loanfundday.LoanFundDayService;
 import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
 import com.yxt.common.core.result.ResultBean;
@@ -39,7 +31,6 @@ import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @description:
@@ -74,6 +65,8 @@ public class ScheduledRepaymentPlanDetailsService {
     @Scheduled(cron = "0 0 2 1 * ?")
     public void pushLateVoucher() {
         Date date = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        int t = loanRepaymentPlanDetailsService.updateDataTime(sdf.format(date)); //修改数据更新日期
         Calendar calendar = Calendar.getInstance();//new一个Calendar类,把Date放进去
         calendar.setTime(date);
         calendar.add(Calendar.DATE, -1);
@@ -82,6 +75,20 @@ public class ScheduledRepaymentPlanDetailsService {
         useOrgSidList.removeAll(Collections.singleton(null));
         if (!useOrgSidList.isEmpty()) {
             for (String u : useOrgSidList) {
+                //判断当期是否逾期
+                List<HistoryOverDueVo> overDueVoList = loanRepaymentPlanDetailsService.overDueVoList(u);
+                if (!overDueVoList.isEmpty()) {
+                    List<String> planSids = new ArrayList<>();
+                    overDueVoList.stream().forEach(v -> {
+                        if (v.getOverdueState().equals("0")) {
+                            planSids.add(v.getPlanSid());
+                        }
+                    });
+                    if (!planSids.isEmpty()) {
+                        int i = loanRepaymentPlanDetailsService.updateOverDueState(planSids);
+                    }
+                }
+                //查询是否符合转累欠
                 List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(u);
                 List<String> planSids = new ArrayList<>();
                 if (!records.isEmpty()) {

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -719,7 +719,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -732,7 +732,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
                     String expectCost = excelInfo.getExpectCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -781,7 +781,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -794,7 +794,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -807,7 +807,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceItureCost())) {
                     String onceItureCost = excelInfo.getOnceItureCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceItureCost).matches();
                     if (!matches) {
                         checkWord.add("其中支出费用必须为数字");
@@ -820,7 +820,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -833,7 +833,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");
@@ -1211,7 +1211,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1224,7 +1224,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectCost())) {
                     String expectCost = excelInfo.getExpectCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1273,7 +1273,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1286,7 +1286,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getMoney())) {
                     String money = excelInfo.getMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(money).matches();
                     if (!matches) {
                         checkWord.add("其中费用必须为数字");
@@ -1299,7 +1299,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1333,7 +1333,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondaryUploadMoney).matches();
                     if (!matches) {
                         checkWord.add("二次上传金额必须为数字");
@@ -1342,7 +1342,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondItureCost())) {
                     String secondItureCost = excelInfo.getSecondItureCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondItureCost).matches();
                     if (!matches) {
                         checkWord.add("其中支出费用必须为数字");
@@ -1355,7 +1355,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -1368,7 +1368,7 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -69,7 +69,9 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
 
     void updateTwoExcelInfo(@Param("secondaryUploadDate") String secondaryUploadDate, @Param("secondaryUploadMoney") String secondaryUploadMoney, @Param("secondTreatCost") String secondTreatCost, @Param("secondSuppCost") String secondSuppCost, @Param("secondSuppRemark") String secondSuppRemark, @Param("adjustmentRemarks") String adjustmentRemarks, @Param("isAdjustment") String isAdjustment, @Param("adjustmentMoney") String adjustmentMoney, @Param("diffAmount") String diffAmount, @Param("sid") String sid);
 
-    ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid);
+    ScmVehRebateVo selectByVinNoAndOrgSidDr(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("calculationModeValue") String calculationModeValue, @Param("useOrgSid") String useOrgSid);
+
+    ScmVehRebateVo selectByVinNoAndOrgSid(@Param("vinNo") String vinNo, @Param("rebateTypeValue") String rebateTypeValue, @Param("rebateName") String rebateName, @Param("palceGenDate") String palceGenDate, @Param("estimateRebate") String estimateRebate, @Param("useOrgSid") String useOrgSid);
 
     @Update("update scm_veh_rebate set adjustmentState = #{adjustmentState} where sid = #{vehRebateSid}")
     void updateAdjustmentState(@Param("vehRebateSid") String vehRebateSid, @Param("adjustmentState") int adjustmentState);

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -39,7 +39,7 @@
         ))
     </select>
 
-    <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
+    <select id="selectByVinNoAndOrgSidDr" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
         SELECT *
         FROM scm_veh_rebate
         WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
@@ -50,6 +50,17 @@
           AND createOrgSid = #{useOrgSid}
     </select>
 
+    <select id="selectByVinNoAndOrgSid" resultType="com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVo">
+        SELECT *
+        FROM scm_veh_rebate
+        WHERE vinNo LIKE CONCAT('%', #{vinNo}, '%')
+          AND rebateTypeValue = #{rebateTypeValue}
+          AND rebateName = #{rebateName}
+          AND palceGenDate = #{palceGenDate}
+          AND estimateRebate = #{estimateRebate}
+          AND createOrgSid = #{useOrgSid}
+    </select>
+
     <select id="excelListOne" resultType="com.yxt.anrui.scm.api.scmvehrebate.OneExcelVo">
         SELECT
         *,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -820,7 +820,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         }
         if (!importVoList.isEmpty()) {
             for (ScmVehRebateExcelInfo excelInfo : importVoList) {
-                ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSid(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid);
+                ScmVehRebateVo scmVehRebateVo = baseMapper.selectByVinNoAndOrgSidDr(excelInfo.getVinNo(), excelInfo.getRebateTypeValue(), excelInfo.getRebateName(), excelInfo.getPalceGenDate(), excelInfo.getCalculationModeValue(), useOrgSid);
                 if (scmVehRebateVo != null) {
                     checkWord.add("车架号为" + excelInfo.getVinNo() + "的单车返利信息已存在");
                     break;
@@ -877,7 +877,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
 //                }
 //                if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
 //                    String estimateRebate = excelInfo.getEstimateRebate();
-//                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+//                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
 //                    boolean matches = pattern.matcher(estimateRebate).matches();
 //                    if (!matches) {
 //                        checkWord.add("返利金额必须为数字");
@@ -890,7 +890,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectTreatCost())) {
                     String expectTreatCost = excelInfo.getExpectTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectTreatCost).matches();
                     if (!matches) {
                         checkWord.add("其中待支付费用必须为数字");
@@ -903,7 +903,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getExpectSuppCost())) {
                     String expectSuppCost = excelInfo.getExpectSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(expectSuppCost).matches();
                     if (!matches) {
                         checkWord.add("其中抵顶费用必须为数字");
@@ -1233,7 +1233,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
                     String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
                     if (!matches) {
                         checkWord.add("厂家结算价必须为数字");
@@ -1246,7 +1246,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getFreight())) {
                     String freight = excelInfo.getFreight();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(freight).matches();
                     if (!matches) {
                         checkWord.add("其中运费金额必须为数字");
@@ -1295,7 +1295,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1308,7 +1308,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
                     String withholdCost = excelInfo.getWithholdCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(withholdCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1357,7 +1357,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1370,7 +1370,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1383,7 +1383,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceTreatCost())) {
                     String onceTreatCost = excelInfo.getOnceTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceTreatCost).matches();
                     if (!matches) {
                         checkWord.add("待支付费用必须为数字");
@@ -1396,7 +1396,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getOnceSuppCost())) {
                     String onceSuppCost = excelInfo.getOnceSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(onceSuppCost).matches();
                     if (!matches) {
                         checkWord.add("抵顶费用必须为数字");
@@ -1691,7 +1691,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getManufactorSettlementPrice())) {
                     String manufactorSettlementPrice = excelInfo.getManufactorSettlementPrice();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(manufactorSettlementPrice).matches();
                     if (!matches) {
                         checkWord.add("厂家结算价必须为数字");
@@ -1704,7 +1704,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getFreight())) {
                     String freight = excelInfo.getFreight();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(freight).matches();
                     if (!matches) {
                         checkWord.add("其中运费金额必须为数字");
@@ -1747,7 +1747,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getEstimateRebate())) {
                     String estimateRebate = excelInfo.getEstimateRebate();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(estimateRebate).matches();
                     if (!matches) {
                         checkWord.add("预提返利必须为数字");
@@ -1760,7 +1760,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getWithholdCost())) {
                     String withholdCost = excelInfo.getWithholdCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(withholdCost).matches();
                     if (!matches) {
                         checkWord.add("其中预提费用必须为数字");
@@ -1809,7 +1809,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
                     String uploadMoney = excelInfo.getUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(uploadMoney).matches();
                     if (!matches) {
                         checkWord.add("上传金额必须为数字");
@@ -1822,7 +1822,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getStayDetermineMoney())) {
                     String stayDetermineMoney = excelInfo.getStayDetermineMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(stayDetermineMoney).matches();
                     if (!matches) {
                         checkWord.add("待确定金额必须为数字");
@@ -1835,7 +1835,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getQzMoney())) {
                     String qzMoney = excelInfo.getQzMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(qzMoney).matches();
                     if (!matches) {
                         checkWord.add("其中费用必须为数字");
@@ -1869,7 +1869,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
                     String secondaryUploadMoney = excelInfo.getSecondaryUploadMoney();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondaryUploadMoney).matches();
                     if (!matches) {
                         checkWord.add("二次上传金额必须为数字");
@@ -1882,7 +1882,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondTreatCost())) {
                     String secondTreatCost = excelInfo.getSecondTreatCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondTreatCost).matches();
                     if (!matches) {
                         checkWord.add("待支付费用必须为数字");
@@ -1895,7 +1895,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 }
                 if (StringUtils.isNotBlank(excelInfo.getSecondSuppCost())) {
                     String secondSuppCost = excelInfo.getSecondSuppCost();
-                    Pattern pattern = Pattern.compile("^\\d+(.\\d{1,2})?$");
+                    Pattern pattern = Pattern.compile("^(\\-|\\+)?\\d+(\\.\\d+)?$");
                     boolean matches = pattern.matcher(secondSuppCost).matches();
                     if (!matches) {
                         checkWord.add("抵顶费费用必须为数字");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java

@@ -53,6 +53,7 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
@@ -144,7 +145,8 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
     private MessageFeign messageFeign;
     @Autowired
     private MessageListFeign messageListFeign;
-
+    @Autowired
+    private SysParameterFeign sysParameterFeign;
     private QueryWrapper<ScmVehRebateWithApply> createQueryWrapper(ScmVehRebateWithApplyQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -450,18 +452,28 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService<ScmVehRebat
      * @return
      */
     public String returnBusDate(Date date) {
-        Date parse = null;
+        Date ruleDate = null;
+        Date nowDate = null;
+        String rDate = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
         SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
         String format1 = sdf.format(date);
-        String rDate = format1 + "-06";
+        String parameterVale = sysParameterFeign.fetchByParNo("CW_FLYJSRQ").getData();
+        int i = Integer.parseInt(parameterVale);
+        if (i >= 10) {
+            rDate = format1 + "-" + i;
+        } else {
+            rDate = format1 + "-0" + i;
+        }
+        String format2 = sdf2.format(date);
         try {
-            parse = sdf2.parse(rDate);
+            ruleDate = sdf2.parse(rDate);
+            nowDate = sdf2.parse(format2);
         } catch (ParseException e) {
             e.printStackTrace();
         }
-        if (!(date.before(parse))) {
-            return sdf2.format(date);
+        if ((nowDate.after(ruleDate))) {
+            return sdf2.format(nowDate);
         } else {
             Calendar calendar = Calendar.getInstance();
             int month = calendar.get(Calendar.MONTH);

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/app/AsToDoNumQuery.java

@@ -0,0 +1,12 @@
+package com.yxt.anrui.as.api.asbusrepairbill.app;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AsToDoNumQuery {
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java

@@ -81,4 +81,8 @@ public interface AsBusrepairBillMapper extends BaseMapper<AsBusrepairBill> {
 
     @Update("update as_busrepair_bill set manuReportNo = #{manuReportNo},reportFirstDate = #{reportFirstDate} where sid = #{sid}")
     void updateManuReportNo(@Param("sid") String sid, @Param("manuReportNo") String manuReportNo, @Param("reportFirstDate") String reportFirstDate);
+
+    int getToDoNum(@Param("userSid") String userSid);
+
+    int getToDoNum2(@Param("useOrgSid") String useOrgSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -242,6 +242,19 @@
         </where>
         GROUP BY i.sourceBillSid
     </select>
+
+    <select id="getToDoNum" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM
+            (SELECT
+                 b.sid
+             FROM
+                 as_busrepair_inventorybill_detail AS d
+                     LEFT JOIN as_busrepair_inventorybill as i ON d.billSid = i.sid
+                     LEFT JOIN as_busrepair_bill as b ON i.sourceBillSid = b.sid
+                     LEFT JOIN as_busrepair_bill_vech as v ON v.billSid = b.sid
+             where d.operUserSid = #{userSid} and d.state = 1
+             GROUP BY i.sourceBillSid) as a
+    </select>
     <select id="selGoodsReceiveByBillSid"
             resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsReceiveListVo">
         SELECT d.sid,
@@ -305,6 +318,61 @@
         WHERE
         totalCount != 0
     </select>
+
+    <select id="getToDoNum2" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM
+            (SELECT
+                 j.*,
+                 IF(j.totalCount = j.count, true, false) as isCanSubmit,
+                 concat(j.count,'/',j.totalCount) confrimInfo
+             FROM
+                 (
+                     SELECT
+                         a.*,
+                         (
+                             SELECT
+                                 COUNT(*)
+                             FROM
+                                 as_busrepair_inventorybill_detail AS d
+                                     LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
+                             WHERE
+                                 i.sourceBillSid = a.sid
+                         ) totalCount,
+                         (
+                             SELECT
+                                 COUNT(*)
+                             FROM
+                                 as_busrepair_inventorybill_detail AS d
+                                     LEFT JOIN as_busrepair_inventorybill AS i ON d.billSid = i.sid
+                             WHERE
+                                 i.sourceBillSid = a.sid
+                               AND d.state = 2
+                         ) AS count
+                     FROM
+                         (
+                         SELECT
+                         b.sid,
+                         b.billNo billId,
+                         b.billType,
+                         b.customerName,
+                         b.entryTime,
+                         b.`subject`,
+                         v.vehMark
+                         FROM
+                         as_busrepair_bill AS b
+                         LEFT JOIN as_busrepair_inventorybill AS i ON i.sourceBillSid = b.sid
+                         LEFT JOIN as_busrepair_inventorybill_detail AS d ON d.billSid = i.sid
+                         LEFT JOIN as_busrepair_bill_vech AS v ON v.billSid = b.sid
+                         WHERE b.deptSid = #{useOrgSid} AND b.repairState = 1
+                         GROUP BY
+                         b.sid
+                         ) a
+                 ) AS j
+             WHERE
+                 totalCount != 0) as mm
+        WHERE mm.isCanSubmit = 1
+    </select>
+
     <select id="goodsConfrimInfoList"
             resultType="com.yxt.anrui.as.api.asbusrepairbill.app.GoodsConfrimDetailsVo">
         SELECT d.goodsSpuName                    goodsName,
@@ -838,4 +906,6 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+
 </mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -10,7 +10,6 @@ import com.yxt.anrui.as.api.asbusrepairbillvech.AsBusrepairBillVech;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.anrui.as.biz.asbusrepairbillinvoice.AsBusrepairBillInvoiceService;
 import com.yxt.anrui.as.biz.asbusrepairbillsitem.AsBusrepairBillSitemService;
-import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerRest;
 import com.yxt.anrui.as.biz.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairerService;
 import com.yxt.anrui.as.biz.asbusrepairbillvech.AsBusrepairBillVechService;
 import com.yxt.anrui.as.biz.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailService;
@@ -19,6 +18,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -288,6 +288,13 @@ public class AsBusrepairBillRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap AsToDoNumQuery asToDoNumQuery) {
+        return asBusrepairBillService.getToDoNum(asToDoNumQuery);
+    }
+
     @PostMapping("/submitList")
     @ApiOperation("配件确认提交")
     ResultBean submitList(@RequestBody GoodsReceiveSubmit query) {
@@ -311,6 +318,13 @@ public class AsBusrepairBillRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum2")
+    @ResponseBody
+    ResultBean<String> getToDoNum2(@SpringQueryMap AsToDoNumQuery asToDoNumQuery) {
+        return asBusrepairBillService.getToDoNum2(asToDoNumQuery);
+    }
+
     @PostMapping("/submitList2")
     @ApiOperation("维修确认提交")
     ResultBean submitList2(@RequestBody GoodsReceiveSubmit query) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -2136,6 +2136,13 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         return p;
     }
 
+    public ResultBean<String> getToDoNum(AsToDoNumQuery asToDoNumQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = asToDoNumQuery.getUserSid();
+        int count = baseMapper.getToDoNum(userSid);
+        return rb.success().setData(String.valueOf(count));
+    }
+
     public void submitList(GoodsReceiveSubmit query) {
         List<String> list = query.getList();
         if (!list.isEmpty()) {
@@ -2181,6 +2188,24 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
 
     }
 
+    public ResultBean<String> getToDoNum2(AsToDoNumQuery asToDoNumQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        String orgPath = asToDoNumQuery.getOrgPath();
+        List<String> split = Arrays.asList(orgPath.split("/"));
+        String useOrgSid = "";
+        if (split.size() > 1) {
+            //获取本级sid获取本级部门信息
+            SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+            useOrgSid = sysOrganization1.getSid();
+        } else {
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+            useOrgSid = sysOrganization.getSid();
+        }
+        String userSid = asToDoNumQuery.getUserSid();
+        int count = baseMapper.getToDoNum2(useOrgSid);
+        return rb.success().setData(String.valueOf(count));
+    }
+
     public void submitList2(GoodsReceiveSubmit query) {
         List<String> list = query.getList();
         if (!list.isEmpty()) {
@@ -2946,4 +2971,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         baseMapper.updateManuReportNo(sid, manuReportNo, reportFirstDate);
         return rb.success();
     }
+
+
+
 }

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsShelfBillRest.java

@@ -3,20 +3,18 @@ package com.yxt.wms.apiadmin.inventroy;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.wms.biz.inventory.wmsgoodstag.app.*;
-import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillDto2;
-import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillPageVo;
-import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery;
+import com.yxt.wms.biz.inventory.wmsgoodstag.app.GoodsTagVo;
+import com.yxt.wms.biz.inventory.wmsgoodstag.app.HousePrintVo;
+import com.yxt.wms.biz.inventory.wmsgoodstag.app.PrintQuery;
+import com.yxt.wms.biz.inventory.wmsgoodstag.app.TagQuery;
 import com.yxt.wms.biz.inventory.wmsshelfbill.*;
 import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * @description:
  * @author: dimengzhe
@@ -64,8 +62,8 @@ public class WmsShelfBillRest {
      */
     @ApiOperation("新增初始化")
     @GetMapping("/getInit")
-    ResultBean<ShelfInitVo> getInit(@RequestParam("sid") String sid,@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid) {
-        return wmsShelfBillService.getInit(sid,orgPath,userSid);
+    ResultBean<ShelfInitVo> getInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid) {
+        return wmsShelfBillService.getInit(sid, orgPath, userSid);
     }
 
     @ApiOperation("确认")
@@ -84,6 +82,13 @@ public class WmsShelfBillRest {
         return rb.success().setData(pv);
     }
 
+    @ApiOperation("手机端-查询本分公司下代办数量:切换机构")
+    @GetMapping("/getToDoNum")
+    @ResponseBody
+    ResultBean<String> getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery) {
+        return wmsShelfBillService.getToDoNum(wmsToDoNumQuery);
+    }
+
     @ApiOperation("上架初始化")
     @GetMapping("shelvesOperaInit/{sid}")
     public ResultBean<AppShelInitVo> shelvesOperaInit(@PathVariable("sid") String sid) {
@@ -93,8 +98,8 @@ public class WmsShelfBillRest {
 
     @ApiOperation("扫码")
     @GetMapping("scan")
-    public ResultBean<AppScanVo> scan(@RequestParam(value = "shelvesId", required = false) String shelvesId,@RequestParam(value = "content") String content) {
-        return wmsShelfBillService.scan(shelvesId,content);
+    public ResultBean<AppScanVo> scan(@RequestParam(value = "shelvesId", required = false) String shelvesId, @RequestParam(value = "content") String content) {
+        return wmsShelfBillService.scan(shelvesId, content);
     }
 
     @ApiOperation("上架保存")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java

@@ -24,4 +24,6 @@ public interface WmsShelfBillMapper extends BaseMapper<WmsShelfBill> {
     String selectCodeNum(String bill);
 
     IPage<AppShelfBillListVo> applistPage(IPage<WmsShelfBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsShelfBill> qw);
+
+    int getToDoNum(@Param("userSid") String userSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml

@@ -69,4 +69,8 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="getToDoNum" resultType="java.lang.Integer">
+        select count(*)
+        from wms_shelf_bill wsb where wsb.upShelfSid = #{userSid} and wsb.billStateValue != '已完成'
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -38,8 +38,6 @@ import com.yxt.wms.biz.inventory.wmsshelfbill.app.*;
 import com.yxt.wms.biz.inventory.wmsshelfbilldetail.*;
 import com.yxt.wms.feign.as.AsBusrepairInventorybill;
 import com.yxt.wms.feign.as.AsBusrepairInventorybillFeign;
-import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill;
-import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
 import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign;
 import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpu;
@@ -595,6 +593,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         return p;
     }
 
+    public ResultBean<String> getToDoNum(WmsToDoNumQuery wmsToDoNumQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = wmsToDoNumQuery.getUserSid();
+        int count = baseMapper.getToDoNum(userSid);
+        return rb.success().setData(String.valueOf(count));
+    }
+
     public ResultBean<AppShelInitVo> shelvesOperaInit(String sid) {
         ResultBean rb = ResultBean.fireFail();
         AppShelInitVo vo = new AppShelInitVo();
@@ -1307,4 +1312,6 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
         vo.setGoods(list);
         return rb.success().setData(vo);
     }
+
+
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsToDoNumQuery.java

@@ -0,0 +1,12 @@
+package com.yxt.wms.biz.inventory.wmsshelfbill;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsToDoNumQuery {
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+}