Merge branch 'master' of http://oa.sccehui.com:6101/cmc-coding/cmc-oa

# Conflicts:
#	oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcContractMapper.xml

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

         return success(cmcProject);
     }
 
+    /**
+     * 查询cmc项目列表
+     */
+    @GetMapping("/listByPaticipates")
+    public TableDataInfo getListByPaticipates(CmcProject cmcProject) {
+        startPage();
+        List<CmcProject> list = cmcProjectService.selectListByPaticipates(cmcProject);
+        return getDataTable(list);
+    }
+
     /**
      * 项目自动编号
      */

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

      */
     public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
+    /**
+     * 查询cmc项目
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目列表
+     */
+    public List<CmcProject> selectListByPaticipates(CmcProject cmcProject);
+
     /**
      * 查询cmc测绘项目列表
      * 

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

      */
     public List<CmcProject> selectCmcProjectByProjectNumbers(CmcProject cmcProject);
 
+    /**
+     * 查询cmc项目
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目列表
+     */
+    public List<CmcProject> selectListByPaticipates(CmcProject cmcProject);
+
     /**
      * 查询cmc测绘项目列表
      * 

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

         return cmcProjectMapper.selectCmcProjectByProjectNumbers(cmcProject);
     }
 
+    /**
+     * 查询cmc项目
+     *
+     * @param cmcProject cmc项目
+     * @return cmc项目列表
+     */
+    @Override
+    public List<CmcProject> selectListByPaticipates(CmcProject cmcProject)
+    {
+        return cmcProjectMapper.selectListByPaticipates(cmcProject);
+    }
+
     /**
      * 查询cmc测绘项目列表
      * 

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

             <if test="projectSource != null  and projectSource != ''"> and p.project_source = #{projectSource}</if>
             <if test="projectName != null  and projectName != ''"> and p.project_name like concat('%', #{projectName}, '%')</if>
             <if test="partyAName != null  and partyAName != ''"> and pa.party_a_name like concat('%', #{partyAName}, '%')</if>
+<<<<<<< HEAD
+=======
+            
+>>>>>>> 2790a39d2f9879e185c89178e7033c6745b4bae9
         </where>
         group by t1.contract_id
         order by t1.draft_time desc

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

         and find_in_set(p.project_number, #{projectNumber})
     </select>
 
+    <select id="selectListByPaticipates" parameterType="String" resultMap="CmcProjectResult">
+        select distinct(t.project_id), t.project_number, t.project_name, t.project_leader, t.register_time from
+        (select p.project_id, p.project_number, p.project_name, p.project_leader, p.register_time from cmc_project p
+        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 find_in_set(#{participates}, p.participates)
+        union
+        select p.project_id, p.project_number, p.project_name, p.project_leader, p.register_time from cmc_declare d
+        left join cmc_project as p on p.project_id = d.project_id
+        where d.user_id = #{participates}) as t
+        group by t.project_id
+        order by t.register_time desc, t.project_number desc
+    </select>
+
     <insert id="insertCmcProject" parameterType="CmcProject">
         insert into cmc_project
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

     method: 'get',
   })
 }
+
+// 查询cmc项目详细
+export function getListByPaticipates(query) {
+  return request({
+    url: '/oa/project/listByPaticipates',
+    method: 'get',
+    params: query
+  })
+}

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

           </template>
         </el-table-column>
         <el-table-column label="项目类型" align="center" key="projectType" prop="projectType" width="120px" sortable />
+        <el-table-column label="登记日期" align="center" key="registerTime" prop="registerTime" width="120px" sortable >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.registerTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
           <template slot-scope="scope" v-if="scope.row.userId !== 1">
             <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"

oa-ui/src/views/oa/staff/participate.vue

 </template>
 
 <script>
-import { listProject } from "@/api/oa/project/project";
+import { getListByPaticipates } from "@/api/oa/project/project";
 import { listDeclare } from "@/api/oa/declare/declare"
 export default {
   props: {
         this.queryParams.participates = this.$route.query.userId;
       else
         this.queryParams.participates = this.userId;
-      listProject(this.queryParams).then(res => {
+      getListByPaticipates(this.queryParams).then(res => {
         this.tableData = res.rows
-        this.total = res.total
+        this.total = res.total 
       });
     }
   }