导出列表修改

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml

@@ -21,7 +21,7 @@
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
-        order by na.id asc
+        order by na.start_time desc
     </select>
 
     <select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApplyVo">
@@ -29,7 +29,7 @@
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
-        order by na.id asc
+        order by na.start_time desc
     </select>
 
     <select id="getById" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApplyVo">
@@ -37,7 +37,7 @@
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON na.user_id = su.id
         <include refid="where"/>
-        ORDER BY na.id ASC
+        order by na.start_time desc
     </select>
 
     <select id="exportList" resultType="java.util.HashMap">
@@ -46,7 +46,7 @@
         su.name as 姓名,
         su.username as 账户,
         na.statistical as 起止日期,
-        na.reported_hours as 上报工时,
+        na.reported_hours as 上报工日,
         (
         CASE na.status
         WHEN 0 THEN '未申请'
@@ -61,6 +61,6 @@
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
-        ORDER BY na.id ASC
+        order by na.start_time desc
     </select>
 </mapper>
\ No newline at end of file

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml

@@ -25,14 +25,14 @@
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>
         <where> na.`status` != 0</where>
-        order by na.id asc
+        order by na.start_time desc
     </select>
 
     <select id="getList" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApprovalVo">
         select na.*,su.name as name,su.username as account
         from nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
-        order by na.id asc
+        order by na.start_time desc
     </select>
 
     <select id="getById" resultType="cn.wise.sc.cement.business.model.vo.NonStandardApprovalVo">
@@ -40,7 +40,7 @@
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON na.user_id = su.id
         <include refid="where"/>
-        ORDER BY na.id ASC
+        order by na.start_time desc
     </select>
 
     <select id="exportList" resultType="java.util.HashMap">
@@ -49,7 +49,8 @@
         su.name as 姓名,
         su.username as 账户,
         na.statistical as 起止日期,
-        na.approval_hours as 审批工时,
+        na.reported_hours as 上报工日,
+        na.approval_hours as 审批工日,
         (
         CASE na.status
         WHEN 0 THEN '未提交'
@@ -59,12 +60,11 @@
         END
         )as 状态,
         na.final_value as 最终产值,
-        na.appraisal_value as 考核公值,
         na.final_rejection as 驳回意见
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         <include refid="where"/>
-        ORDER BY na.id ASC
+        order by na.start_time desc
     </select>
 
 </mapper>
\ No newline at end of file

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml

@@ -55,18 +55,18 @@
         su.name as 姓名,
         su.username as 账户,
         na.statistical as 起止日期,
-        na.approval_hours as 审批工时,
+        na.reported_hours as 上报工日,
+        na.approval_hours as 审批工日,
         na.final_value as 最终产值,
         na.work_type as 工作类别,
         na.work_description as 工作描述,
-        na.start_time as 开始时间,
         su.group_id as 部门id,
         sg.name as 部门名
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         LEFT JOIN sys_group sg ON sg.id = su.group_id
         <include refid="where"/>
-        ORDER BY na.id ASC
+        order by na.start_time desc
     </select>
 
 </mapper>
\ No newline at end of file

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -143,7 +143,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 			headers[1] = "姓名";
 			headers[2] = "账户";
 			headers[3] = "起止日期";
-			headers[4] = "上报工时";
+			headers[4] = "上报工日";
 			headers[5] = "状态";
 			headers[6] = "工作类别";
 			headers[7] = "工作描述";

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApprovalServiceImpl.java

@@ -158,10 +158,10 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 			headers[1] = "姓名";
 			headers[2] = "账户";
 			headers[3] = "起止日期";
-			headers[4] = "审批工时";
-			headers[5] = "状态";
-			headers[6] = "最终产值";
-			headers[7] = "考核公值";
+			headers[4] = "上报工日";
+			headers[5] = "审批工日";
+			headers[6] = "状态";
+			headers[7] = "最终产值";
 			headers[8] = "驳回意见";
 
 			List<Object[]> datas = new ArrayList<>(list.size());

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardValueServiceImpl.java

@@ -163,11 +163,11 @@ public class NonStandardValueServiceImpl extends ServiceImpl<NonStandardValueMap
 			headers[1] = "姓名";
 			headers[2] = "账户";
 			headers[3] = "起止日期";
-			headers[4] = "审批工时";
-			headers[5] = "最终产值";
-			headers[6] = "工作类别";
-			headers[7] = "工作描述";
-			headers[8] = "开始时间";
+			headers[4] = "上报工日";
+			headers[5] = "审批工日";
+			headers[6] = "最终产值";
+			headers[7] = "工作类别";
+			headers[8] = "工作描述";
 			headers[9] = "部门id";
 			headers[10] = "部门名";