admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

盲板抽堵修改

Browse Source
This commit is contained in:
pengjie 2024-06-14 19:19:20 +08:00
parent 3f7df406bd
commit 4ac6d0f8db
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzBlindPlatePlugSafeController.java
View File

@ -104,6 +104,13 @@ public class XzBlindPlatePlugSafeController {
paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
}
JSONArray actualJobBeginTime = paramMap.getJSONArray("actualJobBeginTime");
if (actualJobBeginTime != null) {
String begin = actualJobBeginTime.getString(0);
String end = actualJobBeginTime.getString(1);
paramMap.put("actualJobBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("actualJobEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
}
JSONArray operatingUnit = paramMap.getJSONArray("operatingUnit");
if (operatingUnit != null) {
paramMap.put("operatingUnit", operatingUnit.get(0));

9
src/main/java/com/zhgd/xmgl/modules/xz/special/entity/XzBlindPlatePlugSafe.java
View File

@ -58,6 +58,15 @@ public class XzBlindPlatePlugSafe implements Serializable {
@ApiModelProperty(value = "实际作业开始时间")
private java.util.Date actualJobBeginTime;
/**
* 实际作业结束时间
*/
@Excel(name = "实际作业结束时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "实际作业结束时间")
private java.util.Date actualJobEndTime;
/**
* 作业单位
*/