소스 검색

Merge remote-tracking branch 'origin/master'

yumeng 1 년 전
부모
커밋
8e08e901c5

+ 11 - 8
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -284,10 +284,10 @@ public class CwjsPolicyInfoController {
                             //直接转到政策审核角色人员
                             cwjsPolicyInfo.setApprovedStatus(1);
                             //政策审核人员
-                            List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
-                            if (!Check.isNull(users)) {
-                                cwjsPolicyInfo.setApprovedProgress(users.get(0).getId());    //设置政策审核角色人员
-                            }
+//                            List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
+//                            if (!Check.isNull(users)) {
+//                            }
+                            cwjsPolicyInfo.setApprovedProgress("1747433221403979778");    //设置政策审核角色人员 固定为 郭艳玲(政审)
                             cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
                         }
                     } else {
@@ -303,6 +303,7 @@ public class CwjsPolicyInfoController {
                         cwjsPolicyInfo.getAdvancePay(), cwjsPolicyInfo.getRebateType(), cwjsPolicyInfo.getRebateRate());
                 if (!Check.isNull(autoConveryList)) {
                     //符合条件,自动转老板
+                    cwjsPolicyInfo.setApprovalContent("审核通过");
                     cwjsPolicyInfoService.automaticConveyBossExamine(cwjsPolicyInfo);
                     cwjsPolicyInfoService.updateById(cwjsPolicyInfo);
                     return Result.successMsg("审核通过", cwjsPolicyInfo);
@@ -481,7 +482,7 @@ public class CwjsPolicyInfoController {
         List<CwjsPolicyInfo> cwjsPolicyInfos = ListPageUtil.page(cwjsPolicyInfoList, pageSize, pageNo);
 
         //查询政策审核人员
-        List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
+//        List<SysUser> users = sysUserService.getUserListByRoleId("4b68d4e66cbd4ad018d33ddc48880db7");
         cwjsPolicyInfos.forEach(cwjsPolicy -> {
             CwjsPolicyApprovalLog log = policyApprovalLogMapper.getOneByPolicyId(cwjsPolicy.getId(), 1);    // 查询 被拒 审核意见 最新的一条
             cwjsPolicy.setApprovalContent(Check.isNull(log) ? "" : log.getApprovalContent());
@@ -536,7 +537,7 @@ public class CwjsPolicyInfoController {
             cwjsPolicy.setTheBossRight("no");
             //政策审核人员 && 状态不为3 审核通过  && 状态不为4 审核拒绝 则显示 转领导审批
             if (cwjsPolicy.getApprovedStatus() != 3 && cwjsPolicy.getApprovedStatus() != 4
-                    && !Check.isNull(users) && users.toString().contains(cwjsPolicy.getApprovedProgress())) {
+                    && "policyReview".equals(roleCode) && "1747433221403979778".equals(cwjsPolicy.getApprovedProgress())) {
                 cwjsPolicy.setTheBossRight("yes");
             }
             /*
@@ -579,12 +580,14 @@ public class CwjsPolicyInfoController {
             //待审核
             if (cwjsPolicy.getApprovedStatus() == 1) {
                 if (StringUtils.equals(cwjsPolicy.getApprovedProgress(), userId)
-                        || (StringUtils.equals(cwjsPolicy.getApprovedProgress(), "legalAffairs") && StringUtils.equals(roleCode, "legalAffairs"))) {
+                        || (StringUtils.equals(cwjsPolicy.getApprovedProgress(), "legalAffairs") && StringUtils.equals(roleCode, "legalAffairs"))
+                        || "policyReview".equals(roleCode) && "1747433221403979778".equals(cwjsPolicy.getApprovedProgress())
+                ) {
                     stringBuilder.append("审核通过").append("|").append("审核拒绝").append("|");
                 }
 
             }
-            //审核
+            //审核
             if (cwjsPolicy.getApprovedStatus() == 2) {
                 if (StringUtils.equals(cwjsPolicy.getApprovedProgress(), userId)) {
                     stringBuilder.append("审核通过").append("|").append("审核拒绝").append("|");

+ 8 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KsVideoReportCtrl.java

@@ -15,6 +15,7 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.AccountReportConstants;
 import org.jeecg.common.system.entity.SysUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.utils.JsonResourceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -78,6 +79,13 @@ public class KsVideoReportCtrl {
             if (Check.isNull(endDate)) {
                 throw new Exception("请输入查询结束时间");
             }
+
+            //开始和结束时间的时间跨度,不能超过60天
+            long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+            if (days > 60) {
+                throw new Exception("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+            }
+
             String filedAll = JsonResourceUtil.joinAllFiled(AccountReportConstants.getKuaishouVideoReportMap());
             filedAll = filedAll.replace("t1.photo_show", "`show`");
             if (Check.isNull(filedAll)) {

+ 10 - 1
jeecg-boot-module-system/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceVideoReportCtrl.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.AccountReportConstants;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.utils.JsonResourceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -136,9 +137,17 @@ public class BytedanceVideoReportCtrl {
             log.error("request body is empty");
             result.setSuccess(false);
         } else {
-            JSONArray accountIds = requestBody.getJSONArray("accountIds");
             String startDate = requestBody.getString("startDate");
             String endDate = requestBody.getString("endDate");
+            //开始和结束时间的时间跨度,不能超过60天
+            long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+            if (days > 60) {
+                result.setSuccess(false);
+                result.setMessage("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+                return result;
+            }
+
+            JSONArray accountIds = requestBody.getJSONArray("accountIds");
             String clip = requestBody.getString("clip");
             String shot = requestBody.getString("shot");
             String plan = requestBody.getString("plan");

+ 18 - 2
jeecg-boot-report/src/main/java/cn/com/ctop/report/controller/BytedanceAccountReportDailyDwController.java

@@ -61,6 +61,15 @@ public class BytedanceAccountReportDailyDwController {
         }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
+
+        //开始和结束时间的时间跨度,不能超过60天
+        long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+        if (days > 60) {
+            result.setSuccess(false);
+            result.setMessage("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+            return result;
+        }
+
         Integer hour = requestBody.getInteger("hour");
         if (null == hour) {
             hour = DateUtils.getNowHour();
@@ -89,14 +98,21 @@ public class BytedanceAccountReportDailyDwController {
             log.error("request body is empty");
             resultBody.setSuccess(false);
         }
+        String startDate = requestBody.getString("startDate");
+        String endDate = requestBody.getString("endDate");
+        //开始和结束时间的时间跨度,不能超过60天
+        long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+        if (days > 60) {
+            resultBody.setSuccess(false);
+            resultBody.setMessage("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+            return resultBody;
+        }
         String mediaId = requestBody.getString("mediaId");
         BigDecimal discount = requestBody.getBigDecimal("disscount");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
         if (accounts.isEmpty()) {
             return resultBody;
         }
-        String startDate = requestBody.getString("startDate");
-        String endDate = requestBody.getString("endDate");
         try {
             Map<String, Object> sumData = accountAttributionInfoService.getBytedanceSumDataBy(mediaId, discount, accounts, startDate, endDate);
             List<JSONObject> chartData = accountAttributionInfoService.getBytedanceChartDataBy(mediaId, discount, accounts, startDate, endDate);

+ 6 - 0
jeecg-boot-report/src/main/java/cn/com/ctop/report/controller/BytedanceMaterialReportDailyDwController.java

@@ -15,6 +15,7 @@ import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -61,6 +62,11 @@ public class BytedanceMaterialReportDailyDwController {
                 throw new Exception("请输入查询结束时间");
             }
 
+            //开始和结束时间的时间跨度,不能超过60天
+            long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+            if (days > 60) {
+                throw new Exception("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+            }
 
             String filedAll = JsonResourceUtil.joinAllFiled(AccountReportConstants.getBytedanceVideoReportMap());
             if (Check.isNull(filedAll)) {

+ 8 - 0
jeecg-boot-report/src/main/java/cn/com/ctop/report/controller/KuaishouMaterialReportDailyDwController.java

@@ -16,6 +16,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -122,6 +123,13 @@ public class KuaishouMaterialReportDailyDwController {
             if (Check.isNull(endDate)) {
                 throw new Exception("请输入查询结束时间");
             }
+
+            //开始和结束时间的时间跨度,不能超过60天
+            long days = DateUtils.getDiscrepantDays(startDate, endDate) + 1;
+            if (days > 60) {
+                throw new Exception("开始和结束时间的时间跨度,不能超过60天,请重新选择");
+            }
+
             String filedAll = JsonResourceUtil.joinAllFiled(AccountReportConstants.getKuaishouVideoReportMap());
             if (Check.isNull(filedAll)) {
                 throw new Exception("初始化查询 字段返回为空");