修改项目申报逻辑

doc/flow.md

@@ -27,3 +27,30 @@
 -- 合规性审查补发  （这里可以选择已经发送过得部门）
 -- 合规性审查
 下一审批人为联合工作小组
+
+#### 2024年2月26日21:39:12
+凌伟:
+这三类项目，这4个处室都可以审核
+
+凌伟:
+[图片]
+
+WJ:
+这个还是正常绑定 这个四个部门其中一个就行了
+
+WJ:
+[图片]
+
+下面这个用户16921 可以看到           
+departmentIdList.add(67); //企业服务处
+departmentIdList.add(69); // 信息化处
+departmentIdList.add(71); // 产业发展处
+departmentIdList.add(72); // 经济运行处
+这四个部门绑定的所有申报服务的单据。
+
+部署：
+INSERT INTO `service_platform`.`z_user` (`id`, `user_name`, `nick_name`, `password`, `is_start`, `phone`, `email`, `user_type`, `is_admin`, `build_id`, `build_name`, `company_id`, `company_name`, `street_id`, `street_name`, `department_id`, `contract`, `create_time`, `create_by`, `update_by`, `update_time`, `del_flag`, `create_name`, `update_name`, `approve_level`, `fist_login`, `is_register`, `organization_code`, `id_number`) VALUES (16921, '经发委', 'jfwxmsh', 'ca00e46379ce4a28f5902c2fce3da98c', 1, '18611547873', NULL, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 17, NULL, '2024-02-26 21:19:51', 9416, NULL, NULL, 0, 'weiwei', NULL, NULL, NULL, 1, NULL, NULL);
+
+# 项目申报总负责人id
+projectMasterUserId: 16921
+

src/main/java/platform/modules/government/service/ProjectDeclarationService.java

@@ -11,6 +11,7 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
@@ -142,6 +143,9 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
     @Autowired
     private ProjectService projectService;
 
+    @Value("${projectMasterUserId}")
+    private Integer projectMasterUserId;
+
     public PageInfo<ProjectDeclaration> findPageInfo(String projectName, Integer pageNum, Integer pagesize,
                                                      String startTime1, String startTime2, String endTime1, String endTime2) {
 
@@ -853,10 +857,22 @@ public class ProjectDeclarationService extends BaseService<ProjectDeclaration> {
         Integer departmentId = 21;//中心窗口
         if (!department.getParent_id().equals(departmentId)) departmentId = department.getId();
 
+
         Example example = new Example(Project.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("del_flag", "0");
-        criteria.andEqualTo("department_id", departmentId);
+        if (Objects.equals(user_id, projectMasterUserId)) {
+            List<Integer> departmentIdList = new ArrayList<>();
+            departmentIdList.add(departmentId);
+            departmentIdList.add(67); //企业服务处
+            departmentIdList.add(69); // 信息化处
+            departmentIdList.add(71); // 产业发展处
+            departmentIdList.add(72); // 经济运行处
+            criteria.andIn("department_id", departmentIdList);
+        } else {
+            criteria.andEqualTo("department_id", departmentId);
+        }
+
         List<Project> projectList = projectDao.selectByExample(example);
 
         List<String> project_ids = new ArrayList<>();

src/main/resources/application-aliyun.yml

@@ -208,6 +208,8 @@ company-master-phone: 18625008937
 #endpoints:
 #    health:
 #      sensitive: false
+# 项目申报总负责人id
+projectMasterUserId: 16921
 
 referer:
   # 是否开启referer拦截

src/main/resources/application-prodin.yml

@@ -210,6 +210,9 @@ company-master-phone: 18362602202
 #endpoints:
 #    health:
 #      sensitive: false
+# 项目申报总负责人id
+projectMasterUserId: 16921
+
 
 referer:
   # 是否开启referer拦截

src/main/resources/application-prodout.yml

@@ -213,6 +213,8 @@ company-master-phone: 18362602202
 #endpoints:
 #    health:
 #      sensitive: false
+# 项目申报总负责人id
+projectMasterUserId: 16921
 
 referer:
   # 是否开启referer拦截

src/main/resources/application-test.yml

@@ -205,6 +205,8 @@ company-master-phone: 18362602202
 #endpoints:
 #    health:
 #      sensitive: false
+# 项目申报总负责人id
+projectMasterUserId: 16921
 
 referer:
   # 是否开启referer拦截