初始化项目信息

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -530,6 +530,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .startedBy(userId.toString())
                 .orderByProcessInstanceStartTime()
                 .desc();
+        if (StringUtils.isNotBlank(queryVo.getName())){
+            historicProcessInstanceQuery.processDefinitionName(queryVo.getName());
+        }
         List<HistoricProcessInstance> historicProcessInstances = historicProcessInstanceQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
         page.setTotal(historicProcessInstanceQuery.count());
         List<FlowTaskDto> flowList = new ArrayList<>();
@@ -826,6 +829,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 .taskAssignee(userId.toString())
                 .orderByHistoricTaskInstanceEndTime()
                 .desc();
+        if (StringUtils.isNotBlank(queryVo.getName())){
+            taskInstanceQuery.processDefinitionNameLike(queryVo.getName());
+        }
         List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
         List<FlowTaskDto> hisTaskList = new ArrayList<>();
         for (HistoricTaskInstance histTask : historicTaskInstanceList) {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -28,7 +28,7 @@ public class CmcProject extends BaseEntity
 
     /** 项目状态 */
     @Excel(name = "项目状态")
-    private String status;
+    private String isFinished;
 
     public void setProjectId(String projectId) 
     {
@@ -57,14 +57,14 @@ public class CmcProject extends BaseEntity
     {
         return projectNumber;
     }
-    public void setStatus(String status)
+    public void setIsFinished(String isFinished)
     {
-        this.status = status;
+        this.isFinished = isFinished;
     }
 
-    public String getStatus()
+    public String getIsFinished()
     {
-        return status;
+        return isFinished;
     }
 
     @Override
@@ -73,7 +73,7 @@ public class CmcProject extends BaseEntity
             .append("projectId", getProjectId())
             .append("projectName", getProjectName())
             .append("projectNumber", getProjectNumber())
-            .append("status", getStatus())
+            .append("isFinished", getIsFinished())
             .toString();
     }
 }

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

@@ -8,11 +8,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId"    column="project_id"    />
         <result property="projectName"    column="project_name"    />
         <result property="projectNumber"    column="project_number"    />
-        <result property="status"    column="status"    />
+        <result property="isFinished"    column="is_finished"    />
     </resultMap>
 
     <sql id="selectCmcProjectVo">
