Merge remote-tracking branch 'origin/master'

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportFeign.java

@@ -18,10 +18,10 @@ import java.util.Map;
         path = "v1/factoryDailyReport",
         fallback = FactoryDaliyReportFeignFallback.class)
 public interface FactoryDaliyReportFeign {
-    @PostMapping("/pageList")
+   /* @PostMapping("/pageList")
     @ResponseBody
     ResultBean<FactoryDaliyReportVo> pageList1(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
-
+*/
     @PostMapping("/pageList1")
     @ResponseBody
     ResultBean<Map<String, Object>> pageList(@RequestBody PagerQuery<FactoryDaliyReportQuery> pagerQuery);
@@ -41,6 +41,7 @@ public interface FactoryDaliyReportFeign {
     @GetMapping("/list4")
     @ResponseBody
     ResultBean<FgsDetailVo> list4(@RequestParam("linkSid") String linkSid);
+
 }
 
 

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportQuery.java

@@ -15,5 +15,6 @@ public class FactoryDaliyReportQuery implements Query {
 
     private String orgPath;
     //jt-查集团，syb-事业部，空字符串 分公司
+    @ApiModelProperty("jt-集团、syb-事业部、空字符串分公司")
     private String type;
 }

anrui-reportcenter/anrui-reportcenter-api/src/main/java/com/yxt/anrui/reportcenter/api/factoryDailyReport/FactoryDaliyReportVo.java

@@ -42,6 +42,8 @@ public class FactoryDaliyReportVo {
     @JsonIgnore
     private String offset_payment;
 
+    //仅分公司下返回
+    @ApiModelProperty("分公司sid#年份")
     private String linkSid;
 
 }

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportRest.java

@@ -23,12 +23,12 @@ public class FactoryDaliyReportRest implements FactoryDaliyReportFeign {
 
     @Autowired
     private FactoryDaliyReportService factoryDaliyReportService;
-    @Override
+   /* @Override
     public ResultBean<FactoryDaliyReportVo> pageList1(PagerQuery<FactoryDaliyReportQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
         PagerVo<FactoryDaliyReportVo> pv = factoryDaliyReportService.pageList1(pagerQuery);
         return rb.success().setData(pv);
-    }
+    }*/
 
     @Override
     public ResultBean<Map<String, Object>> pageList(PagerQuery<FactoryDaliyReportQuery> pagerQuery) {

anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/factoryDailyReport/FactoryDaliyReportService.java

@@ -87,6 +87,7 @@ public class FactoryDaliyReportService {
         List<String> orgSidList = Arrays.asList(orgPath.split("/"));
         String type = query.getType();
         String name = "";
+        //type=syb 为事业部名称 type=空 为分公司名称 jt为集团
         if (StringUtils.isNotBlank(type)) {
             if ("syb".equals(type)) {
                 // 取事业部（前两级）
@@ -97,7 +98,7 @@ public class FactoryDaliyReportService {
 
                     SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(sybSid).getData();
                     name = sysOrganization.getName();
-                    reportMap.put("linkSid", sybSid);
+                    reportMap.put("linkSid", sybSid);//跳转品牌所需要的sid/仅 type=syb生效
                     qw.like("orgPath", orgPathPrefix);
                 }
 
@@ -144,6 +145,7 @@ public class FactoryDaliyReportService {
                 unUploadVo.setFeeUnPaid(factoryDaliyReportVo.getPending_payment());
                 factoryDaliyReportVo.setUnUpload(unUploadVo);
                 if(StringUtils.isBlank(type)){
+                    //分公司sid#年份/仅分公司下返回
                     String orgSid = orgSidList.get(2);
                     factoryDaliyReportVo.setLinkSid(orgSid+"#"+factoryDaliyReportVo.getYear());
                 }