fix 修改招商部分问题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmDeptPlanController.java

@@ -115,7 +115,7 @@ public class BmDeptPlanController extends BaseController {
     }
 
     /**
-     * 统计分析-在谈线索-单位榜单
+     * 统计分析-在谈线索-两区及乡镇
      */
     @Log(title = " 单位榜单", businessType = BusinessType.INSERT)
     @PostMapping("/unitClueList")
@@ -142,7 +142,7 @@ public class BmDeptPlanController extends BaseController {
     }
 
     /**
-     * 统计分析-合同金额
+     * 统计分析-签约项目-市直榜单
      */
     @Log(title = " 统计分析-合同金额", businessType = BusinessType.INSERT)
     @PostMapping("/totAmtList")
@@ -156,7 +156,7 @@ public class BmDeptPlanController extends BaseController {
 
 
     /**
-     * 统计分析-在建项目-榜单
+     * 统计分析-在建项目-市直榜单
      */
     @PostMapping("/projectUnitAmountUnit")
     public AjaxResult projectUnitAmountUnit( String year) {
@@ -180,7 +180,7 @@ public class BmDeptPlanController extends BaseController {
     }
 
     /**
-     * 统计分析-入归榜单
+     * 统计分析-投产项目-两区及乡镇入归榜单
      */
     @PostMapping("/investmentList")
     public TableDataInfo investmentList( String year) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -50,19 +50,19 @@ public class BmProjectController extends BaseController {
     public TableDataInfo list(BmProject bmProject) {
         startPage();
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        if (ObjectUtil.isNotNull(loginUser)){
+        if (ObjectUtil.isNotNull(loginUser)) {
             List<SysRole> roles = loginUser.getUser().getRoles();
             boolean flag = false;
-            if (roles.size() > 0){
+            if (roles.size() > 0) {
                 for (SysRole role : roles) {
                     String roleKey = role.getRoleKey();
-                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey)||"admin".equals(roleKey))){
+                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey) || "admin".equals(roleKey))) {
                         flag = true;
                         break;
                     }
                 }
             }
-            if (!flag){
+            if (!flag) {
                 Long deptId = loginUser.getUser().getDeptId();
                 bmProject.setSysDeptId(deptId.toString());
             }
@@ -126,6 +126,7 @@ public class BmProjectController extends BaseController {
 
     /**
      * 提交审核
+     *
      * @param bmProjectStatus
      * @return
      */
@@ -137,6 +138,7 @@ public class BmProjectController extends BaseController {
 
     /**
      * 确认审核
+     *
      * @param bmProjectStatus
      * @return
      */
@@ -148,6 +150,7 @@ public class BmProjectController extends BaseController {
 
     /**
      * 驳回审核
+     *
      * @param bmProjectStatus
      * @return
      */
@@ -159,6 +162,7 @@ public class BmProjectController extends BaseController {
 
     /**
      * 撤销审核
+     *
      * @param bmProjectStatus
      * @return
      */
@@ -174,6 +178,25 @@ public class BmProjectController extends BaseController {
     @GetMapping("/toBeReviewedList")
     public TableDataInfo toBeReviewedList(BmProject bmProject) {
         startPage();
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+
+        if (ObjectUtil.isNotNull(loginUser)) {
+            List<SysRole> roles = loginUser.getUser().getRoles();
+            boolean flag = false;
+            if (roles.size() > 0) {
+                for (SysRole role : roles) {
+                    String roleKey = role.getRoleKey();
+                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey) || "admin".equals(roleKey))) {
+                        flag = true;
+                        break;
+                    }
+                }
+            }
+            if (!flag) {
+                Long deptId = loginUser.getUser().getDeptId();
+                bmProject.setDeptId(deptId);
+            }
+        }
         List<BmProject> list = bmProjectService.selectToBeReviewedList(bmProject);
         return getDataTable(list);
     }
@@ -187,23 +210,23 @@ public class BmProjectController extends BaseController {
         startPage();
         LoginUser loginUser = SecurityUtils.getLoginUser();
         Long deptId = -1L;
-        if (ObjectUtil.isNotNull(loginUser)){
+        if (ObjectUtil.isNotNull(loginUser)) {
             List<SysRole> roles = loginUser.getUser().getRoles();
             boolean flag = false;
-            if (roles.size() > 0){
+            if (roles.size() > 0) {
                 for (SysRole role : roles) {
                     String roleKey = role.getRoleKey();
-                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey)||"admin".equals(roleKey))){
+                    if (StringUtils.isNotBlank(roleKey) && ("manage".equals(roleKey) || "admin".equals(roleKey))) {
                         flag = true;
                         break;
                     }
                 }
             }
-            if (!flag){
+            if (!flag) {
                 deptId = loginUser.getUser().getDeptId();
             }
         }
-        List<BmProject> list = bmProjectService.selectStatisticsList(projectStatus,deptId);
+        List<BmProject> list = bmProjectService.selectStatisticsList(projectStatus, deptId);
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: druid
+    active: prod
   # 文件上传
   servlet:
      multipart:

ruoyi-system/src/main/java/com/ruoyi/system/mapper/project/BmDeptPlanMapper.java

@@ -72,19 +72,19 @@ public interface BmDeptPlanMapper
 
 
     /**
-     * 统计分析-在谈线索-单位榜单
+     * 统计分析-在谈线索-两区及乡镇
      * @return
      */
     public List<BmDeptPlanVo> selectUnitClueList(@Param("year")String year);
 
     /**
-     * selectTargetSigningList
+     * 两区及乡镇榜单
      * @return
      */
     public List<BmDeptPlanVo> selectTargetSigningList(@Param("year")String year);
 
     /**
-     * 统计分析-合同金额
+     * 统计分析-签约项目-市直榜单
      * @return
      */
     public List<BmDeptPlanVo> selectTotAmtList(@Param("year")String year);
@@ -96,14 +96,14 @@ public interface BmDeptPlanMapper
     public List<BmDeptPlanVo> selectProjectUnitAmountEharts(@Param("year")String year);
 
     /**
-     * 统计分析-在建项目-榜单
+     * 统计分析-在建项目-市直榜单
      * @param year
      * @return
      */
     public List<BmDeptPlanVo> selectProjectUnitAmountUnit(@Param("year")String year);
 
     /**
-     * 统计分析-入归榜单
+     * 统计分析-投产项目-两区及乡镇入归榜单
      * >8 根据字典值来判断是否是已经入归(项目完成)状态
      * @return
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmDeptPlanServiceImpl.java

@@ -117,7 +117,7 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
 
 
     /**
-     * 统计分析-再谈线索-单位榜单
+     * 统计分析-再谈线索-两区及乡镇
      * @return
      */
     @Override
@@ -127,7 +127,7 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
     }
 
     /**
-     * 统计分析-签约项目-目标签约数
+     * 统计分析-签约项目-两区及乡镇榜单
      * @return
      */
     @Override
@@ -137,7 +137,7 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
     }
 
     /**
-     * 统计分析-合同金额
+     * 统计分析-签约项目-市直榜单
      * @return
      */
     @Override
@@ -169,7 +169,7 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
     }
 
     /**
-     * 统计分析-在建项目-榜单
+     * 统计分析-在建项目-市直榜单
      * @param year
      * @return
      */
@@ -180,7 +180,7 @@ public class BmDeptPlanServiceImpl implements IBmDeptPlanService
     }
 
     /**
-     * 统计分析-入归榜单
+     * 统计分析-投产项目-两区及乡镇入归榜单
      * @return
      */
 

ruoyi-system/src/main/java/com/ruoyi/system/service/project/IBmDeptPlanService.java

@@ -71,19 +71,19 @@ public interface IBmDeptPlanService
 
 
     /**
-     * 统计分析-再谈线索-单位榜单
+     * 统计分析-再谈线索-两区及乡镇
      * @return
      */
     public List<BmDeptPlanVo> selectUnitClueList(String year);
 
     /**
-     * 统计分析-签约项目-目标签约数
+     * 统计分析-签约项目-两区及乡镇榜单
      * @return
      */
     public List<BmDeptPlanVo> selectTargetSigningList(String year);
 
     /**
-     * 统计分析-合同金额
+     * 统计分析-签约项目-市直榜单
      * @return
      */
     public List<BmDeptPlanVo> selectTotAmtList(String year);
@@ -97,14 +97,14 @@ public interface IBmDeptPlanService
 
 
     /**
-     * 统计分析-在建项目-榜单
+     * 统计分析-在建项目-市直榜单
      * @param year
      * @return
      */
     public List<BmDeptPlanVo> selectProjectUnitAmountUnit(String year);
 
     /**
-     * 统计分析-入归榜单
+     * 统计分析-投产项目-两区及乡镇入归榜单
      * @return
      */
     public List<BmDeptPlanVo> selectInvestmentList(String year);

ruoyi-system/src/main/resources/mapper/system/project/BmDeptPlanMapper.xml

@@ -116,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	SELECT
 		sd.dept_id,
 		sd.dept_name,
+		sd.parent_id,
 		a.sys_dept_id,
 		(ifnull(a.project_million_num,0)+ ifnull(a.project_pro_num,0)+ ifnull(a.project_investment_num,0))as plan
 	FROM
@@ -128,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id
 	AND p.is_del = '0'
 	and year(p.create_time) = #{year}
+	where
+	s1.parent_id = 105
     GROUP BY
 	s1.dept_id
     ORDER BY
@@ -145,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	SELECT
 	    sd.dept_id,
 		sd.dept_name,
+		sd.parent_id,
 		a.sys_dept_id,
 		(ifnull(a.project_million_num,0)+ ifnull(a.project_pro_num,0)+ ifnull(a.project_investment_num,0))as target_signing_num
 	FROM
@@ -152,7 +156,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		LEFT JOIN `bm_dept_plan_area` a ON a.sys_dept_id = sd.dept_id and a.is_del = '0'
 		where sd.del_flag = '0'
 	) s1
-	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id and p.is_del = '0' and p.project_status > 4 and year(p.create_time) = #{year}
+	LEFT JOIN bm_project p ON p.dept_id = s1.sys_dept_id
+	and p.is_del = '0' and p.project_status > 4 and year(p.create_time) = #{year}
+	where
+	s1.parent_id = 105
     GROUP BY
 	s1.dept_id
     ORDER BY
@@ -172,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	LEFT JOIN bm_dept_plan dp ON dp.sys_dept_id = d.dept_id and year(dp.create_time) = #{year}
     WHERE
 	d.del_flag = '0'
+	and d.parent_id = 124
     GROUP BY
 	d.dept_id
     ORDER BY
@@ -239,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	) s1 ON s1.dept_id = d.sys_dept_id
 	WHERE
 	sd.del_flag = '0'
+	and sd.parent_id = 124
     ORDER BY
 	s1.payForMoney DESC
     </select>
@@ -254,7 +263,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	LEFT JOIN bm_project p ON p.dept_id = d.dept_id
 	and p.is_del = '0' and p.project_status &gt; 8 and year(p.create_time) = #{year}
 	LEFT JOIN bm_dept_plan_area dp ON dp.sys_dept_id = d.dept_id and year(dp.create_time) = #{year}
-	where d.del_flag = '0'
+	where d.del_flag = '0' and d.parent_id = 105
     GROUP BY
 	d.dept_id
 	order by successMission DESC,

ruoyi-system/src/main/resources/mapper/system/project/BmProjectMapper.xml

@@ -90,9 +90,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM
         bm_project p
         left join sys_dict_data sdd on p.project_status = sdd.dict_value and sdd.dict_type = 'project_status'
-        where
+        <where>
         p.is_del = '0' and
         sdd.dict_value=(sdd.dict_value<![CDATA[>>]]>1)<![CDATA[<<]]>1
+        <if test="deptId != null"> and p.dept_id = #{deptId}</if>
+        </where>
         order by p.create_time DESC
     </select>
     

ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
   title: '招商引资管理系统',
-  // urls: 'http://47.99.82.249:80',
-  urls: 'http://192.168.101.11:8010',
+  urls: 'http://47.99.82.249:80',
+  // urls: 'http://192.168.101.11:8010',
 
   /**
    * 侧边栏主题 深色主题theme-dark，浅色主题theme-light
@@ -35,6 +35,6 @@ module.exports = {
    * If you want to also use it in dev, you can pass ['production', 'development']
    */
   errorLog: 'production',
-  apiUrl: 'http://192.168.101.11:8010'
-  // apiUrl: 'http://47.99.82.249:80'
+  // apiUrl: 'http://192.168.101.11:8010'
+  apiUrl: 'http://47.99.82.249:80'
 }