|
@@ -782,7 +782,11 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
main.setSupervisorcode(row.getString("监理编号"));
|
|
|
main.setArcposition(row.getString("部位"));
|
|
|
main.setArccontent(row.getString("内容"));
|
|
|
- main.setMainstatus(row.getString("总状态"));
|
|
|
+ String status = row.getString("总状态");
|
|
|
+ if(ObjectUtil.isNotEmpty(status)) {
|
|
|
+ status = status.toLowerCase();
|
|
|
+ }
|
|
|
+ main.setMainstatus(status);
|
|
|
main.setReqdate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "提出日期"));
|
|
|
main.setRequser(row.getString("提出者"));
|
|
|
main.setRectifydate(LuckySheet4SummaryHelp.getDateDefaultNull(row, "整改日期"));
|
|
@@ -813,7 +817,11 @@ public class ZhcxProjectManageServiceImpl extends ServiceImpl<ZhcxProjectManageD
|
|
|
machine.setMachineid(numberDo.getId());
|
|
|
|
|
|
machine.setFinishdate(LuckySheet4SummaryHelp.getDateDefaultNull(machineObj, "完成日期"));
|
|
|
- machine.setStatus(machineObj.getString("状态"));
|
|
|
+ String mochineStatus = machineObj.getString("状态");
|
|
|
+ if(ObjectUtil.isNotEmpty(mochineStatus)) {
|
|
|
+ mochineStatus = mochineStatus.toLowerCase();
|
|
|
+ }
|
|
|
+ machine.setStatus(mochineStatus);
|
|
|
|
|
|
Map<String, JSONObject> orgMap = summaryDataBo.getOrgMap();
|
|
|
|