2024-10-19 生产驾驶舱接口调整

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -14,12 +14,7 @@ import com.baosight.hggp.hg.xs.domain.Company;
 import com.baosight.hggp.hg.xs.domain.Factory;
 import com.baosight.hggp.hg.xs.domain.Org;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
-import com.baosight.hggp.util.CommonMethod;
-import com.baosight.hggp.util.DateUtil;
-import com.baosight.hggp.util.EiInfoUtils;
-import com.baosight.hggp.util.LogUtils;
-import com.baosight.hggp.util.MapUtils;
-import com.baosight.hggp.util.StringUtil;
+import com.baosight.hggp.util.*;
 import com.baosight.hggp.util.contants.ACConstants;
 import com.baosight.iplat4j.core.ei.EiBlock;
 import com.baosight.iplat4j.core.ei.EiConstant;
@@ -293,10 +288,9 @@ public class ServiceHGSC007 extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "生产驾驶舱", operType = "工序日产量", operDesc = "工序日产量")
 	public EiInfo getByProcessWt(EiInfo inInfo) {
 		try {
-			EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
-			String depositDate = queryRow.getCellStr(ACConstants.ROW_CODE_0, "depositDate");
-			if (StringUtils.isEmpty(depositDate)) {
-				queryRow.setCell(ACConstants.ROW_CODE_0,"depositDate",depositDate);
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			if (queryRow.containsKey("depositDate")) {
+				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
 			List result = DaoBase.getInstance().query("HGSC007.queryByWt", queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
@@ -309,12 +303,11 @@ public class ServiceHGSC007 extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "生产驾驶舱", operType = "工序累计产量", operDesc = "工序累计产量")
 	public EiInfo queryBySunWt(EiInfo inInfo) {
 		try {
-			EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
-			String depositDate = queryRow.getCellStr(ACConstants.ROW_CODE_0, "depositDate");
-			if (StringUtils.isEmpty(depositDate)) {
-				queryRow.setCell(ACConstants.ROW_CODE_0,"depositDate",depositDate);
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			if (queryRow.containsKey("depositDate")) {
+				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
-			List result = DaoBase.getInstance().query("HGSC007.queryBySunWt", queryRow);
+			List<Map> result = DaoBase.getInstance().query("HGSC007.queryBySunWt", queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "查询失败");
@@ -325,10 +318,9 @@ public class ServiceHGSC007 extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "生产驾驶舱", operType = "7日综合产量", operDesc = "7日综合产量")
 	public EiInfo getByProcessDayWt(EiInfo inInfo) {
 		try {
-			EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
-			String depositDate = queryRow.getCellStr(ACConstants.ROW_CODE_0, "depositDate");
-            if (StringUtils.isEmpty(depositDate)) {
-                queryRow.setCell(ACConstants.ROW_CODE_0,"depositDate",depositDate);
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+			if (queryRow.containsKey("depositDate")) {
+				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
 			List result = DaoBase.getInstance().query("HGSC007.queryByDayWt", queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
@@ -341,7 +333,7 @@ public class ServiceHGSC007 extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "生产任务", operType = "主要项目产量", operDesc = "主要项目产量")
 	public EiInfo getByProjCodeWt(EiInfo inInfo) {
 		try {
-			EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 			List<Map> result = DaoBase.getInstance().query(HGSC007.QUERY_PROJ_CODE_WT, queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
 		} catch (PlatException e) {
@@ -353,7 +345,7 @@ public class ServiceHGSC007 extends ServiceEPBase {
 	@OperationLogAnnotation(operModul = "生产任务", operType = "日月年产量", operDesc = "日月年产量")
 	public EiInfo getByProcessSumWt(EiInfo inInfo) {
 		try {
-			EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
+			Map queryRow = EiInfoUtils.getFirstRow(inInfo);
 			List result = DaoBase.getInstance().query(HGSC007.QUERY_SUM_WT, queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
 		} catch (PlatException e) {