登记项目发送企业微信消息

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/file/FilesProjectController.java

@@ -194,7 +194,7 @@ public class FilesProjectController extends BaseController {
      * 根据项目编号查询项目信息
      */
     @GetMapping("/query/{projectNumbers}")
-    public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers){
+    public AjaxResult getInfoByProjectNumber(@PathVariable String[] projectNumbers) {
         return AjaxResult.success(cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers));
     }
 }

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -127,33 +127,6 @@ public class CmcProjectController extends BaseController
     public AjaxResult add(@RequestBody CmcProject cmcProject) throws IOException {
         cmcProject.setRegisterTime(new Date());
         cmcProject.setIsFinished("0");
-//        if (cmcProjectService.insertCmcProject(cmcProject) > 0) {
-//            String message = "经营发展部已发起项目登记：  \n>" +
-//                    "登记人： <font color='info'>" + userService.selectUserById(cmcProject.getProjectRegistrant()).getNickName() + "</font>  \n>" +
-//                    "项目编号：" + cmcProject.getProjectNumber() + "  \n>" +
-//                    "项目名称：" + cmcProject.getProjectName() + "  \n>" +
-//                    "  \n>" +
-//                    "项目类型：<font color='comment'>" + cmcProject.getProjectType() + "</font>  \n>" +
-//                    "项目来源：" + (cmcProject.getProjectSource().equals("0") ? "院内" : "院外") +"  \n>" +
-//                    "甲方单位：" + cmcPartyAService.selectCmcPartyAByPartyAId(cmcProject.getPartyAId()).getPartyAName() + "  \n>" +
-//                    "  \n>" +
-//                    "承担部门：<font color='warning'>" + deptIdToName(cmcProject) + "</font>  \n>" +
-//                    "请您确认承担部门，及时跟进项目流转  \n>" +
-//                    "  \n>";
-//            if (cmcProject.getUndertakingDept() != null) {
-//                String deptString = cmcProject.getUndertakingDept() + ",105";
-//                List<String> managerList = new ArrayList<>();
-//                String[] deptId = deptString.split(",");
-//                for (String dept : deptId) {
-//                        List<SysUser> manageList = getManageId(dept, "");
-//                        for (SysUser manager : manageList) {
-//                            managerList.add(manager.getPinyin());
-//
-//                    }
-//                }
-//                MessageController.sendAppMessage(message, StringUtils.join(managerList, "|"));
-//            }
-//        }
         return toAjax(cmcProjectService.insertCmcProject(cmcProject));
     }
 
@@ -167,6 +140,41 @@ public class CmcProjectController extends BaseController
         return toAjax(cmcProjectService.updateCmcProject(cmcProject));
     }
 
+    /**
+     * 登记项目发送企业微信消息
+     */
+    @PostMapping("/sendMessage")
+    public AjaxResult sendMessage(@RequestBody CmcProject cmcProject) throws IOException {
+            String message = "经营发展部已发起项目登记：  \n>" +
+                    "登记人： <font color='info'>" + userService.selectUserById(cmcProject.getProjectRegistrant()).getNickName() + "</font>  \n>" +
+                    "项目编号：" + cmcProject.getProjectNumber() + "  \n>" +
+                    "项目名称：" + cmcProject.getProjectName() + "  \n>" +
+                    "  \n>" +
+                    "项目类型：<font color='comment'>" + cmcProject.getProjectType() + "</font>  \n>" +
+                    "项目来源：" + (cmcProject.getProjectSource().equals("0") ? "院内" : "院外") +"  \n>" +
+                    "甲方单位：" + cmcPartyAService.selectCmcPartyAByPartyAId(cmcProject.getPartyAId()).getPartyAName() + "  \n>" +
+                    "  \n>" +
+                    "承担部门：<font color='warning'>" + deptIdToName(cmcProject) + "</font>  \n>" +
+                    "请您确认承担部门，及时跟进项目流转  \n>" +
+                    "  \n>";
+            if (cmcProject.getUndertakingDept() != null) {
+                String deptString = cmcProject.getUndertakingDept() + ",105";
+                List<String> managerList = new ArrayList<>();
+                managerList.add("WangRongHua");
+                managerList.add("YuSiHan");
+//                String[] deptId = deptString.split(",");
+//                for (String dept : deptId) {
+//                        List<SysUser> manageList = getManageId(dept, "");
+//                        for (SysUser manager : manageList) {
+//                            managerList.add(manager.getPinyin());
+//
+//                    }
+//                }
+                MessageController.sendAppMessage(message, StringUtils.join(managerList, "|"));
+        }
+        return success("");
+    }
+
     /**
      * 删除cmc项目
      */

