change - 获取返修权限

aucma-admin/src/main/java/com/aucma/web/controller/system/SysLoginController.java

@@ -2,6 +2,8 @@ package com.aucma.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
+
+import com.aucma.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,6 +36,9 @@ public class SysLoginController
     @Autowired
     private SysPermissionService permissionService;
 
+    @Autowired
+    private ISysPostService postService;
+
     /**
      * 登录方法
      * 
@@ -72,6 +77,14 @@ public class SysLoginController
         ajax.put("companyName", "澳柯玛股份有限公司");
         ajax.put("factoryCode", "1301");
         ajax.put("factoryName", "河南民权工厂");
+        List<Long> postList = postService.selectPostListByUserId(user.getUserId());
+        if (postList.contains(9L)){
+            //超级返修措施权限
+            ajax.put("userPermission", 2);
+        }else {
+            //普通返修措施权限
+            ajax.put("userPermission", 1);
+        }
         return ajax;
     }
 

aucma-report/src/main/resources/mapper/report/BoardReportMapper.xml

@@ -19,7 +19,7 @@
                boi.SALEORDER_CODE,
                boi.MATERIAL_CODE,
                boi.MATERIAL_NAME,
-               TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD')                                                              PLAN_CODE,
+               TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD')                                                              PLAN_DATE,
                CASE
                    WHEN TO_CHAR(boi.BEGIN_DATE, 'YYYY-MM-DD') = TO_CHAR(SYSDATE, 'YYYY-MM-DD') THEN 0
                    ELSE 1 END                                                                                     STATUS,