浏览代码

fix on 2020.12.14

jiequan.bi 4 年之前
父节点
当前提交
b9b19ad30b

+ 2 - 2
jeecg-boot-module-system/pom.xml

@@ -164,11 +164,11 @@
             <artifactId>opencv</artifactId>
             <version>4.2.0</version>
         </dependency>
-        <!--<dependency>
+        <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
             <version>5.1.11</version>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.jimureport</groupId>
             <artifactId>spring-boot-starter-jimureport</artifactId>

+ 17 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/DesignerCommitProcessCtrl.java

@@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/platform/designer")
-public class DesignerCommitProcessCtrl {
+public class
+DesignerCommitProcessCtrl {
 
     @Autowired
     private IPlatformOrderService platformOrderService;
@@ -83,4 +84,19 @@ public class DesignerCommitProcessCtrl {
         }
         return result;
     }
+
+    /**
+     *  设计组长修改指派人
+     */
+    @PostMapping("/assignAgain")
+    public Result<Object> assignAgain(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            result.success("物料重新指派成功!");
+        }else {
+            result.error500("物料重新指派失败,请联系管理员!");
+        }
+        return result;
+    }
 }

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/RuleKuaiShouPlanServiceImpl.java

@@ -122,12 +122,12 @@ public class RuleKuaiShouPlanServiceImpl extends ServiceImpl<RuleDatePlanKuaisho
         String result = HttpUtils.kuaiShouhttpPostRequest("https://ad.e.kuaishou.com/rest/openapi/v1/ad_unit/list", param.toJSONString(), headers);
         JSONObject resultJson = JSONObject.parseObject(result);
         if (Check.isNull(resultJson)) {
-            XxlJobHelper.log("获取广告组接口异常,advertiserId:{}", accountId);
+            XxlJobHelper.log("获取定向信息接口异常,advertiserId:{}", accountId);
             return;
         }
         Integer code = resultJson.getInteger("code");
         if (null == code || code != 0) {
-            XxlJobHelper.log("获取广告组返回结果异常,advertiserId:{},异常信息:{}", accountId, resultJson);
+            XxlJobHelper.log("获取定向信息返回结果异常,advertiserId:{},异常信息:{}", accountId, resultJson);
             return;
         }
         JSONArray details = resultJson.getJSONObject("data").getJSONArray("details");