oa-ui/src/api/oa/project/project.js

@@ -2,7 +2,7 @@
  * @Author: wrh
  * @Date: 2024-01-30 16:37:46
  * @LastEditors: wrh
- * @LastEditTime: 2024-07-30 17:32:58
+ * @LastEditTime: 2024-09-06 09:45:24
  */
 import request from '@/utils/request'
 
@@ -50,6 +50,15 @@ export function updateProject(data) {
   })
 }
 
+// 登记项目发送企业微信消息
+export function sendMessage(data) {
+  return request({
+    url: '/oa/project/sendMessage',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除cmc项目
 export function delProject(projectId) {
   return request({

oa-ui/src/views/file/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-06-21 18:51:49
  * @LastEditors: wrh
- * @LastEditTime: 2024-09-05 10:46:23
+ * @LastEditTime: 2024-09-05 16:58:22
 -->
 <template>
   <div class="warpper-container">
@@ -198,7 +198,7 @@
         </div>
 
         <!-- 成果目录 -->
-        <div class="achi-list dialog_wrap" v-if="dialogTableVisible">
+        <div class="achi-list dialog_wrap" v-if="dialogTableVisible" @mousedown.stop="move">
           <div class="achi-content">
             <div class="achi-header">
               成果目录
@@ -503,11 +503,13 @@ export default {
           getInfoByProjectNumbers(newArray).then(res => {
             if (res.data) {
               that.projectList = res.data;
+              that.total = res.data.length;
               if (that.isOpenPro == true) {
                 that.isOpenPro = false;
               }
             } else {
               that.projectList = that.allproTableData;
+              that.total = that.allproTableData.length;
             }
           })
         }
@@ -559,7 +561,7 @@ export default {
       this.dialogTableVisible = true;
       let projectId = this.clickFeature.projectId;
       this.dialogTitle = this.clickFeature.projectNumber;
-      listAchievement({ projectId }).then(res => {
+      listAchievement({ projectId: projectId, pageSize: 50, pageNum: 1 }).then(res => {
         if (res.total == 0) {
           this.$message.error('暂无成果，请添加');
           this.achiDialogData = [];
@@ -782,7 +784,20 @@ export default {
     },
     handleCurrentChange(val) {
       this.queryParams.pageNum = val
-      this.getProjectList(this.queryParams)
+      if (this.seletctedCluters != []) {
+        let newArray = [...new Set(this.seletctedCluters)];
+        getInfoByProjectNumbers(newArray).then(res => {
+          if (res.data) {
+            this.projectList = res.data;
+            this.total = res.data.length;
+          } else {
+            that.projectList = that.allproTableData;
+            that.total = that.allproTableData.length;
+          }
+        })
+      }
+      else
+        this.getProjectList(this.queryParams)
     },
     /* 得到项目的点位绘制到地图上 */
     clusterStyle(feature, resolution) {
@@ -965,7 +980,7 @@ export default {
     lookThisAchi(row) {
       let projectId = row.projectId;
       this.dialogTitle = row.projectNumber;
-      listAchievement({ projectId }).then(res => {
+      listAchievement({ projectId: projectId, pageSize: 50, pageNum: 1 }).then(res => {
         if (res.total == 0) {
           this.$message.error('暂无成果，请添加');
           this.achiDialogData = [];