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

包头修改

Browse Source
This commit is contained in:
guoshengxiong 2024-09-07 15:46:47 +08:00
parent c296f7f8d3
commit 670f4e0fc9
10 changed files with 82 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConfinedSpaceOperationController.java
View File

@ -114,7 +114,7 @@ public class ConfinedSpaceOperationController {
String detectionAndAnalysisCombustibleGas = MapUtils.getString(map, "detectionAndAnalysisCombustibleGas");
String detectionAndAnalysisToxicity = MapUtils.getString(map, "detectionAndAnalysisToxicity");
String detectionAndAnalysisDust = MapUtils.getString(map, "detectionAndAnalysisDust");
String detectionAndAnalysisTime = MapUtils.getString(map, "detectionAndAnalysisTime");
Date detectionAndAnalysisTime = FlowUtil.getDate(map, "detectionAndAnalysisTime");
String detectionAndAnalysisLocation = MapUtils.getString(map, "detectionAndAnalysisLocation");
String conclusion = MapUtils.getString(map, "conclusion");
String operationApplicationUnitConfirmation = MapUtils.getString(map, "operationApplicationUnitConfirmation");
@ -132,7 +132,7 @@ public class ConfinedSpaceOperationController {
Date projectTeamTime = Optional.ofNullable(map.get("projectTeamTime")).map(o -> DateUtil.parse(o.toString())).orElse(null);
Date safetyQualityEnvironmentalProtectionDepartmentTime = Optional.ofNullable(map.get("safetyQualityEnvironmentalProtectionDepartmentTime")).map(o -> DateUtil.parse(o.toString())).orElse(null);
Date signatureTime = Optional.ofNullable(map.get("signatureTime")).map(o -> DateUtil.parse(o.toString())).orElse(null);
Integer workType = FlowUtil.getPullDownInteger(map, "field4170901845372");
Integer workType = FlowUtil.getPullDownInteger(map, "workType");
ConfinedSpaceOperation operation = new ConfinedSpaceOperation();
operation.setNum(num);
operation.setConstructionProject(constructionProject);

9
src/main/java/com/zhgd/xmgl/modules/baotou/controller/DangerEnvironmentEvaluateController.java
View File

@ -112,7 +112,14 @@ public class DangerEnvironmentEvaluateController {
if (CollUtil.isNotEmpty(fileList4)) {
meetingPictures = JSON.toJSONString(fileList4);
}
String approver = Optional.ofNullable(map.get("opUser")).map(o -> StrUtil.join(",", ((List) o).stream().distinct().collect(Collectors.toList()))).orElse(null);
String approver = Optional.ofNullable(map.get("opUser")).map(o -> {
List list = (List) o;
if (CollUtil.isEmpty(list)) {
return null;
}
list.remove(0);
return StrUtil.join(",", list.stream().distinct().collect(Collectors.toList()));
}).orElse(null);
DangerEnvironmentEvaluate dangerEnvironmentEvaluate = new DangerEnvironmentEvaluate();
dangerEnvironmentEvaluate.setProjectGroupId(projectGroupId);
dangerEnvironmentEvaluate.setIdentificationDate(DateUtil.parse(MapUtils.getString(map, "identificationDate")));

3
src/main/java/com/zhgd/xmgl/modules/baotou/controller/LiftingOperationController.java
View File

@ -8,6 +8,7 @@ import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.baotou.entity.LiftingOperation;
import com.zhgd.xmgl.modules.baotou.service.ILiftingOperationService;
import com.zhgd.xmgl.util.FlowUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -100,7 +101,7 @@ public class LiftingOperationController {
Long operationSupervisor = Optional.ofNullable(map.get("operationSupervisor")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
Long safetyEngineer = Optional.ofNullable(map.get("safetyEngineer")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
Integer level = Optional.ofNullable(map.get("level")).map(o -> Convert.toInt(((List) o).get(0))).orElse(null);
String operationEquipment = MapUtils.getString(map, "operationEquipment");
Long operationEquipment = FlowUtil.getPullDownLong(map, "operationEquipment");
String operationLocation = MapUtils.getString(map, "operationLocation");
String operationContent = MapUtils.getString(map, "operationContent");
String craneTypeLicensePlateNumber = MapUtils.getString(map, "craneTypeLicensePlateNumber");

3
src/main/java/com/zhgd/xmgl/modules/baotou/controller/PouringOrderLedgerController.java
View File

@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.baotou.service.IPouringOrderLedgerService;
import com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger;
import com.zhgd.xmgl.util.FlowUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -85,7 +86,7 @@ public class PouringOrderLedgerController {
log.info("工作流添加浇筑令台账信息:{}", JSON.toJSONString(map));
PouringOrderLedger ledger = new PouringOrderLedger();
String concreteNumber = MapUtils.getString(map, "concreteNumber");
String device = MapUtils.getString(map, "device");
Long device = FlowUtil.getPullDownLong(map, "device");
String castingLocation = MapUtils.getString(map, "castingLocation");
String plannedVolume = MapUtils.getString(map, "plannedVolume");
String projectSn = MapUtils.getString(map, "projectSn");

5
src/main/java/com/zhgd/xmgl/modules/baotou/entity/ConfinedSpaceOperation.java
View File

@ -12,6 +12,7 @@ import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 受限空间作业
@ -162,7 +163,9 @@ public class ConfinedSpaceOperation implements Serializable {
*/
@Excel(name = "检测分析时间", width = 15)
@ApiModelProperty(value = "检测分析时间")
private java.lang.String detectionAndAnalysisTime;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date detectionAndAnalysisTime;
/**
* 检测分析地点
*/

6
src/main/java/com/zhgd/xmgl/modules/baotou/entity/LiftingOperation.java
View File

@ -42,7 +42,7 @@ public class LiftingOperation implements Serializable {
*/
@Excel(name = "作业装置", width = 15)
@ApiModelProperty(value = "作业装置")
private java.lang.String operationEquipment;
private java.lang.Long operationEquipment;
/**
* 作业地点
*/
@ -366,5 +366,9 @@ public class LiftingOperation implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "安全工程师名称")
private java.lang.String safetyEngineerName;
@TableField(exist = false)
@ApiModelProperty(value = "作业装置名称")
private java.lang.String operationEquipmentName;
}

54
src/main/java/com/zhgd/xmgl/modules/baotou/entity/PouringOrderLedger.java
View File

@ -32,18 +32,24 @@ public class PouringOrderLedger implements Serializable {
@Excel(name = "浇筑合编号", width = 15)
@ApiModelProperty(value="浇筑合编号")
private java.lang.String castingNumber ;
/**混泥土编号*/
@Excel(name = "混泥土编号", width = 15)
@ApiModelProperty(value="混泥土编号")
private java.lang.String concreteNumber ;
/**装置*/
@Excel(name = "装置", width = 15)
@ApiModelProperty(value="装置")
private java.lang.String device ;
/**浇筑部位*/
@Excel(name = "浇筑部位", width = 15)
@ApiModelProperty(value="浇筑部位")
private java.lang.String castingLocation ;
/**
* 混泥土编号
*/
@Excel(name = "混泥土编号", width = 15)
@ApiModelProperty(value = "混泥土编号")
private java.lang.String concreteNumber;
/**
* 装置
*/
@Excel(name = "装置", width = 15)
@ApiModelProperty(value = "装置")
private java.lang.Long device;
/**
* 浇筑部位
*/
@Excel(name = "浇筑部位", width = 15)
@ApiModelProperty(value = "浇筑部位")
private java.lang.String castingLocation;
/**混凝土供应商*/
@Excel(name = "混凝土供应商", width = 15)
@ApiModelProperty(value="混凝土供应商")
@ -92,15 +98,19 @@ public class PouringOrderLedger implements Serializable {
/**状态：1未浇筑;2已浇筑;*/
@Excel(name = "状态：1未浇筑;2已浇筑;", width = 15)
@ApiModelProperty(value="状态：1未浇筑;2已浇筑;")
private java.lang.Integer status ;
private java.lang.Integer status;
@TableField(exist = false)
@ApiModelProperty(value="项目组名称")
private java.lang.String projectGroupName ;
@TableField(exist = false)
@ApiModelProperty(value="混凝土供应商名称")
private java.lang.String concreteSupplierName ;
@TableField(exist = false)
@ApiModelProperty(value="EPC/PC承包商名称")
private java.lang.String epcPcContractorName ;
@TableField(exist = false)
@ApiModelProperty(value = "项目组名称")
private java.lang.String projectGroupName;
@TableField(exist = false)
@ApiModelProperty(value = "混凝土供应商名称")
private java.lang.String concreteSupplierName;
@TableField(exist = false)
@ApiModelProperty(value = "EPC/PC承包商名称")
private java.lang.String epcPcContractorName;
@TableField(exist = false)
@ApiModelProperty(value = "装置名称")
private java.lang.String deviceName;
}

5
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/DangerEnvironmentEvaluateMapper.xml
View File

@ -5,11 +5,12 @@
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.DangerEnvironmentEvaluate">
select * from
(select t.*,su.real_name as preparer_name,
su1.real_name as approver_name
group_concat(distinct su1.real_name) as approver_name
from
danger_environment_evaluate t
left join system_user su on su.user_id=t.preparer
left join system_user su1 on su1.user_id=t.approver
left join system_user su1 on find_in_set(su1.user_id,t.approver)
group by t.id
)t
${ew.customSqlSegment}
</select>

12
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/LiftingOperationMapper.xml
View File

@ -19,7 +19,8 @@
w11.worker_name as professional_engineer_of_construction_management_department_name,
w12.worker_name as department_manager_name,
w13.worker_name as operation_supervisor_name,
w14.worker_name as safety_engineer_name
w14.worker_name as safety_engineer_name,
du.device_unit_name as operation_equipment_name
from
lifting_operation t
left join enterprise_info ei on ei.id=applicant
@ -37,9 +38,10 @@
left join worker_info w12 on w12.id=t.department_manager
left join worker_info w13 on w13.id=t.operation_supervisor
left join worker_info w14 on w14.id=t.safety_engineer
left join device_unit du on du.id=t.operation_equipment
) t
${ew.customSqlSegment}
</select>
</select>
<select id="getById" resultType="com.zhgd.xmgl.modules.baotou.entity.LiftingOperation">
select *
@ -58,7 +60,8 @@
w11.worker_name as professional_engineer_of_construction_management_department_name,
w12.worker_name as department_manager_name,
w13.worker_name as operation_supervisor_name,
w14.worker_name as safety_engineer_name
w14.worker_name as safety_engineer_name,
du.device_unit_name as operation_equipment_name
from
lifting_operation t
left join enterprise_info ei on ei.id=applicant
@ -76,7 +79,8 @@
left join worker_info w12 on w12.id=t.department_manager
left join worker_info w13 on w13.id=t.operation_supervisor
left join worker_info w14 on w14.id=t.safety_engineer
left join device_unit du on du.id=t.operation_equipment
) t
where id=#{id}
</select>
</select>
</mapper>

28
src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/PouringOrderLedgerMapper.xml
View File

@ -3,28 +3,32 @@
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.PouringOrderLedgerMapper">
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger">
select * from(select t.*,
select * from(select t.*,
pg.project_group_name,
ei1.enterprise_name as concrete_supplier_name,
ei2.enterprise_name as epc_pc_contractor_name
ei2.enterprise_name as epc_pc_contractor_name,
du.device_unit_name as device_name
from pouring_order_ledger t
left join project_group pg on t.project_group_id = pg.id
left join enterprise_info ei1 on ei1.id = t.concrete_supplier
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
left join device_unit du on du.id=t.device
) t
${ew.customSqlSegment}
</select>
<select id="getById" resultType="com.zhgd.xmgl.modules.baotou.entity.PouringOrderLedger">
select * from(select t.*,
pg.project_group_name,
ei1.enterprise_name as concrete_supplier_name,
ei2.enterprise_name as epc_pc_contractor_name
from pouring_order_ledger t
left join project_group pg on t.project_group_id = pg.id
left join enterprise_info ei1 on ei1.id = t.concrete_supplier
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
) t
select * from(select t.*,
pg.project_group_name,
ei1.enterprise_name as concrete_supplier_name,
ei2.enterprise_name as epc_pc_contractor_name,
du.device_unit_name as device_name
from pouring_order_ledger t
left join project_group pg on t.project_group_id = pg.id
left join enterprise_info ei1 on ei1.id = t.concrete_supplier
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
left join device_unit du on du.id=t.device
) t
where id=#{id}
</select>
</select>
</mapper>