工作填报搜索导出

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

     @Excel(name = "填报人")
     private String userName;
     private Long userId;
+    private Long deptId;
 
     /** 工作类别（内业、外业等） */
     @Excel(name = "工作类别")
     {
         return userId;
     }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
     public void setUser(SysUser user)
     {
         this.user = user;

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

 
     <sql id="selectCmcContractVo">
         select distinct c.contract_id, c.contract_code, c.contract_name, c.contract_number, c.tender_id, t.project_name as t_project_name, p.project_number, p.project_name,
-               p.project_source, c.party_a_id, pa.party_a_name, t.project_name as t_project_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person,
+               p.project_source, c.party_a_id, pa.party_a_name, t.a_person as a_person, t.a_phone as a_phone, t.agent as agent, t.agent_person as agent_person,
                t.agent_phone as agent_phone, c.amount, c.deposit, c.contract_document, c.drafter, u.nick_name as draft_nick_name, c.draft_time, c.remark, c.sign_date, c.sign_remark, c.sign_scan,
                c.comment_type, c.manager_comment, c.manager_user_id, u1.nick_name as manager_nick_name, c.manager_time, c.gm_user_id, u2.nick_name as gm_nick_name, c.gm_time, c.gm_comment from cmc_contract as c
         left join sys_user as u on u.user_id = c.drafter

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

         <result property="formId"    column="form_id"    />
         <result property="projectId"    column="project_id"    />
         <result property="userId"    column="user_id"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="workType"    column="work_type"    />
         <result property="workItem"    column="work_item"    />
         <result property="workContent"    column="work_content"    />
     </resultMap>
 
     <sql id="selectCmcDeclareVo">
-        select d.form_id, d.project_id, p.project_number, p.project_name, d.user_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
+        select d.form_id, d.project_id, p.project_number, p.project_name, d.user_id, u.dept_id, u.nick_name, d.work_type, d.work_item, d.work_content, d.work_load, d.price, d.coefficient, d.check_status, d.audit_status, d.submit_time, d.confirm_status from cmc_declare as d
         left join sys_user as u on u.user_id = d.user_id
         left join cmc_project as p on p.project_id = d.project_id
     </sql>
         <where>  
             <if test="projectId != null  and projectId != ''"> and d.project_id = #{projectId}</if>
             <if test="userId != null"> and d.user_id = #{userId}</if>
+            <if test="deptId != null"> and u.dept_id = #{deptId}</if>
             <if test="workType != null  and workType != ''"> and d.work_type = #{workType}</if>
             <if test="workItem != null  and workItem != ''"> and d.work_item = #{workItem}</if>
             <if test="workContent != null  and workContent != ''"> and d.work_content = #{workContent}</if>
             <if test="coefficient != null  and coefficient != ''"> and d.coefficient = #{coefficient}</if>
             <if test="checkStatus != null  and checkStatus != ''"> and d.check_status = #{checkStatus}</if>
             <if test="auditStatus != null  and auditStatus != ''"> and d.audit_status = #{auditStatus}</if>
-            <if test="submitTime != null "> and d.submit_time = #{submitTime}</if>
+            <if test="submitTime != null "> and date_format(d.submit_time, '%y%m') = date_format(#{submitTime}, '%y%m')</if>
             <if test="confirmStatus != null  and confirmStatus != ''"> and d.confirm_status = #{confirmStatus}</if>
         </where>
         order by d.submit_time desc

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

             <if test="zjlComment != null  and zjlComment != ''"> and o.zjl_comment = #{zjlComment}</if>
             <if test="zjlTime != null "> and o.zjl_time = #{zjlTime}</if>
         </where>
+        order by o.apply_time desc
     </select>
     
     <select id="selectCmcOutsourceByOutsourceId" parameterType="String" resultMap="CmcOutsourceResult">

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

             <if test="zhUserId != null "> and p.zh_user_id = #{zhUserId}</if>
             <if test="zhTime != null "> and p.zh_time = #{zhTime}</if>
         </where>
+        order by p.report_time desc
     </select>
     
     <select id="selectCmcPerformanceByPerformanceId" parameterType="String" resultMap="CmcPerformanceResult">

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

             <if test="planTime != null "> and pa.plan_time = #{planTime}</if>
             <if test="planComment != null  and planComment != ''"> and pa.plan_comment = #{planComment}</if>
         </where>
+        order by pa.apply_time desc
     </select>
     
     <select id="selectCmcProcureApprovalByProcureApplyId" parameterType="String" resultMap="CmcProcureApprovalResult">

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

             <if test="beginDate != null "> and begin_date = #{beginDate}</if>
             <if test="endDate != null "> and end_date = #{endDate}</if>
         </where>
+        order by begin_date desc
     </select>
     
     <select id="selectCmcTrainByTrainId" parameterType="Integer" resultMap="CmcTrainResult">