产值统计导出bug修复

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

@@ -45,8 +45,8 @@
         IF(ISNULL(na.id),'',na.id)  as 序号,
         IF(ISNULL(su.name),'',su.name)  as 姓名,
         IF(ISNULL(su.username),'',su.username)  as 账户,
-        IF(ISNULL(na.statistical),'',na.statistical)  as 起止日期,
-        IF(ISNULL(tna.reported_hours),'',na.reported_hours) as 上报工日,
+        IF(ISNULL(na.statistical),'',na.statistical)  as 起止时间,
+        IF(ISNULL(na.reported_hours),'',na.reported_hours) as 上报工日,
         (
         CASE na.status
         WHEN 0 THEN '未申请'
@@ -55,9 +55,7 @@
         WHEN 3 THEN '未通过'
         ELSE ''
         END
-        )as 状态,
-        na.work_type as 工作类别,
-        na.work_description as 工作描述
+        )as 状态
         FROM nonstandard_apply na
         LEFT JOIN sys_user su ON su.id = na.user_id
         <include refid="where"/>

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

@@ -48,9 +48,10 @@
         IF(ISNULL(na.id),'',na.id)  as 序号,
         IF(ISNULL(su.name),'',su.name)  as 姓名,
         IF(ISNULL(su.username),'',su.username)  as 账户,
-        IF(ISNULL(na.statistical),'',na.statistical)   as 起止日期,
+        IF(ISNULL(na.statistical),'',na.statistical)   as 统计日期,
         IF(ISNULL(na.reported_hours),'',na.reported_hours)  as 上报工日,
         IF(ISNULL(na.approval_hours),'',na.approval_hours)  as 审批工日,
+        IF(ISNULL(na.final_value),'',na.final_value)  as 最终产值,
         (
         CASE na.status
         WHEN 0 THEN '未提交'
@@ -58,9 +59,7 @@
         WHEN 3 THEN '未通过'
         ELSE '已通过'
         END
-        )as 状态,
-        IF(ISNULL(na.final_value),'',na.final_value)  as 最终产值,
-        IF(ISNULL(na.final_rejection),'',na.final_rejection)  as 驳回意见
+        )as 状态
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         <include refid="where"/>

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

@@ -143,7 +143,10 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 		Map<String, Object> params = new HashMap<>();
 
 		LoginUser loginUser = userService.getLoginUser();
+		if(loginUser!=null){
+			if(!loginUser.getRoleList().getName().equals("系统管理员")){
 				params.put("userId", loginUser.getId());
+			}
 			params.put("name", name);
 			List<Map<String, Object>> list = nonStandardApplyMapper.exportList(params);
 
@@ -153,7 +156,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 				headers[0] = "序号";
 				headers[1] = "姓名";
 				headers[2] = "账户";
-			headers[3] = "起止日期";
+				headers[3] = "起止时间";
 				headers[4] = "上报工日";
 				headers[5] = "状态";
 				headers[6] = "工作类别";
@@ -178,4 +181,6 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 			}
 		}
 
+	}
+
 }

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

@@ -161,7 +161,7 @@ public class NonStandardApprovalServiceImpl extends ServiceImpl<NonStandardAppro
 			headers[0] = "序号";
 			headers[1] = "姓名";
 			headers[2] = "账户";
-			headers[3] = "起止日期";
+			headers[3] = "统计日期";
 			headers[4] = "上报工日";
 			headers[5] = "审批工日";
 			headers[6] = "状态";