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

材料出入场调整

Browse Source
This commit is contained in:
pengjie 2024-05-18 11:17:14 +08:00
parent baa82c22b8
commit 8524b37dba
10 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.xz.controller; package com.zhgd.xmgl.modules.xz.controller;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@ -99,7 +100,7 @@ public class XzMaterialController {
map.remove("enterpriseId"); map.remove("enterpriseId");
QueryWrapper<XzMaterial> queryWrapper = QueryGenerator.initPageQueryWrapper(XzMaterial.class, map); QueryWrapper<XzMaterial> queryWrapper = QueryGenerator.initPageQueryWrapper(XzMaterial.class, map);
Page<XzMaterial> page = PageUtil.getPage(map); Page<XzMaterial> page = PageUtil.getPage(map);
queryWrapper.orderByDesc("entry_time"); queryWrapper.orderByDesc("entry_begin_time");
if (enterpriseId != null && StringUtils.isNotBlank(enterpriseId.toString())) { if (enterpriseId != null && StringUtils.isNotBlank(enterpriseId.toString())) {
List<Long> enterpriseIds = new ArrayList<>(); List<Long> enterpriseIds = new ArrayList<>();
String projectSn = map.get("projectSn").toString(); String projectSn = map.get("projectSn").toString();
@ -196,7 +197,13 @@ public class XzMaterialController {
} }
xzMaterial.setNum(index); xzMaterial.setNum(index);
} }
xzMaterial.setEntryTime(obj.getDate("entryTime")); JSONArray entryTime = obj.getJSONArray("entryTime");
if (entryTime != null) {
String begin = entryTime.getString(0);
String end = entryTime.getString(1);
xzMaterial.setEntryBeginTime(DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
xzMaterial.setEntryEndTime(DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
}
JSONArray detail = obj.getJSONArray("detail"); JSONArray detail = obj.getJSONArray("detail");
if (detail != null) { if (detail != null) {
for (int i = 0; i < detail.size(); i++) { for (int i = 0; i < detail.size(); i++) {

8
src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java
View File

@ -56,7 +56,13 @@ public class XzMaterial implements Serializable {
*/ */
@Excel(name = "入场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "入场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "入场时间") @ApiModelProperty(value = "入场时间")
private Date entryTime; private Date entryBeginTime;
/**
* 入场时间
*/
@Excel(name = "入场时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "入场时间")
private Date entryEndTime;
/** /**
* 项目sn * 项目sn
*/ */

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

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

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzGroundSafetController.java
View File

@ -99,7 +99,7 @@ public class XzGroundSafetController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHighJobSafeController.java
View File

@ -99,7 +99,7 @@ public class XzHighJobSafeController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java
View File

@ -99,7 +99,7 @@ public class XzHoistSafetyWorkController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzLimitSpaceSafeController.java
View File

@ -96,7 +96,7 @@ public class XzLimitSpaceSafeController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzOpenCircuitSafeController.java
View File

@ -97,7 +97,7 @@ public class XzOpenCircuitSafeController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzSpecialOperationFireSafetyController.java
View File

@ -100,7 +100,7 @@ public class XzSpecialOperationFireSafetyController {
JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime");
if (hotWorkExecutionBeginTime != null) { if (hotWorkExecutionBeginTime != null) {
String begin = hotWorkExecutionBeginTime.getString(0); String begin = hotWorkExecutionBeginTime.getString(0);
String end = hotWorkExecutionBeginTime.getString(0); String end = hotWorkExecutionBeginTime.getString(1);
paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("hotWorkExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("hotWorkExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }

2
src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzTemporaryElectricitySafeController.java
View File

@ -99,7 +99,7 @@ public class XzTemporaryElectricitySafeController {
JSONArray workExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime"); JSONArray workExecutionBeginTime = paramMap.getJSONArray("workExecutionBeginTime");
if (workExecutionBeginTime != null) { if (workExecutionBeginTime != null) {
String begin = workExecutionBeginTime.getString(0); String begin = workExecutionBeginTime.getString(0);
String end = workExecutionBeginTime.getString(0); String end = workExecutionBeginTime.getString(1);
paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT));
paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT));
} }