-        select project_id, project_name, project_number, status from cmc_project
+        select project_id, project_name, project_number, is_finished from cmc_project
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
             <if test="projectNumber != null  and projectNumber != ''"> and project_number like concat('%', #{projectNumber}, '%')</if>
-            <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="isFinished != null  and isFinished != ''"> and is_finished = #{isFinished}</if>
         </where>
     </select>
     
@@ -35,13 +35,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">project_id,</if>
             <if test="projectName != null">project_name,</if>
             <if test="projectNumber != null">project_number,</if>
-            <if test="status != null">status,</if>
+            <if test="isFinished != null">is_finished,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="projectId != null">#{projectId},</if>
             <if test="projectName != null">#{projectName},</if>
             <if test="projectNumber != null">#{projectNumber},</if>
-            <if test="status != null">#{status},</if>
+            <if test="isFinished != null">#{isFinished},</if>
          </trim>
     </insert>
 
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="projectName != null">project_name = #{projectName},</if>
             <if test="projectNumber != null">project_number = #{projectNumber},</if>
-            <if test="status != null">status = #{status},</if>
+            <if test="isFinished != null">is_finished = #{isFinished},</if>
         </trim>
         where project_id = #{projectId}
     </update>

oa-back/sql/ry_20231130.sql

@@ -1258,68 +1258,71 @@ create table cmc_project  (
   project_id		char(19)				not null			comment '项目id',
   project_number	varchar(10)				default null		comment '项目编号',
   project_name		varchar(255)			default null		comment '项目名称',
-  status			char(3)					default null		comment '项目状态',
+  is_finished		char(1)					default null		comment '项目状态',
   primary key (project_id)
 ) engine = innodb comment = 'cmc项目表';
 
 -- ----------------------------
 -- 初始化-项目表数据
 -- ----------------------------
-insert into cmc_project values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', null);
-insert into cmc_project values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', null);
-insert into cmc_project values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', null);
-insert into cmc_project values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', null);
-insert into cmc_project values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', null);
-insert into cmc_project values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', null);
-insert into cmc_project values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', null);
-insert into cmc_project values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', null);
-insert into cmc_project values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', null);
-insert into cmc_project values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', null);
-insert into cmc_project values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', null);
-insert into cmc_project values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', null);
-insert into cmc_project values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', null);
-insert into cmc_project values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', null);
-insert into cmc_project values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', null);
-insert into cmc_project values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', null);
-insert into cmc_project values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', null);
-insert into cmc_project values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', null);
-insert into cmc_project values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', null);
-insert into cmc_project values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', null);
-insert into cmc_project values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', null);
-insert into cmc_project values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', null);
-insert into cmc_project values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', null);
-insert into cmc_project values ('1679770747494465538', '2023C47', ' 绵竹抽水蓄能电站界桩测设工作', null);
-insert into cmc_project values ('1679772570787774466', '2023W24', '双流地形图测绘', null);
-insert into cmc_project values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', null);
-insert into cmc_project values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', null);
-insert into cmc_project values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', null);
-insert into cmc_project values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', null);
-insert into cmc_project values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', null);
-insert into cmc_project values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', null);
-insert into cmc_project values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', null);
-insert into cmc_project values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', null);
-insert into cmc_project values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', null);
-insert into cmc_project values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', null);
-insert into cmc_project values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', null);
-insert into cmc_project values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', null);
-insert into cmc_project values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', null);
-insert into cmc_project values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', null);
-insert into cmc_project values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', null);
-insert into cmc_project values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', null);
-insert into cmc_project values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', null);
-insert into cmc_project values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', null);
-insert into cmc_project values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', null);
-insert into cmc_project values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', null);
-insert into cmc_project values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', null);
-insert into cmc_project values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', null);
-insert into cmc_project values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', null);
-insert into cmc_project values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', null);
-insert into cmc_project values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', null);
-insert into cmc_project values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', null);
-insert into cmc_project values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', null);
-insert into cmc_project values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', null);
-insert into cmc_project values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', null);
-insert into cmc_project values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', null);
+insert into `cmc_project` values ('1633765257669246977', '2023C05', 'ML及JW水电工程建设征地实物指标调查配合测量', '0');
+insert into `cmc_project` values ('1633768222907957249', '2023C12', '雅砻江两河口水电站水库泥沙监测系统建设工程、运行维护及泥沙淤积影响分析研究项目测量工作', '0');
+insert into `cmc_project` values ('1633770346022699010', '2023W02', '雅砻江桐子林水电站水库泥沙断面测量', '0');
+insert into `cmc_project` values ('1633770811569471490', '2023C01', '绵竹抽水蓄能电站工程区可研阶段地形图测绘', '0');
+insert into `cmc_project` values ('1633771027018285057', '2023C02', '江油抽水蓄能电站可研阶段工程区1：1000地形图测绘', '0');
+insert into `cmc_project` values ('1633771294472273922', '2023C17', '江油抽水蓄能水电站青江补水泵断面测量项目', '0');
+insert into `cmc_project` values ('1633781742236073985', '2023C22', '牙根一级水电站坝址下游河段整治测绘工作', '0');
+insert into `cmc_project` values ('1641355612560293889', '2023C26', '金沙江上游清洁能源基地叶巴滩混合式抽水蓄能电站地形图测绘', '0');
+insert into `cmc_project` values ('1641805297456513026', '2023HY01', '航测遥感中心零星及借调项目', '0');
+insert into `cmc_project` values ('1641807061123596290', '2023C24', '岷江干流张坎航电枢纽工程界桩测设工作', '0');
+insert into `cmc_project` values ('1652690353125326849', '2023W13', '拉萨水环境项目测绘工作', '0');
+insert into `cmc_project` values ('1658642869419769857', '2023C44', '老木孔水电站库区道路边沟坐标高程测量', '0');
+insert into `cmc_project` values ('1658656258510553089', '2023C23', 'YX移民项目地形图测绘', '0');
+insert into `cmc_project` values ('1673601192074149890', '2023C49', '甘孜抽水蓄能水电站地形图测绘', '0');
+insert into `cmc_project` values ('1673601523608715266', '2023C54', '国能大渡河汉源永利坪光伏电站项目1：500地形图测绘', '0');
+insert into `cmc_project` values ('1673601908515799042', '2023C52', '老木孔航电枢纽工程排涝区域1：2000地形图测绘', '0');
+insert into `cmc_project` values ('1673602123545182210', '2023C53', '岷江干流张坎航电枢纽工程排涝区域1：2000地形图测绘', '0');
+insert into `cmc_project` values ('1676948354560425986', '2023C58', '溪洛渡水电站雷波县元宝乡跑马坪村配合测量', '0');
+insert into `cmc_project` values ('1676948591949643777', '2023C59', '老沟水库库容曲线测量', '0');
+insert into `cmc_project` values ('1676948942941585410', '2023C57', '官地水电站地形图测绘本', '0');
+insert into `cmc_project` values ('1679769237196898306', '2022C65', '大熊猫国家公园芦山县长石坝-南天门、鹿厂河-九里岗防火道路恢复重建工程地形图测绘', '0');
+insert into `cmc_project` values ('1679769589929476097', '2022C66', '大熊猫国家公园芦山县保护管理设施项目地形图测绘', '0');
+insert into `cmc_project` values ('1679769796872241154', '2023C60', '大渡河流域扩机电站坐标转换', '0');
+insert into `cmc_project` values ('1679770747494465538', '2023C47', '绵竹抽水蓄能电站界桩测设工作', '0');
+insert into `cmc_project` values ('1679772570787774466', '2023W24', '双流地形图测绘', '0');
+insert into `cmc_project` values ('1685853339360690177', '2023W27', '简阳1：2000地形图测绘', '0');
+insert into `cmc_project` values ('1685853709264748546', '2023C61', '革什扎河吉牛水电站8#支洞口地形图测绘', '0');
+insert into `cmc_project` values ('1694527969734688770', '2023C63', '波罗水电站补充地形地类图测绘', '0');
+insert into `cmc_project` values ('1694528325550080002', '2023C69', '金沙江岗托水电站地形图测绘', '0');
+insert into `cmc_project` values ('1694633405980868610', '2023C66', '硬梁包水电站库区实物指标配合测量', '0');
+insert into `cmc_project` values ('1694634867926499329', '2023C62', '铜街子水电站坝后段及渣场1：500地形图测绘', '0');
+insert into `cmc_project` values ('1697108010087743490', '2023C72', '江油抽水蓄能电站界桩测设工作', '0');
+insert into `cmc_project` values ('1697109013545615362', '2023C73', '雅江抽水蓄能电站规划阶段地形图测量', '0');
+insert into `cmc_project` values ('1702491945512730626', '2023C76', '牙根二级水电站1：2000地形地类图测绘', '0');
+insert into `cmc_project` values ('1702492292125818881', '2023C75', '金沙江波罗水电站集镇新址国省干道占地范围公路配合测量', '0');
+insert into `cmc_project` values ('1707211932139782146', '2023C78', '双江口混合式抽水蓄能电站地形图测绘', '1');
+insert into `cmc_project` values ('1707626752387317762', '2023C74', '攀枝花市仁和区南部一期280MW光伏项目1:500地形图测绘', '1');
+insert into `cmc_project` values ('1713455412201652225', '2023C79', '雅江抽水蓄能电站（茈卡村）地形图测绘', '0');
+insert into `cmc_project` values ('1715703538933301249', '2023C80', '安徽省西形冲抽水蓄能电站可研阶段地形图测绘', '0');
+insert into `cmc_project` values ('1718965187043655682', '2023C82', '叙州区抽水蓄能电站1：2000地形图测绘', '0');
+insert into `cmc_project` values ('1718973009617747970', '2023C83', 'YJ电站施工图阶段1:500地形图补测工作', '1');
+insert into `cmc_project` values ('1721876576657735682', '2023C89', '雅下多雄拉隧洞部位控制点复核工作', '1');
+insert into `cmc_project` values ('1729523067262074882', '2023C86', '叶巴滩水电站连接道路硬化改建工程1：2000地形图测绘', '0');
+insert into `cmc_project` values ('1729523327594135553', '2023C88', '大邑抽水蓄能水电站可研阶段地形图测绘', '0');
+insert into `cmc_project` values ('1729523650169667586', '2023C90', '牙根二级水电站集镇新址、泥石流沟、取水线路地形图测绘', '0');
+insert into `cmc_project` values ('1729523884455100418', '2023C93', '新龙抽水蓄能电站地形图测绘（新站址）', '0');
+insert into `cmc_project` values ('1730092422756564993', '2023C87', '中核汇能昭觉县264MW风电+宁南县49MW风电项目', '1');
+insert into `cmc_project` values ('1731465142576611330', '2023C94', 'JW梯级电站可研阶段地形图测绘', '0');
+insert into `cmc_project` values ('1737454765236813825', '2023C101', 'ML水电站可研阶段1：1000地形图测绘', '0');
+insert into `cmc_project` values ('1739658607567306754', '2023W37', '大唐长河坝115万千瓦光伏项目1:2000地形图测绘', '0');
+insert into `cmc_project` values ('1739658998220587009', '2023C99', '两河口水电站库区6座复建桥梁桥址河道断面形态以及桥墩、桥台的形态测量', '0');
+insert into `cmc_project` values ('1739961827233628162', '2023C97', '西藏江达鲁格一期120万kW光伏项目场址地形图', '0');
+insert into `cmc_project` values ('1741421858231681026', '2023C98', '藏东南（玉察）水风光一体化基地八宿2、3号光伏地形图测绘', '0');
+insert into `cmc_project` values ('1741422198586867714', '2023C95', '藏东南（玉察）水风光一体化基地八宿8号光伏地形图测绘', '0');
+insert into `cmc_project` values ('1741422566360219650', '2023C96', '藏东南（玉察）水风光一体化基地八宿12号光伏地形图测绘（Ⅰ标段测绘）', '0');
+insert into `cmc_project` values ('1752902350986543105', '2024HY01', '航测遥感中心借调、零星项目', '0');
+insert into `cmc_project` values ('1752903021416677378', '2024W02', '凤山平乐风电场地形图测绘', '0');
+
 
 -- ----------------------------
 -- 23、cmc车辆信息表

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-26 17:01:28
+ * @LastEditTime: 2024-02-27 10:33:41
 -->
 <template>
   <div class="app-container home">
@@ -127,7 +127,7 @@
         <span class="title-text">项目列表</span>
       </div>
       <el-table :data="projectData" style="width: 100%">
-        <el-table-column prop="state" label="状态">
+        <el-table-column prop="isFinshed" label="状态"> {{ isFinished == '1' ? '已结束' : '进行中' }}
         </el-table-column>
         <el-table-column prop="projectNumber" label="项目编号">
         </el-table-column>
@@ -141,6 +141,7 @@
 <script>
 import { mapGetters } from "vuex";
 import { getUserProfile } from "@/api/system/user";
+import { listProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
 import { getDicts as getDicts, getData } from '@/api/system/dict/data'
 export default {
@@ -164,6 +165,7 @@ export default {
   created() {
     this.getUser();
     this.getDetail();
+    this.getProject();
   },
   methods: {
     goTarget(href) {
@@ -189,6 +191,11 @@ export default {
     gotoTask() {
       this.$router.push({ path: "/task/process" });
     },
+    getProject() {
+      listProject({pageSize: 100}).then(response => {
+        this.projectData = response.rows;
+      })
+    },
     // 获取考核待办
     getDetail() {
       todoList({