Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansecondarysalesapply/LoanSecondarySalesApplyDetailsVo.java

@@ -97,5 +97,8 @@ public class LoanSecondarySalesApplyDetailsVo {
     @ApiModelProperty("有效期")
     private String validityDate;
 
+    @ApiModelProperty("是否显示竞价按钮")
+    private boolean validate;
+
 
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesapply/LoanSecondarySalesApplyService.java

@@ -980,6 +980,19 @@ public class LoanSecondarySalesApplyService extends MybatisBaseService<LoanSecon
                 }
             }
             loanSecondarySalesApplyDetailsVo.setLoanSecondarySalesCost(loanSecondarySalesCost);
+            DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Date date = new Date();
+            String nowtime = sdf.format(date);//当前时间
+            String endtime = loanSecondarySalesApply.getValidityDate();   //到期时间
+            try {
+                if (sdf.parse(nowtime).getTime() > sdf.parse(endtime).getTime()) {//转成long类型比较
+                    loanSecondarySalesApplyDetailsVo.setValidate(false);
+                } else if (sdf.parse(nowtime).getTime() <= sdf.parse(endtime).getTime()) {
+                    loanSecondarySalesApplyDetailsVo.setValidate(true);
+                }
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
         }
         return rb.success().setData(loanSecondarySalesApplyDetailsVo);
     }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java

@@ -67,6 +67,8 @@ public class ScmVehRebateQuery implements Query {
     private String rebateName;
     @ApiModelProperty("状态")
     private String state;
+    @ApiModelProperty
+    private String createOrgSid;
     @ApiModelProperty("单车返利sid")
     private List<String> sidList;
 
@@ -74,4 +76,5 @@ public class ScmVehRebateQuery implements Query {
     private String orgPath;
     private String menuUrl;
     private String menuSid;
+
 }

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

@@ -305,46 +305,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
     public PagerVo<ScmVehRebateVo> checkApplyGetAlreadyUploadVehRebate(PagerQuery<ScmVehRebateQuery> pq) {
         ScmVehRebateQuery query = pq.getParams();
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
-        //========================================数据授权开始
+        qw.eq("createOrgSid", query.getCreateOrgSid());
-        if (StringUtils.isNotBlank(query.getMenuUrl())) {
-            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
-            privilegeQuery.setOrgPath(query.getOrgPath());
-            privilegeQuery.setMenuUrl(query.getMenuUrl());
-            privilegeQuery.setMenuSid(query.getMenuSid());
-            privilegeQuery.setUserSid(query.getUserSid());
-            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
-                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
-                String orgSidPath = query.getOrgPath();
-                orgSidPath = orgSidPath + "/";
-                int i1 = orgSidPath.indexOf("/");
-                int i2 = orgSidPath.indexOf("/", i1 + 1);
-                int i3 = orgSidPath.indexOf("/", i2 + 1);
-                int i4 = orgSidPath.indexOf("/", i3 + 1);
-                String orgLevelKey = defaultIdReltBean.getData();
-                if ("1".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i1);
-                    qw.like("orgPath", orgSidPath);
-                } else if ("2".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i2);
-                    qw.like("orgPath", orgSidPath);
-                } else if ("3".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i3);
-                    qw.like("orgPath", orgSidPath);
-                } else if ("4".equals(orgLevelKey)) {
-                    orgSidPath = orgSidPath.substring(0, i4);
-                    qw.like("orgPath", orgSidPath);
-                } else if ("5".equals(orgLevelKey)) {
-                    qw.eq("createBySid", query.getUserSid());
-                } else {
-                    PagerVo<ScmVehRebateVo> p = new PagerVo<>();
-                    return p;
-                }
-            } else {
-                PagerVo<ScmVehRebateVo> p = new PagerVo<>();
-                return p;
-            }
-        }
         if (StringUtils.isNotBlank(query.getBrandSid())) {
             qw.eq("brandSid", query.getBrandSid());
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml

@@ -34,7 +34,7 @@
                      LEFT JOIN scm_veh_rebate svr
                 ON svr.`sid` = svc.`vehRebateSid`
         WHERE svc.`mainSid` = #{sid}
-          AND DATE_FORMAT(svr.palceGenDate, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+          AND svr.palceGenDate = DATE_FORMAT(CURDATE(), '%Y-%m')
         GROUP BY svr.`rebateTypeKey`
     </select>