根据项目编号查询项目

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

@@ -129,10 +129,10 @@ public class FilesAchievementController extends BaseController
                 if (filesAchievement.getId() == null || !IdList.contains(filesAchievement.getId()))
                     filesAchievement.setId(new SnowFlake().generateId());
                 CmcProject cmcProject = new CmcProject();
-                String[] projectNumbers = new String[1];
-                projectNumbers[0] = filesAchievement.getProjectNumber();
-                if (cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers).size() > 0)
-                    cmcProject = cmcProjectService.selectCmcProjectByProjectNumbers(projectNumbers).get(0);
+                CmcProject project = new CmcProject();
+                project.setProjectNumber(filesAchievement.getProjectNumber());
+                if (cmcProjectService.selectCmcProjectByProjectNumbers(project).size() > 0)
+                    cmcProject = cmcProjectService.selectCmcProjectByProjectNumbers(project).get(0);
                 if (cmcProject != null)
                     filesAchievement.setProjectId(cmcProject.getProjectId());
                 else

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

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

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

@@ -80,6 +80,7 @@ public class CmcCarController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcCar cmcCar)
     {
+        cmcCar.setStatus("1");
         if (cmcCar.getAcquisitionTime() != null && cmcCar.getCost() != null && cmcCar.getDayCost() == null) {
             // 年数总和法折旧
             int acquisitionYear = Integer.parseInt(new SimpleDateFormat("yyyy").format(cmcCar.getAcquisitionTime()));

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

@@ -145,34 +145,34 @@ public class CmcProjectController extends BaseController
      */
     @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, "|"));
+        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("");
+        return success();
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectMapper.java

@@ -22,10 +22,10 @@ public interface CmcProjectMapper
     /**
      * 查询cmc项目
      *
-     * @param projectNumbers cmc项目编号
+     * @param cmcProject cmc项目
      * @return cmc项目列表
      */
-    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumbers);
+    public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
     /**
      * 查询cmc项目列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectService.java

@@ -23,10 +23,10 @@ public interface ICmcProjectService
     /**
      * 查询cmc项目
      *
-     * @param projectNumber cmc项目编号
+     * @param cmcProject cmc项目
      * @return cmc项目列表
      */
-    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumber);
+    public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
     /**
      * 查询cmc项目列表

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectServiceImpl.java

@@ -37,13 +37,13 @@ public class CmcProjectServiceImpl implements ICmcProjectService
     /**
      * 查询cmc项目
      *
-     * @param projectNumbers cmc项目编号
+     * @param cmcProject cmc项目
      * @return cmc项目列表
      */
     @Override
-    public List<CmcProject> selectCmcProjectByProjectNumbers(String[] projectNumbers)
+    public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject)
     {
-        return cmcProjectMapper.selectCmcProjectByProjectNumbers(projectNumbers);
+        return cmcProjectMapper.selectCmcProjectByProjectNumbers(cmcProject);
     }
 
     /**

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -122,10 +122,8 @@
     <select id="selectCmcProjectByProjectNumbers" parameterType="String" resultMap="CmcProjectResult">
         <include refid="selectCmcProjectVo"/>
         where
-        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]') and p.project_number in
-        <foreach item="projectNumber" collection="array" open="(" separator="," close=")">
-            #{projectNumber}
-        </foreach>
+        (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
+        and find_in_set(p.project_number, #{projectNumber})
     </select>
 
     <insert id="insertCmcProject" parameterType="CmcProject">

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

@@ -4,7 +4,7 @@
  * @Author: ysh
  * @Date: 2022-09-05 16:56:28
  * @LastEditors: wrh
- * @LastEditTime: 2024-05-10 15:40:55
+ * @LastEditTime: 2024-09-06 15:35:49
  */
 import request from '@/utils/request'
 
@@ -92,9 +92,10 @@ export function getProjectKml(url) {
 }
 
 // 根据项目编号查询项目信息
-export function getInfoByProjectNumbers(projectNumbers) {
+export function getInfoByProjectNumbers(data) {
   return request({
-    url: '/file/project/query/' + projectNumbers,
-    method: 'get'
+    url: '/file/project/query',
+    method: 'get',
+    params: data
   })
 }

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 16:58:22
+ * @LastEditTime: 2024-09-06 15:52:46
 -->
 <template>
   <div class="warpper-container">
@@ -499,11 +499,11 @@ export default {
             that.map.removeInteraction(that.drawBox);
           }
         } else if (e && e.keyCode == 13) {
-          let newArray = [...new Set(that.seletctedCluters)];
-          getInfoByProjectNumbers(newArray).then(res => {
-            if (res.data) {
-              that.projectList = res.data;
-              that.total = res.data.length;
+        let newArray = that.seletctedCluters.join(',');
+          getInfoByProjectNumbers({projectNumber: newArray, pageSize: that.queryParams.pageSize, pageNum: that.queryParams.pageNum}).then(res => {
+            if (res.total > 0) {
+              that.projectList = res.rows;
+              that.total = res.total;
               if (that.isOpenPro == true) {
                 that.isOpenPro = false;
               }
@@ -785,11 +785,11 @@ export default {
     handleCurrentChange(val) {
       this.queryParams.pageNum = val
       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;
+        let newArray = this.seletctedCluters.join(',');
+        getInfoByProjectNumbers({projectNumber: newArray, pageSize: this.queryParams.pageSize, pageNum: this.queryParams.pageNum}).then(res => {
+          if (res.total > 0) {
+            this.projectList = res.rows;
+            this.total = res.total;
           } else {
             that.projectList = that.allproTableData;
             that.total = that.allproTableData.length;

oa-ui/src/views/flowable/form/oa/carForm.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-01 10:52:16
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-06 14:14:38
 -->
 
 <template>
@@ -691,7 +691,8 @@ export default {
     getCarList() {
       listCar({
         pageNum: 1,
-        pageSize: 99999999
+        pageSize: 99999999,
+        status: 1
       }).then(response => {
         this.carList = response.rows;
       })

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

@@ -133,6 +133,12 @@
           <el-input style="width:400px;margin-right:10px;" v-model="form.dayCost" placeholder="若不填写，将以残值5%，采用年数总和法计提单日成本"/>
           <span>元</span>
         </el-form-item>
+        <el-form-item label="车辆状态" prop="status">
+          <el-select v-model="form.status" filterable placeholder="请选择">
+            <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -164,6 +170,7 @@ export default {
       total: 0,
       // cmc车辆信息表格数据
       carList: [],
+      statusList: [{ id: '0', name: '被领用' }, { id: '1', name: '可领用' }, { id: '2', name: '维修中' }, { id: '3', name: '已停用' }, { id: '4', name: '已报废' }],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -171,7 +178,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 50,
         licensePlate: null,
         driver: null
       },