报工界面美化一下

op-modules/op-mes/src/main/java/com/op/mes/controller/MesReportWorkController.java

@@ -88,6 +88,15 @@ public class MesReportWorkController extends BaseController {
 //			mesReportWork.setCreateTimeEnd(dateEndStr);//end
 //		}
 		List<MesReportWork> list = mesReportWorkService.selectMesReportWorkList_S(mesReportWork);
+		for(MesReportWork dto:list){
+			if("1".equals(dto.getUploadStatus())){
+				dto.setUploadStatus("sap报工成功");
+			}else if("2".equals(dto.getUploadStatus())){
+				dto.setUploadStatus("sap报工失败");
+			}else if("0".equals(dto.getUploadStatus())){
+				dto.setUploadStatus("待报工sap");
+			}
+		}
 		ExcelUtil<MesReportWork> util = new ExcelUtil<MesReportWork>(MesReportWork.class);
 		util.exportExcel(response, list, "报工报表数据");
 	}

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkServiceImpl.java

@@ -133,15 +133,15 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 	@DS("#header.poolName")
 	public List<MesReportWork> getReportWorkHzList(MesReportWork mesReportWork) {
 		List<MesReportWork> dtos = mesReportWorkMapper.getReportWorkHzList(mesReportWork);
-		for(MesReportWork dto:dtos){
-			if("1".equals(dto.getUploadStatus())){
-				dto.setUploadStatus("sap报工成功");
-			}else if("2".equals(dto.getUploadStatus())){
-				dto.setUploadStatus("sap报工失败");
-			}else if("0".equals(dto.getUploadStatus())){
-				dto.setUploadStatus("待报工sap");
-			}
-		}
+//		for(MesReportWork dto:dtos){
+//			if("1".equals(dto.getUploadStatus())){
+//				dto.setUploadStatus("sap报工成功");
+//			}else if("2".equals(dto.getUploadStatus())){
+//				dto.setUploadStatus("sap报工失败");
+//			}else if("0".equals(dto.getUploadStatus())){
+//				dto.setUploadStatus("待报工sap");
+//			}
+//		}
 		return dtos;
 	}
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -493,7 +493,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				shift_code shiftCode,
 				sum(quantity_feedback) quantityFeedback,
 				sum(work_time) workTime,
-				sum(use_man) useMan,
+				use_man useMan,
 		        upload_status uploadStatus,
 				upload_time uploadTime,
 		        upload_msg uploadMsg,
@@ -507,7 +507,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="machineName != null  and machineName != ''"> and machine_name like concat('%', #{machineName}, '%')</if>
 			<if test="uploadStatus != null  and uploadStatus != ''"> and upload_status = #{uploadStatus}</if>
 			group by workorder_code, product_code,product_name,machine_code,machine_name,shift_code
-		    ,upload_status,unit
+		    ,upload_status,unit,use_man
 			,upload_time,upload_msg
 		) mrw
 		left join pro_order_workorder pow on mrw.workorderCode = pow.workorder_code