包头bug修复
This commit is contained in:
parent
4e77ec59b4
commit
b2cb1f5201
@ -28,6 +28,9 @@ import org.springframework.stereotype.Component;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 工作流拦截器，把按钮名称改成整改
|
||||
*/
|
||||
@Aspect
|
||||
@Component
|
||||
@Slf4j
|
||||
|
||||
@ -171,6 +171,7 @@ public class CivilEngineeringQualityInspectionOrderController {
|
||||
order.setTestResultFile(FlowUtil.getJSONString(map,"testResultFile"));
|
||||
order.setTestFile(FlowUtil.getJSONString(map,"testFile"));
|
||||
order.setProjectSn(projectSn);
|
||||
order.setSampleName(FlowUtil.getString(map,"sampleName"));
|
||||
civilEngineeringQualityInspectionOrderService.add(order);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.zhgd.xmgl.modules.baotou.controller;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
@ -132,6 +133,19 @@ public class DangerEnvironmentEvaluateController {
|
||||
evaluate.setAttendanceSheetAttachment(attendanceSheetAttachment);
|
||||
evaluate.setMeetingPictures(meetingPictures);
|
||||
evaluate.setProjectSn(projectSn);
|
||||
|
||||
evaluate.setSupervision(FlowUtil.getPullDownLong(map,"supervision"));
|
||||
evaluate.setEpcContractor(FlowUtil.getPullDownLong(map,"epcContractor"));
|
||||
evaluate.setConstructionContractor(FlowUtil.getPullDownLong(map,"constructionContractor"));
|
||||
evaluate.setConstructionUnitSafetySupervisionPreparation(FlowUtil.getPullDownLong(map,"constructionUnitSafetySupervisionPreparation"));
|
||||
evaluate.setConstructionUnitProjectManagerApproval(FlowUtil.getPullDownLong(map,"constructionUnitProjectManagerApproval"));
|
||||
evaluate.setEpcSafetySupervision(FlowUtil.getPullDownLong(map,"epcSafetySupervision"));
|
||||
evaluate.setProjectManager(FlowUtil.getPullDownLong(map,"projectManager"));
|
||||
evaluate.setSupervisionSafetyDirector(FlowUtil.getPullDownLong(map,"supervisionSafetyDirector"));
|
||||
evaluate.setProjectTeamSafetySupervision(FlowUtil.getPullDownLong(map,"projectTeamSafetySupervision"));
|
||||
evaluate.setProjectTeamProjectManager(FlowUtil.getPullDownLong(map,"projectTeamProjectManager"));
|
||||
evaluate.setSafetyQualityDepartment(FlowUtil.getPullDownLong(map,"safetyQualityDepartment"));
|
||||
evaluate.setContractModel(FlowUtil.getPullDownInteger(map,"contractModel"));
|
||||
dangerEnvironmentEvaluateService.add(evaluate);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.zhgd.xmgl.modules.baotou.controller;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
@ -8,6 +9,7 @@ import com.zhgd.annotation.OperLog;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.xmgl.modules.baotou.entity.FirstExampleManage;
|
||||
import com.zhgd.xmgl.modules.baotou.service.IFirstExampleManageService;
|
||||
import com.zhgd.xmgl.util.FlowUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
@ -118,6 +120,19 @@ public class FirstExampleManageController {
|
||||
manage.setFirstExampleVideo(firstExampleVideo);
|
||||
manage.setTechnicalOperation(technicalOperation);
|
||||
manage.setProjectSn(projectSn);
|
||||
manage.setProfessionalEpcContractor(FlowUtil.getPullDownLong(map,"professionalEpcContractor"));
|
||||
manage.setConstructionContractor(FlowUtil.getPullDownLong(map,"constructionContractor"));
|
||||
manage.setSupervisingEngineer(FlowUtil.getPullDownLong(map,"supervisingEngineer"));
|
||||
manage.setProfessionalEngineer(FlowUtil.getPullDownLong(map,"professionalEngineer"));
|
||||
manage.setProfessionalTeamLeader(FlowUtil.getPullDownLong(map,"professionalTeamLeader"));
|
||||
manage.setProfessionalEpcContractorDate(FlowUtil.getDate(map,"professionalEpcContractorDate"));
|
||||
manage.setConstructionContractorDate(FlowUtil.getDate(map,"constructionContractorDate"));
|
||||
manage.setSupervisingEngineerDate(FlowUtil.getDate(map,"supervisingEngineerDate"));
|
||||
manage.setProfessionalEngineerDate(FlowUtil.getDate(map,"professionalEngineerDate"));
|
||||
manage.setProfessionalTeamLeaderDate(FlowUtil.getDate(map,"professionalTeamLeaderDate"));
|
||||
manage.setSupervisingEngineerOpinion(FlowUtil.getString(map,"supervisingEngineerOpinion"));
|
||||
manage.setProfessionalEngineerOpinion(FlowUtil.getString(map,"professionalEngineerOpinion"));
|
||||
manage.setProfessionalTeamLeaderOpinion(FlowUtil.getString(map,"professionalTeamLeaderOpinion"));
|
||||
firstExampleManageService.add(manage);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -104,6 +104,16 @@ public class PipelineMaterialInspectionController {
|
||||
inspection.setMaterialType(materialType);
|
||||
inspection.setAttachment(attachment);
|
||||
inspection.setProjectSn(projectSn);
|
||||
inspection.setContractModel(FlowUtil.getPullDownInteger(param, "contractModel"));
|
||||
inspection.setImportanceType(FlowUtil.getPullDownInteger(param, "importanceType"));
|
||||
inspection.setConstructionUnitConstructionWorker(FlowUtil.getPullDownLong(param, "constructionUnitConstructionWorker"));
|
||||
inspection.setConstructionUnitTechnicalPersonInCharge(FlowUtil.getPullDownLong(param, "constructionUnitTechnicalPersonInCharge"));
|
||||
inspection.setEpcProfessionalEngineer(FlowUtil.getPullDownLong(param, "epcProfessionalEngineer"));
|
||||
inspection.setEpcTechnicalPersonInCharge(FlowUtil.getPullDownLong(param, "epcTechnicalPersonInCharge"));
|
||||
inspection.setSupervisionProfessionalEngineer(FlowUtil.getPullDownLong(param, "supervisionProfessionalEngineer"));
|
||||
inspection.setDirector(FlowUtil.getPullDownLong(param, "director"));
|
||||
inspection.setProjectTeamProfessionalEngineer(FlowUtil.getPullDownLong(param, "projectTeamProfessionalEngineer"));
|
||||
inspection.setProjectTeamProjectManager(FlowUtil.getPullDownLong(param, "projectTeamProjectManager"));
|
||||
pipelineMaterialInspectionService.add(inspection);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -123,6 +123,16 @@ public class PipelinePressureTestBagController {
|
||||
bag.setPressureApplicationTime(pressureApplicationTime);
|
||||
bag.setAttachment(attachment);
|
||||
bag.setProjectSn(projectSn);
|
||||
|
||||
bag.setContractModel(FlowUtil.getPullDownInteger(param, "contractModel"));
|
||||
bag.setConstructionUnitTechnician(FlowUtil.getPullDownLong(param, "constructionUnitTechnician"));
|
||||
bag.setConstructionUnitTechnicalLeader(FlowUtil.getPullDownLong(param, "constructionUnitTechnicalLeader"));
|
||||
bag.setEpcPipelineEngineer(FlowUtil.getPullDownLong(param, "epcPipelineEngineer"));
|
||||
bag.setEpcTechnicalLeader(FlowUtil.getPullDownLong(param, "epcTechnicalLeader"));
|
||||
bag.setSupervisionUnitPipelineEngineer(FlowUtil.getPullDownLong(param, "supervisionUnitPipelineEngineer"));
|
||||
bag.setDirectorGeneralAgent(FlowUtil.getPullDownLong(param, "directorGeneralAgent"));
|
||||
bag.setProjectTeamProfessionalEngineer(FlowUtil.getPullDownLong(param, "projectTeamProfessionalEngineer"));
|
||||
bag.setProjectTeamProjectManager(FlowUtil.getPullDownLong(param, "projectTeamProjectManager"));
|
||||
pipelinePressureTestBagService.add(bag);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.zhgd.xmgl.modules.baotou.controller;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.afterturn.easypoi.excel.ExcelExportUtil;
|
||||
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
|
||||
@ -133,6 +134,14 @@ public class PipelineWeldingRecordController {
|
||||
record.setPipelineInternalConnectionInspection(pipelineInternalConnectionInspection);
|
||||
// record.setTestingQualified(0);
|
||||
record.setProjectSn(projectSn);
|
||||
|
||||
record.setContractModel(FlowUtil.getPullDownInteger(param, "contractModel"));
|
||||
record.setRecorder(FlowUtil.getPullDownLong(param, "recorder"));
|
||||
record.setConstructionUnitQualityInspector(FlowUtil.getPullDownLong(param, "constructionUnitQualityInspector"));
|
||||
record.setConstructionUnitWeldingResponsibleEngineer(FlowUtil.getPullDownLong(param, "constructionUnitWeldingResponsibleEngineer"));
|
||||
record.setEpcProfessionalEngineer(FlowUtil.getPullDownLong(param, "epcProfessionalEngineer"));
|
||||
record.setSupervisingPipelineEngineer(FlowUtil.getPullDownLong(param, "supervisingPipelineEngineer"));
|
||||
record.setProjectTeamPipelineEngineer(FlowUtil.getPullDownLong(param, "projectTeamPipelineEngineer"));
|
||||
pipelineWeldingRecordService.add(record);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@ -0,0 +1,147 @@
|
||||
package com.zhgd.xmgl.modules.baotou.controller;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.zhgd.annotation.OperLog;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import java.util.HashMap;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.io.IOException;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.net.URLDecoder;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import com.zhgd.jeecg.common.api.vo.Result;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.jeecg.common.util.oConvertUtils;
|
||||
import org.apache.commons.collections.MapUtils;
|
||||
import com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord;
|
||||
import com.zhgd.xmgl.modules.baotou.service.IWitnessSamplingRecordService;
|
||||
|
||||
import org.simpleframework.xml.core.Validate;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import org.jeecgframework.poi.excel.ExcelImportUtil;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.entity.ImportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
import org.springframework.web.multipart.MultipartHttpServletRequest;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
|
||||
|
||||
/**
|
||||
* @Title: Controller
|
||||
* @Description: 见证取样记录
|
||||
* @author： pds
|
||||
* @date： 2024-12-20
|
||||
* @version： V1.0
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/xmgl/witnessSamplingRecord")
|
||||
@Slf4j
|
||||
@Api(tags = "见证取样记录相关Api")
|
||||
public class WitnessSamplingRecordController {
|
||||
@Autowired
|
||||
private IWitnessSamplingRecordService witnessSamplingRecordService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "分页查询", operDesc = "分页列表查询见证取样记录信息")
|
||||
@ApiOperation(value = "分页列表查询见证取样记录信息", notes = "分页列表查询见证取样记录信息", httpMethod="GET")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
|
||||
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
|
||||
})
|
||||
@GetMapping(value = "/page")
|
||||
public Result<IPage<WitnessSamplingRecord>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||
return Result.success(witnessSamplingRecordService.queryPageList(param));
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "列表查询", operDesc = "列表查询见证取样记录信息")
|
||||
@ApiOperation(value = "列表查询见证取样记录信息", notes = "列表查询见证取样记录信息", httpMethod="GET")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<WitnessSamplingRecord>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> param) {
|
||||
return Result.success(witnessSamplingRecordService.queryList(param));
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
* @param witnessSamplingRecord
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "添加", operDesc = "添加见证取样记录信息")
|
||||
@ApiOperation(value = "添加见证取样记录信息", notes = "添加见证取样记录信息" , httpMethod="POST")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<WitnessSamplingRecord> add(@RequestBody @Validate WitnessSamplingRecord witnessSamplingRecord) {
|
||||
witnessSamplingRecordService.add(witnessSamplingRecord);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param witnessSamplingRecord
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "编辑", operDesc = "编辑见证取样记录信息")
|
||||
@ApiOperation(value = "编辑见证取样记录信息", notes = "编辑见证取样记录信息" , httpMethod="POST")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<WitnessSamplingRecord> edit(@RequestBody WitnessSamplingRecord witnessSamplingRecord) {
|
||||
witnessSamplingRecordService.edit(witnessSamplingRecord);
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "删除", operDesc = "删除见证取样记录信息")
|
||||
@ApiOperation(value = "删除见证取样记录信息", notes = "删除见证取样记录信息" , httpMethod="POST")
|
||||
@ApiImplicitParam(name = "id", value = "见证取样记录ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}")
|
||||
@PostMapping(value = "/delete")
|
||||
public Result<WitnessSamplingRecord> delete(@ApiIgnore @RequestBody HashMap<String ,Object> map) {
|
||||
witnessSamplingRecordService.delete(MapUtils.getString(map, "id"));
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "通过id查询", operDesc = "通过id查询见证取样记录信息")
|
||||
@ApiOperation(value = "通过id查询见证取样记录信息", notes = "通过id查询见证取样记录信息" , httpMethod="GET")
|
||||
@ApiImplicitParam(name = "id", value = "见证取样记录ID", paramType = "query", required = true, dataType = "Integer")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<WitnessSamplingRecord> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
return Result.success(witnessSamplingRecordService.queryById(id));
|
||||
}
|
||||
|
||||
@OperLog(operModul = "见证取样记录管理", operType = "", operDesc = "工作流保存见证取样记录")
|
||||
@ApiOperation(value = "工作流保存见证取样记录", notes = "工作流保存见证取样记录", httpMethod = "POST")
|
||||
@PostMapping(value = "/flow/save")
|
||||
public Result saveFromFlow(@RequestBody Map<String, Object> map) {
|
||||
log.info("工作流保存见证取样记录:{}", JSON.toJSONString(map));
|
||||
witnessSamplingRecordService.saveFromFlow(map);
|
||||
return Result.ok();
|
||||
}
|
||||
}
|
||||
@ -260,6 +260,8 @@ public class CivilEngineeringQualityInspectionOrder implements Serializable {
|
||||
private java.lang.String testResultFile;
|
||||
@ApiModelProperty(value = "检测报告(附件)")
|
||||
private java.lang.String testFile;
|
||||
@ApiModelProperty(value = "样品名称")
|
||||
private java.lang.String sampleName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "装置单位名称")
|
||||
|
||||
@ -31,10 +31,12 @@ public class DangerEnvironmentEvaluate implements Serializable {
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.Long id;
|
||||
/**项目组*/
|
||||
/**
|
||||
* 项目组
|
||||
*/
|
||||
@Excel(name = "项目组", width = 15)
|
||||
@ApiModelProperty(value="项目组")
|
||||
private java.lang.Long projectGroupId ;
|
||||
@ApiModelProperty(value = "项目组")
|
||||
private java.lang.Long projectGroupId;
|
||||
/**
|
||||
* 装置id
|
||||
*/
|
||||
@ -66,7 +68,7 @@ public class DangerEnvironmentEvaluate implements Serializable {
|
||||
@Excel(name = "附件(危险源)", width = 15)
|
||||
@ApiModelProperty(value = "附件(危险源)")
|
||||
private java.lang.String dangerSourceFile;
|
||||
/**
|
||||
/**
|
||||
* 附件(环境因素)
|
||||
*/
|
||||
@Excel(name = "附件(环境因素)", width = 15)
|
||||
@ -108,6 +110,33 @@ public class DangerEnvironmentEvaluate implements Serializable {
|
||||
@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime;
|
||||
|
||||
@ApiModelProperty(value = "监理")
|
||||
private java.lang.Long supervision;
|
||||
@ApiModelProperty(value = "EPC承包商")
|
||||
private java.lang.Long epcContractor;
|
||||
@ApiModelProperty(value = "施工承包商")
|
||||
private java.lang.Long constructionContractor;
|
||||
|
||||
@ApiModelProperty(value = "施工单位安全监理编制")
|
||||
private java.lang.Long constructionUnitSafetySupervisionPreparation;
|
||||
@ApiModelProperty(value = "施工单位项目经理审批")
|
||||
private java.lang.Long constructionUnitProjectManagerApproval;
|
||||
@ApiModelProperty(value = "epc安全监理")
|
||||
private java.lang.Long epcSafetySupervision;
|
||||
@ApiModelProperty(value = "项目经理")
|
||||
private java.lang.Long projectManager;
|
||||
@ApiModelProperty(value = "监理（安全总监）")
|
||||
private java.lang.Long supervisionSafetyDirector;
|
||||
@ApiModelProperty(value = "项目组安全监理")
|
||||
private java.lang.Long projectTeamSafetySupervision;
|
||||
@ApiModelProperty(value = "项目组项目经理")
|
||||
private java.lang.Long projectTeamProjectManager;
|
||||
@ApiModelProperty(value = "安质环部")
|
||||
private java.lang.Long safetyQualityDepartment;
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "编制人名称")
|
||||
private String preparerName;
|
||||
@ -117,5 +146,40 @@ public class DangerEnvironmentEvaluate implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "装置名称")
|
||||
private String deviceName;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组名称")
|
||||
private String projectGroupName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "监理名称")
|
||||
private String supervisionName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC承包商名称")
|
||||
private String epcContractorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工承包商名称")
|
||||
private String constructionContractorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工单位安全监理编制名称")
|
||||
private String constructionUnitSafetySupervisionPreparationName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工单位项目经理审批名称")
|
||||
private String constructionUnitProjectManagerApprovalName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "epc安全监理名称")
|
||||
private String epcSafetySupervisionName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目经理名称")
|
||||
private String projectManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "监理（安全总监）名称")
|
||||
private String supervisionSafetyDirectorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组安全监理名称")
|
||||
private String projectTeamSafetySupervisionName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组项目经理名称")
|
||||
private String projectTeamProjectManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "安质环部名称")
|
||||
private String safetyQualityDepartmentName;
|
||||
}
|
||||
|
||||
@ -1,101 +1,174 @@
|
||||
package com.zhgd.xmgl.modules.baotou.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 工程质量控制点等级
|
||||
* @author： pds
|
||||
* @date： 2024-12-09
|
||||
* @date： 2024-12-09
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("engineer_controller_level")
|
||||
@ApiModel(value="EngineerControllerLevel实体类",description="EngineerControllerLevel")
|
||||
@ApiModel(value = "EngineerControllerLevel实体类", description = "EngineerControllerLevel")
|
||||
public class EngineerControllerLevel implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value="id")
|
||||
private java.lang.Long id ;
|
||||
/**所属项目SN*/
|
||||
@ApiModelProperty(value="所属项目SN")
|
||||
private java.lang.String projectSn ;
|
||||
/**编制*/
|
||||
@ApiModelProperty(value="编制")
|
||||
private java.lang.Long prepared ;
|
||||
/**批准*/
|
||||
@ApiModelProperty(value="批准")
|
||||
private java.lang.Long approved ;
|
||||
/**批准日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value="批准日期")
|
||||
private java.util.Date approvalDate ;
|
||||
/**编号*/
|
||||
@ApiModelProperty(value="编号")
|
||||
private java.lang.String no ;
|
||||
/**版次*/
|
||||
@ApiModelProperty(value="版次")
|
||||
private java.lang.String edition ;
|
||||
/**装置单元工程*/
|
||||
@ApiModelProperty(value="装置单元工程")
|
||||
private java.lang.Long unitEngineering ;
|
||||
/**项目组*/
|
||||
@ApiModelProperty(value="项目组")
|
||||
private java.lang.Long projectTeam ;
|
||||
/**监理单位*/
|
||||
@ApiModelProperty(value="监理单位")
|
||||
private java.lang.Long supervisionUnit ;
|
||||
/**EPC承包商*/
|
||||
@ApiModelProperty(value="EPC承包商")
|
||||
private java.lang.Long epcContractor ;
|
||||
/**施工单位*/
|
||||
@ApiModelProperty(value="施工单位")
|
||||
private java.lang.Long constructionUnit ;
|
||||
/**上传附件*/
|
||||
@ApiModelProperty(value="上传附件")
|
||||
private java.lang.String uploadAttachment ;
|
||||
/**创建时间 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="创建时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date createTime ;
|
||||
/**更新时间 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="更新时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="编制名称")
|
||||
private java.lang.String preparedName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="批准名称")
|
||||
private java.lang.String approvedName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置单元工程名称")
|
||||
private java.lang.String unitEngineeringName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组名称")
|
||||
private java.lang.String projectTeamName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理单位名称")
|
||||
private java.lang.String supervisionUnitName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC承包商名称")
|
||||
private java.lang.String epcContractorName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位名称")
|
||||
private java.lang.String constructionUnitName ;
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.Long id;
|
||||
/**
|
||||
* 所属项目SN
|
||||
*/
|
||||
@ApiModelProperty(value = "所属项目SN")
|
||||
private java.lang.String projectSn;
|
||||
/**
|
||||
* 编制
|
||||
*/
|
||||
@ApiModelProperty(value = "编制")
|
||||
private java.lang.Long prepared;
|
||||
/**
|
||||
* 批准
|
||||
*/
|
||||
@ApiModelProperty(value = "批准")
|
||||
private java.lang.Long approved;
|
||||
/**
|
||||
* 批准日期
|
||||
*/
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "批准日期")
|
||||
private java.util.Date approvalDate;
|
||||
/**
|
||||
* 编号
|
||||
*/
|
||||
@ApiModelProperty(value = "编号")
|
||||
private java.lang.String no;
|
||||
/**
|
||||
* 版次
|
||||
*/
|
||||
@ApiModelProperty(value = "版次")
|
||||
private java.lang.String edition;
|
||||
/**
|
||||
* 装置单元工程
|
||||
*/
|
||||
@ApiModelProperty(value = "装置单元工程")
|
||||
private java.lang.Long unitEngineering;
|
||||
/**
|
||||
* 项目组
|
||||
*/
|
||||
@ApiModelProperty(value = "项目组")
|
||||
private java.lang.Long projectTeam;
|
||||
/**
|
||||
* 监理单位
|
||||
*/
|
||||
@ApiModelProperty(value = "监理单位")
|
||||
private java.lang.Long supervisionUnit;
|
||||
/**
|
||||
* EPC承包商
|
||||
*/
|
||||
@ApiModelProperty(value = "EPC承包商")
|
||||
private java.lang.Long epcContractor;
|
||||
/**
|
||||
* 施工单位
|
||||
*/
|
||||
@ApiModelProperty(value = "施工单位")
|
||||
private java.lang.Long constructionUnit;
|
||||
/**
|
||||
* 上传附件
|
||||
*/
|
||||
@ApiModelProperty(value = "上传附件")
|
||||
private java.lang.String uploadAttachment;
|
||||
/**
|
||||
* 创建时间 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 = "创建时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date createTime;
|
||||
/**
|
||||
* 更新时间 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 = "更新时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime;
|
||||
/**
|
||||
* 合同模式：1EPC;2E+P+C
|
||||
*/
|
||||
@Excel(name = "合同模式", width = 15, replace = {"EPC_1", "E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
@ApiModelProperty(value = "EPC专业工程师")
|
||||
private java.lang.Long epcProfessionalEngineer;
|
||||
@ApiModelProperty(value = "EPC技术负责人")
|
||||
private java.lang.Long epcTechnicalDirector;
|
||||
@ApiModelProperty(value = "监理专业工程师")
|
||||
private java.lang.Long supervisionProfessionalEngineer;
|
||||
@ApiModelProperty(value = "总监")
|
||||
private java.lang.Long director;
|
||||
@ApiModelProperty(value = "项目组专业工程师")
|
||||
private java.lang.Long projectTeamProfessionalEngineer;
|
||||
@ApiModelProperty(value = "项目经理")
|
||||
private java.lang.Long projectManager;
|
||||
@ApiModelProperty(value = "施工部专业负责人")
|
||||
private java.lang.Long constructionDepartmentProfessionalDirector;
|
||||
@ApiModelProperty(value = "专业:1:土建工程;2:土建特种;3:静设备工程;4:动设备工程;5:管道工程;6:电气工程;7:仪表工程;8:其他;")
|
||||
private java.lang.Integer major;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "编制名称")
|
||||
private java.lang.String preparedName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "批准名称")
|
||||
private java.lang.String approvedName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "装置单元工程名称")
|
||||
private java.lang.String unitEngineeringName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组名称")
|
||||
private java.lang.String projectTeamName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "监理单位名称")
|
||||
private java.lang.String supervisionUnitName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC承包商名称")
|
||||
private java.lang.String epcContractorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工单位名称")
|
||||
private java.lang.String constructionUnitName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC专业工程师名称")
|
||||
private java.lang.String epcProfessionalEngineerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC技术负责人名称")
|
||||
private java.lang.String epcTechnicalDirectorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "监理专业工程师名称")
|
||||
private java.lang.String supervisionProfessionalEngineerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "总监名称")
|
||||
private java.lang.String directorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组专业工程师名称")
|
||||
private java.lang.String projectTeamProfessionalEngineerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目经理名称")
|
||||
private java.lang.String projectManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工部专业负责人名称")
|
||||
private java.lang.String constructionDepartmentProfessionalDirectorName;
|
||||
}
|
||||
|
||||
@ -1,119 +1,205 @@
|
||||
package com.zhgd.xmgl.modules.baotou.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description: 首件样板管理
|
||||
* @author： pds
|
||||
* @date： 2024-08-10
|
||||
* @date： 2024-08-10
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("first_example_manage")
|
||||
@ApiModel(value="FirstExampleManage实体类",description="FirstExampleManage")
|
||||
@ApiModel(value = "FirstExampleManage实体类", description = "FirstExampleManage")
|
||||
public class FirstExampleManage implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value="id")
|
||||
private java.lang.Long id ;
|
||||
/**装置管理id*/
|
||||
@Excel(name = "装置管理id", width = 15)
|
||||
@ApiModelProperty(value="装置管理id")
|
||||
private java.lang.Long deviceUnitId ;
|
||||
/**承包方式：1:EPC;2:E+P+C;*/
|
||||
@Excel(name = "承包方式：1:EPC;2:E+P+C;", width = 15)
|
||||
@ApiModelProperty(value="承包方式：1:EPC;2:E+P+C;")
|
||||
private java.lang.Integer contractingType ;
|
||||
/**区域项目组*/
|
||||
@Excel(name = "区域项目组", width = 15)
|
||||
@ApiModelProperty(value="区域项目组")
|
||||
private java.lang.Long projectGroupId ;
|
||||
/**工程监理单位*/
|
||||
@Excel(name = "工程监理单位", width = 15)
|
||||
@ApiModelProperty(value="工程监理单位")
|
||||
private java.lang.Long supervisingUnitId ;
|
||||
/**EPC承包商*/
|
||||
@Excel(name = "EPC承包商", width = 15)
|
||||
@ApiModelProperty(value="EPC承包商")
|
||||
private java.lang.Long epcContractorId ;
|
||||
/**施工单位*/
|
||||
@Excel(name = "施工单位", width = 15)
|
||||
@ApiModelProperty(value="施工单位")
|
||||
private java.lang.Long constructionUnitId ;
|
||||
/**样板工程名称*/
|
||||
@Excel(name = "样板工程名称", width = 15)
|
||||
@ApiModelProperty(value="样板工程名称")
|
||||
private java.lang.String exampleProjectName ;
|
||||
/**首件样板附件*/
|
||||
@Excel(name = "首件样板附件", width = 15)
|
||||
@ApiModelProperty(value="首件样板附件")
|
||||
private java.lang.String firstExampleFile ;
|
||||
/**首件样板视频*/
|
||||
@Excel(name = "首件样板视频", width = 15)
|
||||
@ApiModelProperty(value="首件样板视频")
|
||||
private java.lang.String firstExampleVideo ;
|
||||
/**涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;*/
|
||||
@Excel(name = "涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;", width = 15)
|
||||
@ApiModelProperty(value="涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;")
|
||||
private java.lang.Integer technicalOperation ;
|
||||
/**所属项目SN*/
|
||||
@Excel(name = "所属项目SN", width = 15)
|
||||
@ApiModelProperty(value="所属项目SN")
|
||||
private java.lang.String projectSn ;
|
||||
/**二维码*/
|
||||
@Excel(name = "二维码", width = 15)
|
||||
@ApiModelProperty(value="二维码")
|
||||
private java.lang.String qrCode ;
|
||||
/**创建时间*/
|
||||
@ApiModelProperty(value="创建时间")
|
||||
private java.util.Date createDate ;
|
||||
/**更新时间*/
|
||||
@ApiModelProperty(value="更新时间")
|
||||
private java.util.Date updateDate ;
|
||||
/**方案名称*/
|
||||
@Excel(name = "方案名称", width = 15)
|
||||
@ApiModelProperty(value="方案名称")
|
||||
private java.lang.String constructionName ;
|
||||
@ApiModelProperty(value="技术负责人")
|
||||
private java.lang.Long technicalDirector ;
|
||||
@ApiModelProperty(value="实施日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date implementationDate ;
|
||||
@ApiModelProperty(value="实施验证结果")
|
||||
private java.lang.String implementationVerificationResult ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置单位名称")
|
||||
private java.lang.String deviceUnitName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置单位号")
|
||||
private java.lang.String deviceUnitNo ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组名称")
|
||||
private java.lang.String projectGroupName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="工程监理单位名称")
|
||||
private java.lang.String supervisingUnitName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC承包商名称")
|
||||
private java.lang.String epcContractorName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位名称")
|
||||
private java.lang.String constructionUnitName ;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String technicalDirectorName ;
|
||||
/**
|
||||
* id
|
||||
*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.Long id;
|
||||
/**
|
||||
* 装置管理id
|
||||
*/
|
||||
@Excel(name = "装置管理id", width = 15)
|
||||
@ApiModelProperty(value = "装置管理id")
|
||||
private java.lang.Long deviceUnitId;
|
||||
/**
|
||||
* 承包方式：1:EPC;2:E+P+C;
|
||||
*/
|
||||
@Excel(name = "承包方式：1:EPC;2:E+P+C;", width = 15)
|
||||
@ApiModelProperty(value = "承包方式：1:EPC;2:E+P+C;")
|
||||
private java.lang.Integer contractingType;
|
||||
/**
|
||||
* 区域项目组
|
||||
*/
|
||||
@Excel(name = "区域项目组", width = 15)
|
||||
@ApiModelProperty(value = "区域项目组")
|
||||
private java.lang.Long projectGroupId;
|
||||
/**
|
||||
* 工程监理单位
|
||||
*/
|
||||
@Excel(name = "工程监理单位", width = 15)
|
||||
@ApiModelProperty(value = "工程监理单位")
|
||||
private java.lang.Long supervisingUnitId;
|
||||
/**
|
||||
* EPC承包商
|
||||
*/
|
||||
@Excel(name = "EPC承包商", width = 15)
|
||||
@ApiModelProperty(value = "EPC承包商")
|
||||
private java.lang.Long epcContractorId;
|
||||
/**
|
||||
* 施工单位
|
||||
*/
|
||||
@Excel(name = "施工单位", width = 15)
|
||||
@ApiModelProperty(value = "施工单位")
|
||||
private java.lang.Long constructionUnitId;
|
||||
/**
|
||||
* 样板工程名称
|
||||
*/
|
||||
@Excel(name = "样板工程名称", width = 15)
|
||||
@ApiModelProperty(value = "样板工程名称")
|
||||
private java.lang.String exampleProjectName;
|
||||
/**
|
||||
* 首件样板附件
|
||||
*/
|
||||
@Excel(name = "首件样板附件", width = 15)
|
||||
@ApiModelProperty(value = "首件样板附件")
|
||||
private java.lang.String firstExampleFile;
|
||||
/**
|
||||
* 首件样板视频
|
||||
*/
|
||||
@Excel(name = "首件样板视频", width = 15)
|
||||
@ApiModelProperty(value = "首件样板视频")
|
||||
private java.lang.String firstExampleVideo;
|
||||
/**
|
||||
* 涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;
|
||||
*/
|
||||
@Excel(name = "涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;", width = 15)
|
||||
@ApiModelProperty(value = "涉及技术作业：1:土建;2:动设备;3:静设备;4:管道;5:电气;6:仪表;7:其他;")
|
||||
private java.lang.Integer technicalOperation;
|
||||
/**
|
||||
* 所属项目SN
|
||||
*/
|
||||
@Excel(name = "所属项目SN", width = 15)
|
||||
@ApiModelProperty(value = "所属项目SN")
|
||||
private java.lang.String projectSn;
|
||||
/**
|
||||
* 二维码
|
||||
*/
|
||||
@Excel(name = "二维码", width = 15)
|
||||
@ApiModelProperty(value = "二维码")
|
||||
private java.lang.String qrCode;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "创建时间")
|
||||
private java.util.Date createDate;
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@ApiModelProperty(value = "更新时间")
|
||||
private java.util.Date updateDate;
|
||||
/**
|
||||
* 方案名称
|
||||
*/
|
||||
@Excel(name = "方案名称", width = 15)
|
||||
@ApiModelProperty(value = "方案名称")
|
||||
private java.lang.String constructionName;
|
||||
@ApiModelProperty(value = "技术负责人")
|
||||
private java.lang.Long technicalDirector;
|
||||
@ApiModelProperty(value = "实施日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date implementationDate;
|
||||
@ApiModelProperty(value = "实施验证结果")
|
||||
private java.lang.String implementationVerificationResult;
|
||||
|
||||
@ApiModelProperty(value = "EPC承包商技术负责人")
|
||||
private java.lang.Long professionalEpcContractor;
|
||||
@ApiModelProperty(value = "施工承包商技术负责人")
|
||||
private java.lang.Long constructionContractor;
|
||||
@ApiModelProperty(value = "监理工程师")
|
||||
private java.lang.Long supervisingEngineer;
|
||||
@ApiModelProperty(value = "项目组专业工程师")
|
||||
private java.lang.Long professionalEngineer;
|
||||
@ApiModelProperty(value = "施工管理部专业组长")
|
||||
private java.lang.Long professionalTeamLeader;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "专业EPC承包商技术负责人日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date professionalEpcContractorDate;
|
||||
@ApiModelProperty(value = "施工承包商技术负责人日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date constructionContractorDate;
|
||||
@ApiModelProperty(value = "监理工程师日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date supervisingEngineerDate;
|
||||
@ApiModelProperty(value = "项目组专业工程师日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date professionalEngineerDate;
|
||||
@ApiModelProperty(value = "施工管理部专业组长日期")
|
||||
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
private Date professionalTeamLeaderDate;
|
||||
|
||||
@ApiModelProperty(value = "监理工程师意见")
|
||||
private java.lang.String supervisingEngineerOpinion;
|
||||
@ApiModelProperty(value = "项目组专业工程师意见")
|
||||
private java.lang.String professionalEngineerOpinion;
|
||||
@ApiModelProperty(value = "施工管理部专业组长意见")
|
||||
private java.lang.String professionalTeamLeaderOpinion;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "装置单位名称")
|
||||
private java.lang.String deviceUnitName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "装置单位号")
|
||||
private java.lang.String deviceUnitNo;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组名称")
|
||||
private java.lang.String projectGroupName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "工程监理单位名称")
|
||||
private java.lang.String supervisingUnitName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC承包商名称")
|
||||
private java.lang.String epcContractorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工单位名称")
|
||||
private java.lang.String constructionUnitName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String technicalDirectorName;
|
||||
|
||||
@TableField(exist = false)
|
||||
private java.lang.String professionalEpcContractorName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String constructionContractorName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String supervisingEngineerName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String professionalEngineerName;
|
||||
@TableField(exist = false)
|
||||
private java.lang.String professionalTeamLeaderName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -58,6 +58,28 @@ public class PipelineMaterialInspection implements Serializable {
|
||||
/**更新时间*/
|
||||
@ApiModelProperty(value="更新时间")
|
||||
private java.util.Date updateDate ;
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
@ApiModelProperty(value = "材质类型:1一般材料2重要材料")
|
||||
private java.lang.Integer importanceType;
|
||||
|
||||
@ApiModelProperty(value="施工单位施工员(或技术员)")
|
||||
private java.lang.Long constructionUnitConstructionWorker ;
|
||||
@ApiModelProperty(value="施工单位技术负责人")
|
||||
private java.lang.Long constructionUnitTechnicalPersonInCharge ;
|
||||
@ApiModelProperty(value="EPC专业工程师")
|
||||
private java.lang.Long epcProfessionalEngineer ;
|
||||
@ApiModelProperty(value="EPC技术负责人")
|
||||
private java.lang.Long epcTechnicalPersonInCharge ;
|
||||
@ApiModelProperty(value="监理专业工程师")
|
||||
private java.lang.Long supervisionProfessionalEngineer ;
|
||||
@ApiModelProperty(value="总监(或总代)")
|
||||
private java.lang.Long director ;
|
||||
@ApiModelProperty(value="项目组专业工程师")
|
||||
private java.lang.Long projectTeamProfessionalEngineer ;
|
||||
@ApiModelProperty(value="项目组项目经理(或施工经理)")
|
||||
private java.lang.Long projectTeamProjectManager ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置管理名称")
|
||||
|
||||
@ -63,6 +63,27 @@ public class PipelinePressureTestBag implements Serializable {
|
||||
/**更新时间*/
|
||||
@ApiModelProperty(value="更新时间")
|
||||
private java.util.Date updateDate ;
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
|
||||
@ApiModelProperty(value="施工单位技术员")
|
||||
private java.lang.Long constructionUnitTechnician ;
|
||||
@ApiModelProperty(value="施工单位技术负责人")
|
||||
private java.lang.Long constructionUnitTechnicalLeader ;
|
||||
@ApiModelProperty(value="EPC管道工程师")
|
||||
private java.lang.Long epcPipelineEngineer ;
|
||||
@ApiModelProperty(value="EPC技术负责人")
|
||||
private java.lang.Long epcTechnicalLeader ;
|
||||
@ApiModelProperty(value="监理单位管道工程师")
|
||||
private java.lang.Long supervisionUnitPipelineEngineer ;
|
||||
@ApiModelProperty(value="总监(或总代)")
|
||||
private java.lang.Long directorGeneralAgent ;
|
||||
@ApiModelProperty(value="项目组专业工程师")
|
||||
private java.lang.Long projectTeamProfessionalEngineer ;
|
||||
@ApiModelProperty(value="项目组项目经理(或施工经理)")
|
||||
private java.lang.Long projectTeamProjectManager ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置管理名称")
|
||||
private java.lang.String deviceUnitName ;
|
||||
@ -72,4 +93,28 @@ public class PipelinePressureTestBag implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="管道编号/单线号s")
|
||||
private java.lang.String pipelineNumbers ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位技术员名称")
|
||||
private java.lang.String constructionUnitTechnicianName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位技术负责人名称")
|
||||
private java.lang.String constructionUnitTechnicalLeaderName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC管道工程师名称")
|
||||
private java.lang.String epcPipelineEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC技术负责人名称")
|
||||
private java.lang.String epcTechnicalLeaderName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理单位管道工程师名称")
|
||||
private java.lang.String supervisionUnitPipelineEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="总监(或总代)名称")
|
||||
private java.lang.String directorGeneralAgentName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组专业工程师名称")
|
||||
private java.lang.String projectTeamProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组项目经理(或施工经理)名称")
|
||||
private java.lang.String projectTeamProjectManagerName ;
|
||||
}
|
||||
|
||||
@ -93,6 +93,23 @@ public class PipelineWeldingRecord implements Serializable {
|
||||
/**更新时间*/
|
||||
@ApiModelProperty(value="更新时间")
|
||||
private java.util.Date updateDate ;
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
|
||||
@ApiModelProperty(value="记录人")
|
||||
private java.lang.Long recorder ;
|
||||
@ApiModelProperty(value="施工单位质最检查员")
|
||||
private java.lang.Long constructionUnitQualityInspector ;
|
||||
@ApiModelProperty(value="施工单位焊接责任工程师")
|
||||
private java.lang.Long constructionUnitWeldingResponsibleEngineer ;
|
||||
@ApiModelProperty(value="EPC专业工程师")
|
||||
private java.lang.Long epcProfessionalEngineer ;
|
||||
@ApiModelProperty(value="监理管道工程师")
|
||||
private java.lang.Long supervisingPipelineEngineer ;
|
||||
@ApiModelProperty(value="项目组管道工程师")
|
||||
private java.lang.Long projectTeamPipelineEngineer ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="装置管理名称")
|
||||
private java.lang.String deviceUnitName ;
|
||||
@ -123,4 +140,23 @@ public class PipelineWeldingRecord implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="焊口编号")
|
||||
private java.lang.String weldingNumber ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="记录人名称")
|
||||
private java.lang.String recorderName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位质最检查员名称")
|
||||
private java.lang.String constructionUnitQualityInspectorName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工单位焊接责任工程师名称")
|
||||
private java.lang.String constructionUnitWeldingResponsibleEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC专业工程师名称")
|
||||
private java.lang.String epcProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理管道工程师名称")
|
||||
private java.lang.String supervisingPipelineEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组管道工程师名称")
|
||||
private java.lang.String projectTeamPipelineEngineerName ;
|
||||
}
|
||||
|
||||
@ -40,8 +40,9 @@ public class PouringOrderLedger implements Serializable {
|
||||
/**监理单位id*/
|
||||
@ApiModelProperty(value="监理单位id")
|
||||
private java.lang.Long supervisor ;
|
||||
/**EPC/PC承包商*/
|
||||
/**EPC/PC承包商 被拆分了*/
|
||||
@ApiModelProperty(value="EPC/PC承包商")
|
||||
@Deprecated
|
||||
private java.lang.Long epcPcContractor ;
|
||||
/**浇筑部位*/
|
||||
@ApiModelProperty(value="浇筑部位")
|
||||
@ -115,6 +116,20 @@ public class PouringOrderLedger implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value="专业监理工程师日期")
|
||||
private java.util.Date professionalSupervisionEngineerDate ;
|
||||
@Excel(name = "合同模式", width = 15, replace = {"EPC_1", "E+P+C_2"})
|
||||
@ApiModelProperty("合同模式：1EPC;2E+P+C")
|
||||
private Integer contractModel;
|
||||
@ApiModelProperty(value="EPC专业工程师")
|
||||
private java.lang.Long epcProfessionalEngineer ;
|
||||
@ApiModelProperty(value="监理专业工程师")
|
||||
private java.lang.Long supervisionProfessionalEngineer ;
|
||||
@ApiModelProperty(value="项目组专业工程师")
|
||||
private java.lang.Long projectTeamProfessionalEngineer ;
|
||||
|
||||
@ApiModelProperty(value="EPC承包商")
|
||||
private java.lang.Long epcContractor ;
|
||||
@ApiModelProperty(value="施工承包商")
|
||||
private java.lang.Long constructionContractor ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组名称")
|
||||
@ -140,4 +155,20 @@ public class PouringOrderLedger implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="专业监理工程师名称")
|
||||
private java.lang.String professionalSupervisionEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC专业工程师名称")
|
||||
private java.lang.String epcProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理专业工程师名称")
|
||||
private java.lang.String supervisionProfessionalEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组专业工程师名称")
|
||||
private java.lang.String projectTeamProfessionalEngineerName ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC承包商名称")
|
||||
private java.lang.String epcContractorName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工承包商名称")
|
||||
private java.lang.String constructionContractorName ;
|
||||
}
|
||||
|
||||
@ -64,6 +64,24 @@ public class WelderAssessmentRequest implements Serializable {
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
|
||||
@ApiModelProperty(value="更新时间 yyyy-MM-dd HH:mm:ss")
|
||||
private java.util.Date updateTime ;
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@ApiModelProperty(value = "合同模式：1EPC;2E+P+C")
|
||||
private java.lang.Integer contractModel;
|
||||
|
||||
@ApiModelProperty(value="EPC承包商管道工程师")
|
||||
private java.lang.Long epcContractorPipingEngineer ;
|
||||
@ApiModelProperty(value="EPC承包商焊接工程师")
|
||||
private java.lang.Long epcContractorWeldingEngineer ;
|
||||
@ApiModelProperty(value="监理管道工程师")
|
||||
private java.lang.Long supervisingPipingEngineer ;
|
||||
@ApiModelProperty(value="监理焊接工程师")
|
||||
private java.lang.Long supervisingWeldingEngineer ;
|
||||
@ApiModelProperty(value="项目组管道工程师")
|
||||
private java.lang.Long projectTeamPipingEngineer ;
|
||||
@ApiModelProperty(value="项目组焊接工程师")
|
||||
private java.lang.Long projectTeamWeldingEngineer ;
|
||||
@ApiModelProperty(value="施工部焊接工程师")
|
||||
private java.lang.Long constructionDepartmentWeldingEngineer ;
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="承接装置工程名称")
|
||||
@ -71,4 +89,25 @@ public class WelderAssessmentRequest implements Serializable {
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="工程建设模式名称")
|
||||
private java.lang.String engineeringConstructionModeName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC承包商管道工程师名称")
|
||||
private java.lang.String epcContractorPipingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="EPC承包商焊接工程师名称")
|
||||
private java.lang.String epcContractorWeldingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理管道工程师名称")
|
||||
private java.lang.String supervisingPipingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="监理焊接工程师名称")
|
||||
private java.lang.String supervisingWeldingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组管道工程师名称")
|
||||
private java.lang.String projectTeamPipingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="项目组焊接工程师名称")
|
||||
private java.lang.String projectTeamWeldingEngineerName ;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value="施工部焊接工程师名称")
|
||||
private java.lang.String constructionDepartmentWeldingEngineerName ;
|
||||
}
|
||||
|
||||
@ -0,0 +1,92 @@
|
||||
package com.zhgd.xmgl.modules.baotou.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
/**
|
||||
* @Description: 见证取样记录
|
||||
* @author： pds
|
||||
* @date： 2024-12-20
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("witness_sampling_record")
|
||||
@ApiModel(value="WitnessSamplingRecord实体类",description="WitnessSamplingRecord")
|
||||
public class WitnessSamplingRecord implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value="id")
|
||||
private java.lang.Long id ;
|
||||
/**所属项目SN*/
|
||||
@ApiModelProperty(value="所属项目SN")
|
||||
private java.lang.String projectSn ;
|
||||
/**编号*/
|
||||
@ApiModelProperty(value="编号")
|
||||
private java.lang.String number ;
|
||||
/**工程名称*/
|
||||
@ApiModelProperty(value="工程名称")
|
||||
private java.lang.String projectName ;
|
||||
/**施工单位*/
|
||||
@ApiModelProperty(value="施工单位")
|
||||
private java.lang.Long constructionUnit ;
|
||||
/**建设单位*/
|
||||
@ApiModelProperty(value="建设单位")
|
||||
private java.lang.String buildUnit ;
|
||||
/**生产厂家*/
|
||||
@ApiModelProperty(value="生产厂家")
|
||||
private java.lang.String manufacturer ;
|
||||
/**见证单位*/
|
||||
@ApiModelProperty(value="见证单位")
|
||||
private java.lang.Long witnessUnit ;
|
||||
/**使用部位*/
|
||||
@ApiModelProperty(value="使用部位")
|
||||
private java.lang.String usageLocation ;
|
||||
/**样品名称*/
|
||||
@ApiModelProperty(value="样品名称")
|
||||
private java.lang.String sampleName ;
|
||||
/**进场数量*/
|
||||
@ApiModelProperty(value="进场数量")
|
||||
private java.lang.String numberOfSamplesOnSite ;
|
||||
/**规格型号*/
|
||||
@ApiModelProperty(value="规格型号")
|
||||
private java.lang.String specificationModel ;
|
||||
/**取样数量*/
|
||||
@ApiModelProperty(value="取样数量")
|
||||
private java.lang.String numberOfSamplesToBeTaken ;
|
||||
/**取样地点*/
|
||||
@ApiModelProperty(value="取样地点")
|
||||
private java.lang.String samplingLocation ;
|
||||
/**取样日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value="取样日期")
|
||||
private java.util.Date samplingDate ;
|
||||
/**见证记录*/
|
||||
@ApiModelProperty(value="见证记录")
|
||||
private java.lang.String witnessRecord ;
|
||||
/**见证取样送检印章*/
|
||||
@ApiModelProperty(value="见证取样送检印章")
|
||||
private java.lang.String samplingAndInspection ;
|
||||
/**取样人*/
|
||||
@ApiModelProperty(value="取样人")
|
||||
private java.lang.Long sampleTaker ;
|
||||
/**见证人*/
|
||||
@ApiModelProperty(value="见证人")
|
||||
private java.lang.Long witness ;
|
||||
/**创建时间*/
|
||||
@ApiModelProperty(value="创建时间")
|
||||
private java.util.Date createDate ;
|
||||
/**更新时间*/
|
||||
@ApiModelProperty(value="更新时间")
|
||||
private java.util.Date updateDate ;
|
||||
}
|
||||
@ -0,0 +1,50 @@
|
||||
package com.zhgd.xmgl.modules.baotou.mapper;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.HashMap;
|
||||
import com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Constants;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
* @Description: 见证取样记录
|
||||
* @author： pds
|
||||
* @date： 2024-12-20
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface WitnessSamplingRecordMapper extends BaseMapper<WitnessSamplingRecord> {
|
||||
|
||||
/**
|
||||
* 分页列表查询见证取样记录信息
|
||||
*
|
||||
* @param page
|
||||
* @param queryWrapper
|
||||
* @param param
|
||||
* @return
|
||||
*/
|
||||
IPage<WitnessSamplingRecord> queryList(Page<WitnessSamplingRecord> page, @Param(Constants.WRAPPER) QueryWrapper<WitnessSamplingRecord> queryWrapper, @Param("param") HashMap<String, Object> param);
|
||||
|
||||
/**
|
||||
* 列表查询见证取样记录信息
|
||||
*
|
||||
* @param queryWrapper
|
||||
* @param param
|
||||
* @return
|
||||
*/
|
||||
List<WitnessSamplingRecord> queryList(@Param(Constants.WRAPPER) QueryWrapper<WitnessSamplingRecord> queryWrapper, @Param("param") HashMap<String, Object> param);
|
||||
|
||||
|
||||
/**
|
||||
* 通过id查询见证取样记录信息
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
WitnessSamplingRecord queryById(String id);
|
||||
}
|
||||
@ -3,58 +3,58 @@
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.CivilEngineeringQualityInspectionOrderMapper">
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.CivilEngineeringQualityInspectionOrder">
|
||||
select * from (
|
||||
select t.*,
|
||||
du.device_unit_name,
|
||||
du.device_unit_no,
|
||||
ei1.enterprise_name as testing_client_name,
|
||||
wi1.worker_name as testing_client_user_name,
|
||||
ei2.enterprise_name as epc_contractor_name,
|
||||
wi2.worker_name as professional_engineer_name,
|
||||
ei3.enterprise_name as supervising_witness_name,
|
||||
wi3.worker_name as supervising_witness_user_name,
|
||||
ei4.enterprise_name as testing_unit_name,
|
||||
wi4.worker_name as client_name,
|
||||
wi5.worker_name as sampling_sample_delivery_person_name
|
||||
select t.*
|
||||
,du.device_unit_name
|
||||
,du.device_unit_no
|
||||
,ei1.enterprise_name as testing_client_name
|
||||
,ei2.enterprise_name as epc_contractor_name
|
||||
,wi2.worker_name as professional_engineer_name
|
||||
,ei3.enterprise_name as supervising_witness_name
|
||||
,ei4.enterprise_name as testing_unit_name
|
||||
,su1.real_name as testing_client_user_name
|
||||
,su2.real_name as sampling_sample_delivery_person_name
|
||||
,su3.real_name as supervising_witness_user_name
|
||||
,su4.real_name as client_name
|
||||
from civil_engineering_quality_inspection_order t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join enterprise_info ei1 on ei1.id=t.testing_unit
|
||||
left join worker_info wi1 on wi1.id=t.testing_client_user
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor
|
||||
left join worker_info wi2 on wi2.id=t.professional_engineer
|
||||
left join enterprise_info ei3 on ei3.id=t.supervising_witness
|
||||
left join worker_info wi3 on wi3.id=t.supervising_witness_user
|
||||
left join enterprise_info ei4 on ei4.id=t.testing_unit
|
||||
left join worker_info wi4 on wi4.id=t.client
|
||||
left join worker_info wi5 on wi5.id=t.sampling_sample_delivery_person
|
||||
left join system_user su1 on su1.user_id=t.testing_client_user
|
||||
left join system_user su2 on su2.user_id=t.sampling_sample_delivery_person
|
||||
left join system_user su3 on su3.user_id=t.supervising_witness_user
|
||||
left join system_user su4 on su4.user_id=t.client
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="getById" resultType="com.zhgd.xmgl.modules.baotou.entity.CivilEngineeringQualityInspectionOrder">
|
||||
select * from (
|
||||
select t.*,
|
||||
du.device_unit_name,
|
||||
du.device_unit_no,
|
||||
ei1.enterprise_name as testing_client_name,
|
||||
wi1.worker_name as testing_client_user_name,
|
||||
ei2.enterprise_name as epc_contractor_name,
|
||||
wi2.worker_name as professional_engineer_name,
|
||||
ei3.enterprise_name as supervising_witness_name,
|
||||
wi3.worker_name as supervising_witness_user_name,
|
||||
ei4.enterprise_name as testing_unit_name,
|
||||
wi4.worker_name as client_name,
|
||||
wi5.worker_name as sampling_sample_delivery_person_name
|
||||
select t.*
|
||||
,du.device_unit_name
|
||||
,du.device_unit_no
|
||||
,ei1.enterprise_name as testing_client_name
|
||||
,ei2.enterprise_name as epc_contractor_name
|
||||
,wi2.worker_name as professional_engineer_name
|
||||
,ei3.enterprise_name as supervising_witness_name
|
||||
,ei4.enterprise_name as testing_unit_name
|
||||
,su1.real_name as testing_client_user_name
|
||||
,su2.real_name as sampling_sample_delivery_person_name
|
||||
,su3.real_name as supervising_witness_user_name
|
||||
,su4.real_name as client_name
|
||||
from civil_engineering_quality_inspection_order t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join enterprise_info ei1 on ei1.id=t.testing_unit
|
||||
left join worker_info wi1 on wi1.id=t.testing_client_user
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor
|
||||
left join worker_info wi2 on wi2.id=t.professional_engineer
|
||||
left join enterprise_info ei3 on ei3.id=t.supervising_witness
|
||||
left join worker_info wi3 on wi3.id=t.supervising_witness_user
|
||||
left join enterprise_info ei4 on ei4.id=t.testing_unit
|
||||
left join worker_info wi4 on wi4.id=t.client
|
||||
left join worker_info wi5 on wi5.id=t.sampling_sample_delivery_person
|
||||
left join system_user su1 on su1.user_id=t.testing_client_user
|
||||
left join system_user su2 on su2.user_id=t.sampling_sample_delivery_person
|
||||
left join system_user su3 on su3.user_id=t.supervising_witness_user
|
||||
left join system_user su4 on su4.user_id=t.client
|
||||
)t
|
||||
where id=#{id}
|
||||
</select>
|
||||
|
||||
@ -1,17 +1,40 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.DangerEnvironmentEvaluateMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.DangerEnvironmentEvaluate">
|
||||
select * from
|
||||
(select t.*,su.real_name as preparer_name,
|
||||
group_concat(distinct su1.real_name) as approver_name
|
||||
,du.device_unit_name as device_name
|
||||
,pg.project_group_name as project_group_name
|
||||
,ei1.enterprise_name as supervision_name
|
||||
,ei2.enterprise_name as epc_contractor_name
|
||||
,ei3.enterprise_name as construction_contractor_name
|
||||
,su9.real_name as construction_unit_safety_supervision_preparation_name
|
||||
,su2.real_name as construction_unit_project_manager_approval_name
|
||||
,su3.real_name as epc_safety_supervision_name
|
||||
,su4.real_name as project_manager_name
|
||||
,su5.real_name as supervision_safety_director_name
|
||||
,su6.real_name as project_team_safety_supervision_name
|
||||
,su7.real_name as project_team_project_manager_name
|
||||
,su8.real_name as safety_quality_department_name
|
||||
from
|
||||
danger_environment_evaluate t
|
||||
left join system_user su on su.user_id=t.preparer
|
||||
left join system_user su1 on find_in_set(su1.user_id,t.approver)
|
||||
left join device_unit du on du.id=t.device_id
|
||||
left join project_group pg on pg.id=t.project_group_id
|
||||
left join enterprise_info ei1 on ei1.id=t.supervision
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_contractor
|
||||
left join system_user su9 on su9.user_id=t.construction_unit_safety_supervision_preparation
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_project_manager_approval
|
||||
left join system_user su3 on su3.user_id=t.epc_safety_supervision
|
||||
left join system_user su4 on su4.user_id=t.project_manager
|
||||
left join system_user su5 on su5.user_id=t.supervision_safety_director
|
||||
left join system_user su6 on su6.user_id=t.project_team_safety_supervision
|
||||
left join system_user su7 on su7.user_id=t.project_team_project_manager
|
||||
left join system_user su8 on su8.user_id=t.safety_quality_department
|
||||
group by t.id
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
@ -22,11 +45,35 @@
|
||||
(select t.*,su.real_name as preparer_name,
|
||||
group_concat(distinct su1.real_name) as approver_name
|
||||
,du.device_unit_name as device_name
|
||||
,pg.project_group_name as project_group_name
|
||||
,ei1.enterprise_name as supervision_name
|
||||
,ei2.enterprise_name as epc_contractor_name
|
||||
,ei3.enterprise_name as construction_contractor_name
|
||||
,su9.real_name as construction_unit_safety_supervision_preparation_name
|
||||
,su2.real_name as construction_unit_project_manager_approval_name
|
||||
,su3.real_name as epc_safety_supervision_name
|
||||
,su4.real_name as project_manager_name
|
||||
,su5.real_name as supervision_safety_director_name
|
||||
,su6.real_name as project_team_safety_supervision_name
|
||||
,su7.real_name as project_team_project_manager_name
|
||||
,su8.real_name as safety_quality_department_name
|
||||
from
|
||||
danger_environment_evaluate t
|
||||
left join system_user su on su.user_id=t.preparer
|
||||
left join system_user su1 on find_in_set(su1.user_id,t.approver)
|
||||
left join device_unit du on du.id=t.device_id
|
||||
left join project_group pg on pg.id=t.project_group_id
|
||||
left join enterprise_info ei1 on ei1.id=t.supervision
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_contractor
|
||||
left join system_user su9 on su9.user_id=t.construction_unit_safety_supervision_preparation
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_project_manager_approval
|
||||
left join system_user su3 on su3.user_id=t.epc_safety_supervision
|
||||
left join system_user su4 on su4.user_id=t.project_manager
|
||||
left join system_user su5 on su5.user_id=t.supervision_safety_director
|
||||
left join system_user su6 on su6.user_id=t.project_team_safety_supervision
|
||||
left join system_user su7 on su7.user_id=t.project_team_project_manager
|
||||
left join system_user su8 on su8.user_id=t.safety_quality_department
|
||||
group by t.id
|
||||
)t
|
||||
where t.id=#{id}
|
||||
|
||||
@ -11,6 +11,13 @@
|
||||
,ei3.enterprise_name as construction_unit_name
|
||||
,su1.real_name as prepared_name
|
||||
,su2.real_name as approved_name
|
||||
,su3.real_name as epc_professional_engineer_name
|
||||
,su4.real_name as epc_technical_director_name
|
||||
,su5.real_name as supervision_professional_engineer_name
|
||||
,su6.real_name as director_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_manager_name
|
||||
,su9.real_name as construction_department_professional_director_name
|
||||
from engineer_controller_level t
|
||||
left join device_unit du on du.id=t.unit_engineering
|
||||
left join project_group pg on pg.id=t.project_team
|
||||
@ -19,6 +26,13 @@
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit
|
||||
left join system_user su1 on su1.user_id=t.prepared
|
||||
left join system_user su2 on su2.user_id=t.approved
|
||||
left join system_user su3 on su3.user_id=t.epc_professional_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_director
|
||||
left join system_user su5 on su5.user_id=t.supervision_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.director
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_manager
|
||||
left join system_user su9 on su9.user_id=t.construction_department_professional_director
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
@ -32,6 +46,13 @@
|
||||
,ei3.enterprise_name as construction_unit_name
|
||||
,su1.real_name as prepared_name
|
||||
,su2.real_name as approved_name
|
||||
,su3.real_name as epc_professional_engineer_name
|
||||
,su4.real_name as epc_technical_director_name
|
||||
,su5.real_name as supervision_professional_engineer_name
|
||||
,su6.real_name as director_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_manager_name
|
||||
,su9.real_name as construction_department_professional_director_name
|
||||
from engineer_controller_level t
|
||||
left join device_unit du on du.id=t.unit_engineering
|
||||
left join project_group pg on pg.id=t.project_team
|
||||
@ -40,6 +61,13 @@
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit
|
||||
left join system_user su1 on su1.user_id=t.prepared
|
||||
left join system_user su2 on su2.user_id=t.approved
|
||||
left join system_user su3 on su3.user_id=t.epc_professional_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_director
|
||||
left join system_user su5 on su5.user_id=t.supervision_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.director
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_manager
|
||||
left join system_user su9 on su9.user_id=t.construction_department_professional_director
|
||||
)t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.FirstExampleManageMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.FirstExampleManage">
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.FirstExampleManage">
|
||||
select * from (select
|
||||
t.* ,
|
||||
du.device_unit_name,
|
||||
@ -12,6 +11,11 @@
|
||||
ei2.enterprise_name as supervising_unit_name,
|
||||
ei3.enterprise_name as construction_unit_name
|
||||
,su.real_name as technical_director_name
|
||||
,su1.real_name as professional_epc_contractor_name
|
||||
,su2.real_name as construction_contractor_name
|
||||
,su3.real_name as supervising_engineer_name
|
||||
,su4.real_name as professional_engineer_name
|
||||
,su5.real_name as professional_team_leader_name
|
||||
from
|
||||
first_example_manage t
|
||||
join device_unit du on t.device_unit_id = du.id
|
||||
@ -20,6 +24,11 @@
|
||||
left join enterprise_info ei2 on ei2.id=t.supervising_unit_id
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit_id
|
||||
left join system_user su on su.user_id=t.technical_director
|
||||
left join system_user su1 on su1.user_id=t.professional_epc_contractor
|
||||
left join system_user su2 on su2.user_id=t.construction_contractor
|
||||
left join system_user su3 on su3.user_id=t.supervising_engineer
|
||||
left join system_user su4 on su4.user_id=t.professional_engineer
|
||||
left join system_user su5 on su5.user_id=t.professional_team_leader
|
||||
) t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
@ -34,6 +43,11 @@
|
||||
ei2.enterprise_name as supervising_unit_name,
|
||||
ei3.enterprise_name as construction_unit_name
|
||||
,su.real_name as technical_director_name
|
||||
,su1.real_name as professional_epc_contractor_name
|
||||
,su2.real_name as construction_contractor_name
|
||||
,su3.real_name as supervising_engineer_name
|
||||
,su4.real_name as professional_engineer_name
|
||||
,su5.real_name as professional_team_leader_name
|
||||
from
|
||||
first_example_manage t
|
||||
join device_unit du on t.device_unit_id = du.id
|
||||
@ -42,6 +56,11 @@
|
||||
left join enterprise_info ei2 on ei2.id=t.supervising_unit_id
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit_id
|
||||
left join system_user su on su.user_id=t.technical_director
|
||||
left join system_user su1 on su1.user_id=t.professional_epc_contractor
|
||||
left join system_user su2 on su2.user_id=t.construction_contractor
|
||||
left join system_user su3 on su3.user_id=t.supervising_engineer
|
||||
left join system_user su4 on su4.user_id=t.professional_engineer
|
||||
left join system_user su5 on su5.user_id=t.professional_team_leader
|
||||
) t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.PipelineMaterialInspectionMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.PipelineMaterialInspection">
|
||||
select * from (
|
||||
select t.*,
|
||||
@ -9,12 +10,28 @@
|
||||
ei1.enterprise_name as supervising_unit_name,
|
||||
ei2.enterprise_name as epc_contractor_name,
|
||||
ei3.enterprise_name as construction_unit_name
|
||||
,su1.real_name as construction_unit_construction_worker_name
|
||||
,su2.real_name as construction_unit_technical_person_in_charge_name
|
||||
,su3.real_name as epc_professional_engineer_name
|
||||
,su4.real_name as epc_technical_person_in_charge_name
|
||||
,su5.real_name as supervision_professional_engineer_name
|
||||
,su6.real_name as director_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_team_project_manager_name
|
||||
from pipeline_material_inspection t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join project_group pg on pg.id = t.project_group_id
|
||||
left join enterprise_info ei1 on ei1.id=t.supervising_unit_id
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor_id
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit_id
|
||||
left join system_user su1 on su1.user_id=t.construction_unit_construction_worker
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_technical_person_in_charge
|
||||
left join system_user su3 on su3.user_id=t.epc_professional_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_person_in_charge
|
||||
left join system_user su5 on su5.user_id=t.supervision_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.director
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_team_project_manager
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
@ -26,12 +43,28 @@
|
||||
ei1.enterprise_name as supervising_unit_name,
|
||||
ei2.enterprise_name as epc_contractor_name,
|
||||
ei3.enterprise_name as construction_unit_name
|
||||
,su1.real_name as construction_unit_construction_worker_name
|
||||
,su2.real_name as construction_unit_technical_person_in_charge_name
|
||||
,su3.real_name as epc_professional_engineer_name
|
||||
,su4.real_name as epc_technical_person_in_charge_name
|
||||
,su5.real_name as supervision_professional_engineer_name
|
||||
,su6.real_name as director_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_team_project_manager_name
|
||||
from pipeline_material_inspection t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join project_group pg on pg.id = t.project_group_id
|
||||
left join enterprise_info ei1 on ei1.id=t.supervising_unit_id
|
||||
left join enterprise_info ei2 on ei2.id=t.epc_contractor_id
|
||||
left join enterprise_info ei3 on ei3.id=t.construction_unit_id
|
||||
left join system_user su1 on su1.user_id=t.construction_unit_construction_worker
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_technical_person_in_charge
|
||||
left join system_user su3 on su3.user_id=t.epc_professional_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_person_in_charge
|
||||
left join system_user su5 on su5.user_id=t.supervision_professional_engineer
|
||||
left join system_user su6 on su6.user_id=t.director
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_team_project_manager
|
||||
)t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
|
||||
@ -7,9 +7,25 @@
|
||||
du.device_unit_name as device_unit_name,
|
||||
group_concat(distinct pi.pipeline_name) as pipeline_names,
|
||||
group_concat(distinct pi.pipeline_number) as pipeline_numbers
|
||||
,su1.real_name as construction_unit_technician_name
|
||||
,su2.real_name as construction_unit_technical_leader_name
|
||||
,su3.real_name as epc_pipeline_engineer_name
|
||||
,su4.real_name as epc_technical_leader_name
|
||||
,su5.real_name as supervision_unit_pipeline_engineer_name
|
||||
,su6.real_name as director_general_agent_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_team_project_manager_name
|
||||
from pipeline_pressure_test_bag t
|
||||
left join device_unit du on du.id = t.device_unit_id
|
||||
left join pipeline_information pi on find_in_set(pi.id,t.pipeline_information_ids)
|
||||
left join system_user su1 on su1.user_id=t.construction_unit_technician
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_technical_leader
|
||||
left join system_user su3 on su3.user_id=t.epc_pipeline_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_leader
|
||||
left join system_user su5 on su5.user_id=t.supervision_unit_pipeline_engineer
|
||||
left join system_user su6 on su6.user_id=t.director_general_agent
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_team_project_manager
|
||||
where 1=1
|
||||
<if test="param.search != null and param.search != ''">
|
||||
and (t.test_pressure_package_name like concat('%', #{param.search}, '%') or t.test_pressure_package_number like concat('%', #{param.search}, '%'))
|
||||
@ -24,9 +40,25 @@
|
||||
du.device_unit_name as device_unit_name,
|
||||
group_concat(distinct pi.pipeline_name) as pipeline_names,
|
||||
group_concat(distinct pi.pipeline_number) as pipeline_numbers
|
||||
,su1.real_name as construction_unit_technician_name
|
||||
,su2.real_name as construction_unit_technical_leader_name
|
||||
,su3.real_name as epc_pipeline_engineer_name
|
||||
,su4.real_name as epc_technical_leader_name
|
||||
,su5.real_name as supervision_unit_pipeline_engineer_name
|
||||
,su6.real_name as director_general_agent_name
|
||||
,su7.real_name as project_team_professional_engineer_name
|
||||
,su8.real_name as project_team_project_manager_name
|
||||
from pipeline_pressure_test_bag t
|
||||
left join device_unit du on du.id = t.device_unit_id
|
||||
left join pipeline_information pi on find_in_set(pi.id,t.pipeline_information_ids)
|
||||
left join system_user su1 on su1.user_id=t.construction_unit_technician
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_technical_leader
|
||||
left join system_user su3 on su3.user_id=t.epc_pipeline_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_technical_leader
|
||||
left join system_user su5 on su5.user_id=t.supervision_unit_pipeline_engineer
|
||||
left join system_user su6 on su6.user_id=t.director_general_agent
|
||||
left join system_user su7 on su7.user_id=t.project_team_professional_engineer
|
||||
left join system_user su8 on su8.user_id=t.project_team_project_manager
|
||||
group by t.id
|
||||
)t
|
||||
where t.id = #{id}
|
||||
|
||||
@ -14,6 +14,12 @@
|
||||
pw.welder_code,
|
||||
pi.pipeline_number as pipeline_number_line_number,
|
||||
pwjm.weld_number as welding_number
|
||||
,su1.real_name as recorder_name
|
||||
,su2.real_name as construction_unit_quality_inspector_name
|
||||
,su3.real_name as construction_unit_welding_responsible_engineer_name
|
||||
,su4.real_name as epc_professional_engineer_name
|
||||
,su5.real_name as supervising_pipeline_engineer_name
|
||||
,su6.real_name as project_team_pipeline_engineer_name
|
||||
from pipeline_welding_record t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join project_group pg on pg.id = t.project_group_id
|
||||
@ -24,6 +30,12 @@
|
||||
left join pipeline_welder pw on pw.id=t.pipeline_welder_id
|
||||
left join worker_info wi on wi.id=pw.worker_id
|
||||
left join pipeline_welding_joint_management pwjm on t.pipeline_welding_joint_management_id = pwjm.id
|
||||
left join system_user su1 on su1.user_id=t.recorder
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_quality_inspector
|
||||
left join system_user su3 on su3.user_id=t.construction_unit_welding_responsible_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_professional_engineer
|
||||
left join system_user su5 on su5.user_id=t.supervising_pipeline_engineer
|
||||
left join system_user su6 on su6.user_id=t.project_team_pipeline_engineer
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
@ -41,6 +53,12 @@
|
||||
pw.welder_code,
|
||||
pi.pipeline_number as pipeline_number_line_number,
|
||||
pwjm.weld_number as welding_number
|
||||
,su1.real_name as recorder_name
|
||||
,su2.real_name as construction_unit_quality_inspector_name
|
||||
,su3.real_name as construction_unit_welding_responsible_engineer_name
|
||||
,su4.real_name as epc_professional_engineer_name
|
||||
,su5.real_name as supervising_pipeline_engineer_name
|
||||
,su6.real_name as project_team_pipeline_engineer_name
|
||||
from pipeline_welding_record t
|
||||
left join device_unit du on t.device_unit_id = du.id
|
||||
left join project_group pg on pg.id = t.project_group_id
|
||||
@ -51,6 +69,12 @@
|
||||
left join pipeline_welder pw on pw.id=t.pipeline_welder_id
|
||||
left join worker_info wi on wi.id=pw.worker_id
|
||||
left join pipeline_welding_joint_management pwjm on t.pipeline_welding_joint_management_id = pwjm.id
|
||||
left join system_user su1 on su1.user_id=t.recorder
|
||||
left join system_user su2 on su2.user_id=t.construction_unit_quality_inspector
|
||||
left join system_user su3 on su3.user_id=t.construction_unit_welding_responsible_engineer
|
||||
left join system_user su4 on su4.user_id=t.epc_professional_engineer
|
||||
left join system_user su5 on su5.user_id=t.supervising_pipeline_engineer
|
||||
left join system_user su6 on su6.user_id=t.project_team_pipeline_engineer
|
||||
)t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
pg.project_group_name,
|
||||
ei2.enterprise_name as epc_pc_contractor_name
|
||||
,ei3.enterprise_name as supervisor_name
|
||||
,ei4.enterprise_name as epc_contractor_name
|
||||
,ei5.enterprise_name as construction_contractor_name
|
||||
,du.device_unit_name as device_name
|
||||
,wi.worker_name as construction_shift_supervisor_name
|
||||
,su1.real_name as construction_worker_name
|
||||
@ -14,6 +16,8 @@
|
||||
left join project_group pg on t.project_group_id = pg.id
|
||||
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
|
||||
left join enterprise_info ei3 on ei3.id = t.supervisor
|
||||
left join enterprise_info ei4 on ei4.id = t.epc_contractor
|
||||
left join enterprise_info ei5 on ei5.id = t.construction_contractor
|
||||
left join device_unit du on du.id=t.device
|
||||
left join worker_info wi on wi.id = t.construction_shift_supervisor
|
||||
left join system_user su1 on su1.user_id=t.construction_worker
|
||||
@ -27,6 +31,8 @@
|
||||
pg.project_group_name,
|
||||
ei2.enterprise_name as epc_pc_contractor_name
|
||||
,ei3.enterprise_name as supervisor_name
|
||||
,ei4.enterprise_name as epc_contractor_name
|
||||
,ei5.enterprise_name as construction_contractor_name
|
||||
,du.device_unit_name as device_name
|
||||
,wi.worker_name as construction_shift_supervisor_name
|
||||
,su1.real_name as construction_worker_name
|
||||
@ -35,6 +41,8 @@
|
||||
left join project_group pg on t.project_group_id = pg.id
|
||||
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
|
||||
left join enterprise_info ei3 on ei3.id = t.supervisor
|
||||
left join enterprise_info ei4 on ei4.id = t.epc_contractor
|
||||
left join enterprise_info ei5 on ei5.id = t.construction_contractor
|
||||
left join device_unit du on du.id=t.device
|
||||
left join worker_info wi on wi.id = t.construction_shift_supervisor
|
||||
left join system_user su1 on su1.user_id=t.construction_worker
|
||||
@ -70,13 +78,28 @@
|
||||
,du.device_unit_name as device_name
|
||||
from
|
||||
pouring_order_ledger t
|
||||
left join enterprise_info ei2 on ei2.id = t.epc_pc_contractor
|
||||
left join enterprise_info ei2 on ei2.id = t.epc_contractor
|
||||
left join device_unit du on du.id=t.device
|
||||
where 1 = 1 and t.project_sn = #{projectSn}
|
||||
where t.project_sn = #{projectSn} and t.contract_model = 1
|
||||
<if test="supplyStation != null and supplyStation != ''">
|
||||
<!--and t.supply_station like concat('%', #{supplyStation}, '%') -->
|
||||
and t.supply_station = #{supplyStation}
|
||||
</if>
|
||||
group by t.device,t.epc_pc_contractor
|
||||
group by t.device,t.epc_contractor
|
||||
union all
|
||||
select
|
||||
t.*
|
||||
,ei2.enterprise_name as epc_pc_contractor_name
|
||||
,du.device_unit_name as device_name
|
||||
from
|
||||
pouring_order_ledger t
|
||||
left join enterprise_info ei2 on ei2.id = t.construction_contractor
|
||||
left join device_unit du on du.id=t.device
|
||||
where t.project_sn = #{projectSn} and t.contract_model = 2
|
||||
<if test="supplyStation != null and supplyStation != ''">
|
||||
<!--and t.supply_station like concat('%', #{supplyStation}, '%') -->
|
||||
and t.supply_station = #{supplyStation}
|
||||
</if>
|
||||
group by t.device,t.construction_contractor
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@ -1,13 +1,26 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.WelderAssessmentRequestMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.WelderAssessmentRequest">
|
||||
select * from (
|
||||
select t.*
|
||||
,du.device_unit_name as undertaken_device_engineering_name
|
||||
,su1.real_name as epc_contractor_piping_engineer_name
|
||||
,su2.real_name as epc_contractor_welding_engineer_name
|
||||
,su3.real_name as supervising_piping_engineer_name
|
||||
,su4.real_name as supervising_welding_engineer_name
|
||||
,su5.real_name as project_team_piping_engineer_name
|
||||
,su6.real_name as project_team_welding_engineer_name
|
||||
,su7.real_name as construction_department_welding_engineer_name
|
||||
from welder_assessment_request t
|
||||
left join device_unit du on du.id=t.undertaken_device_engineering
|
||||
left join system_user su1 on su1.user_id=t.epc_contractor_piping_engineer
|
||||
left join system_user su2 on su2.user_id=t.epc_contractor_welding_engineer
|
||||
left join system_user su3 on su3.user_id=t.supervising_piping_engineer
|
||||
left join system_user su4 on su4.user_id=t.supervising_welding_engineer
|
||||
left join system_user su5 on su5.user_id=t.project_team_piping_engineer
|
||||
left join system_user su6 on su6.user_id=t.project_team_welding_engineer
|
||||
left join system_user su7 on su7.user_id=t.construction_department_welding_engineer
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
@ -15,8 +28,22 @@
|
||||
select * from (
|
||||
select t.*
|
||||
,du.device_unit_name as undertaken_device_engineering_name
|
||||
,su1.real_name as epc_contractor_piping_engineer_name
|
||||
,su2.real_name as epc_contractor_welding_engineer_name
|
||||
,su3.real_name as supervising_piping_engineer_name
|
||||
,su4.real_name as supervising_welding_engineer_name
|
||||
,su5.real_name as project_team_piping_engineer_name
|
||||
,su6.real_name as project_team_welding_engineer_name
|
||||
,su7.real_name as construction_department_welding_engineer_name
|
||||
from welder_assessment_request t
|
||||
left join device_unit du on du.id=t.undertaken_device_engineering
|
||||
left join system_user su1 on su1.user_id=t.epc_contractor_piping_engineer
|
||||
left join system_user su2 on su2.user_id=t.epc_contractor_welding_engineer
|
||||
left join system_user su3 on su3.user_id=t.supervising_piping_engineer
|
||||
left join system_user su4 on su4.user_id=t.supervising_welding_engineer
|
||||
left join system_user su5 on su5.user_id=t.project_team_piping_engineer
|
||||
left join system_user su6 on su6.user_id=t.project_team_welding_engineer
|
||||
left join system_user su7 on su7.user_id=t.construction_department_welding_engineer
|
||||
)t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
|
||||
@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.zhgd.xmgl.modules.baotou.mapper.WitnessSamplingRecordMapper">
|
||||
|
||||
<select id="queryList" resultType="com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord">
|
||||
select * from (
|
||||
select t.*
|
||||
from witness_sampling_record t
|
||||
)t
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
<select id="queryById" resultType="com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord">
|
||||
select * from (
|
||||
select t.*
|
||||
from witness_sampling_record t
|
||||
)t
|
||||
where t.id = #{id}
|
||||
</select>
|
||||
</mapper>
|
||||
@ -20,7 +20,6 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
|
||||
import com.zhgd.xmgl.modules.dangerous.service.IDangerousEngineeringRecordService;
|
||||
import com.zhgd.xmgl.modules.video.service.IAiAnalyseHardWareAlarmRecordService;
|
||||
import com.zhgd.xmgl.modules.worker.service.impl.WorkerInfoServiceImpl;
|
||||
import com.zhgd.xmgl.modules.xz.entity.XzTaskProgressContent;
|
||||
import com.zhgd.xmgl.util.MessageUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
@ -30,18 +29,12 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.collections.MapUtils;
|
||||
import org.flowable.engine.HistoryService;
|
||||
import org.flowable.engine.RuntimeService;
|
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
|
||||
import org.jeecgframework.poi.excel.entity.ExportParams;
|
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Lazy;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import springfox.documentation.annotations.ApiIgnore;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.util.Date;
|
||||
@ -543,31 +536,31 @@ public class XzSecurityQualityInspectionRecordController {
|
||||
return Result.success(xzSecurityQualityInspectionRecordService.querySpecialPage(map));
|
||||
}
|
||||
|
||||
@OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流添加安全检查记录")
|
||||
@ApiOperation(value = "工作流添加安全检查记录", notes = "工作流添加安全检查记录", httpMethod = "GET")
|
||||
@GetMapping(value = "/flow/add")
|
||||
public Result addFromFlow(@ApiIgnore @RequestParam Map<String, Object> map) {
|
||||
log.info("工作流添加安全检查记录:{}", JSON.toJSONString(map));
|
||||
@OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流保存安全检查记录")
|
||||
@ApiOperation(value = "工作流保存安全检查记录", notes = "工作流保存安全检查记录", httpMethod = "GET")
|
||||
@GetMapping(value = "/flow/save")
|
||||
public Result saveFromFlow(@ApiIgnore @RequestParam Map<String, Object> map) {
|
||||
log.info("工作流保存安全检查记录:{}", JSON.toJSONString(map));
|
||||
try {
|
||||
xzSecurityQualityInspectionRecordService.addFromFlow(map);
|
||||
xzSecurityQualityInspectionRecordService.saveFromFlow(map);
|
||||
} catch (Exception e) {
|
||||
log.error("工作流添加安全检查记录:", e);
|
||||
}
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
@OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流更改安全检查记录状态")
|
||||
@ApiOperation(value = "工作流更改安全检查记录状态", notes = "工作流更改安全检查记录状态", httpMethod = "GET")
|
||||
@GetMapping(value = "/flow/set/status")
|
||||
public Result setRectification(@ApiIgnore @RequestParam Map<String, Object> map) {
|
||||
log.info("工作流更改安全检查记录为整改中:{}", JSON.toJSONString(map));
|
||||
String instanceId = MapUtils.getString(map, "instanceId");
|
||||
xzSecurityQualityInspectionRecordService.update(new LambdaUpdateWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.set(XzSecurityQualityInspectionRecord::getStatus, MapUtils.getInteger(map,"status"))
|
||||
.eq(XzSecurityQualityInspectionRecord::getInstanceId, instanceId)
|
||||
);
|
||||
return Result.ok();
|
||||
}
|
||||
// @OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流更改安全检查记录状态")
|
||||
// @ApiOperation(value = "工作流更改安全检查记录状态", notes = "工作流更改安全检查记录状态", httpMethod = "GET")
|
||||
// @GetMapping(value = "/flow/set/status")
|
||||
// public Result setRectification(@ApiIgnore @RequestParam Map<String, Object> map) {
|
||||
// log.info("工作流更改安全检查记录为整改中:{}", JSON.toJSONString(map));
|
||||
// String instanceId = MapUtils.getString(map, "instanceId");
|
||||
// xzSecurityQualityInspectionRecordService.update(new LambdaUpdateWrapper<XzSecurityQualityInspectionRecord>()
|
||||
// .set(XzSecurityQualityInspectionRecord::getStatus, MapUtils.getInteger(map,"status"))
|
||||
// .eq(XzSecurityQualityInspectionRecord::getInstanceId, instanceId)
|
||||
// );
|
||||
// return Result.ok();
|
||||
// }
|
||||
|
||||
// @OperLog(operModul = "安全检查记录", operType = "", operDesc = "工作流设置责任单位")
|
||||
// @ApiOperation(value = "工作流设置责任单位", notes = "工作流设置责任单位", httpMethod = "GET")
|
||||
|
||||
@ -87,7 +87,7 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
|
||||
/**
|
||||
* 状态，2待整改，3整改中，5合格，6已撤销
|
||||
*/
|
||||
@Excel(name = "状态", width = 15,replace={"待整改_2","整改中_3","合格_5","已撤销_6"})
|
||||
@Excel(name = "状态", width = 15, replace = {"待整改_2", "整改中_3", "合格_5", "已撤销_6"})
|
||||
@ApiModelProperty(value = "状态，2待整改，3整改中，5合格，6已撤销")
|
||||
private java.lang.Integer status;
|
||||
/**
|
||||
@ -221,7 +221,7 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
|
||||
/**
|
||||
* 合同模式：1EPC;2E+P+C
|
||||
*/
|
||||
@Excel(name = "合同模式", width = 15,replace={"EPC_1","E+P+C_2"})
|
||||
@Excel(name = "合同模式", width = 15, replace = {"EPC_1", "E+P+C_2"})
|
||||
@ApiModelProperty("合同模式：1EPC;2E+P+C")
|
||||
private Integer contractModel;
|
||||
/**
|
||||
@ -285,10 +285,30 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
|
||||
@ApiModelProperty(value = "签发日期")
|
||||
private java.util.Date issuingDate;
|
||||
/**
|
||||
* 工作流节点id
|
||||
* 工作流节点id，责任单位的节点id
|
||||
*/
|
||||
@ApiModelProperty(value = "工作流节点id")
|
||||
private java.lang.String nodeId;
|
||||
|
||||
@ApiModelProperty(value = "施工承包商安全经理")
|
||||
private java.lang.Long constructionContractorSafetyManager;
|
||||
@ApiModelProperty(value = "施工承包商项目经理")
|
||||
private java.lang.Long constructionContractorProjectManager;
|
||||
@ApiModelProperty(value = "EPC承包商安全经理")
|
||||
private java.lang.Long epcContractorSafetyManager;
|
||||
@ApiModelProperty(value = "EPC承包商项目经理")
|
||||
private java.lang.Long epcContractorProjectManager;
|
||||
@ApiModelProperty(value = "监理安全工程师")
|
||||
private java.lang.Long supervisingSafetyEngineer;
|
||||
@ApiModelProperty(value = "总监")
|
||||
private java.lang.Long director;
|
||||
@ApiModelProperty(value = "HSE经理")
|
||||
private java.lang.Long hseManager;
|
||||
@ApiModelProperty(value = "项目组经理")
|
||||
private java.lang.Long projectTeamManager;
|
||||
@ApiModelProperty(value = "安质环部安全经理")
|
||||
private java.lang.Long safetyQualitySafetyManager;
|
||||
|
||||
/**
|
||||
* 分部工程名称
|
||||
*/
|
||||
@ -307,5 +327,31 @@ public class XzSecurityQualityInspectionRecord implements Serializable {
|
||||
@ApiModelProperty(value = "安全履职预警超时时间（分钟）")
|
||||
private Integer safeWatchAlarmExceedMinute;
|
||||
|
||||
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工承包商安全经理名称")
|
||||
private java.lang.String constructionContractorSafetyManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "施工承包商项目经理名称")
|
||||
private java.lang.String constructionContractorProjectManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC承包商安全经理名称")
|
||||
private java.lang.String epcContractorSafetyManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "EPC承包商项目经理名称")
|
||||
private java.lang.String epcContractorProjectManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "监理安全工程师名称")
|
||||
private java.lang.String supervisingSafetyEngineerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "总监名称")
|
||||
private java.lang.String directorName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "HSE经理名称")
|
||||
private java.lang.String hseManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "项目组经理名称")
|
||||
private java.lang.String projectTeamManagerName;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "安质环部安全经理名称")
|
||||
private java.lang.String safetyQualitySafetyManagerName;
|
||||
}
|
||||
|
||||
@ -314,7 +314,7 @@ public interface IXzSecurityQualityInspectionRecordService extends IService<XzSe
|
||||
*/
|
||||
Page<XzSecurityQualityInspectionRecordVo> querySpecialPage(Map<String, Object> map);
|
||||
|
||||
void addFromFlow(Map<String, Object> map);
|
||||
void saveFromFlow(Map<String, Object> map);
|
||||
|
||||
List<TrendOneVo> countResponsibleUnit(Map<String, Object> map);
|
||||
|
||||
|
||||
@ -6,6 +6,7 @@ import cn.hutool.core.util.NumberUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
@ -227,7 +228,7 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
|
||||
// }
|
||||
// }
|
||||
if (Objects.equals(MapUtils.getInteger(map, "isMyTodo"), 1)) {
|
||||
List<String> instanceIds = flowSeviceUtil.getMyTodoInstanceIds("wf66f6451c48b718d0aaf27522",projectSn);
|
||||
List<String> instanceIds = flowSeviceUtil.getMyTodoInstanceIds("wf66f6451c48b718d0aaf27522", projectSn);
|
||||
map.put("instanceIds", instanceIds);
|
||||
}
|
||||
Page<XzSecurityQualityInspectionRecordVo> page = new Page<>(pageNo, pageSize);
|
||||
@ -949,14 +950,18 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addFromFlow(Map<String, Object> map) {
|
||||
public void saveFromFlow(Map<String, Object> map) {
|
||||
String instanceId = FlowUtil.getString(map, "instanceId");
|
||||
ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(instanceId).singleResult();
|
||||
Map<String, Object> formData = processService.getInstanceProgress(null, instanceId).getFormData();
|
||||
ProcessProgressVo.ProgressNode node = flowSeviceUtil.getNextTodoApproval(instanceId,FlowUtil.getString(map, "dfNodeId"));
|
||||
OrgUser user = node.getUser();
|
||||
SystemUser user1 = systemUserService.getById(user.getId());
|
||||
WorkerInfo info = workerInfoService.getById(user1.getWorkerId());
|
||||
formData.putAll(map);
|
||||
ProcessProgressVo.ProgressNode node = flowSeviceUtil.getNextTodoApproval(instanceId, FlowUtil.getString(map, "dfNodeId"));
|
||||
WorkerInfo info = null;
|
||||
if (node != null) {
|
||||
OrgUser user = node.getUser();
|
||||
SystemUser user1 = systemUserService.getById(user.getId());
|
||||
info = workerInfoService.getById(user1.getWorkerId());
|
||||
}
|
||||
Long creatorId = FlowUtil.getPullDownLong(formData, "creatorId");
|
||||
Long changeId = FlowUtil.getPullDownLong(formData, "changeId");
|
||||
Long inspectManId = FlowUtil.getPullDownLong(formData, "field7469574611447");
|
||||
@ -1006,7 +1011,7 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
|
||||
record.setDangerTypeId(Optional.ofNullable(t1).map(XzSecurityDangerTypeRecord::getId).orElse(null));
|
||||
// record.setLevel(level);
|
||||
record.setUrgentLevel(urgentLevel);
|
||||
record.setStatus(2);
|
||||
record.setStatus(FlowUtil.getInteger(formData, "status"));
|
||||
record.setNotifyPerson(notifyPerson);
|
||||
record.setCreatorId(creatorId);
|
||||
record.setCreateTime(createTime);
|
||||
@ -1034,8 +1039,25 @@ public class XzSecurityQualityInspectionRecordServiceImpl extends ServiceImpl<Xz
|
||||
record.setConstructionContractorId(constructionContractorId);
|
||||
record.setSecurityType(Objects.equals(contractModel, "检查问题") ? 1 : 2);
|
||||
record.setSecurityRiskStatement(securityRiskStatement);
|
||||
record.setNodeId(node.getNodeId());
|
||||
baseMapper.insert(record);
|
||||
record.setNodeId(node != null ? node.getNodeId() : null);
|
||||
|
||||
record.setConstructionContractorSafetyManager(FlowUtil.getPullDownLong(formData, "field3666003596745"));
|
||||
record.setConstructionContractorProjectManager(FlowUtil.getPullDownLong(formData, "field4955203598080"));
|
||||
record.setEpcContractorSafetyManager(FlowUtil.getPullDownLong(formData, "field5086003599462"));
|
||||
record.setEpcContractorProjectManager(FlowUtil.getPullDownLong(formData, "field3595503600494"));
|
||||
record.setSupervisingSafetyEngineer(FlowUtil.getPullDownLong(formData, "field5593203601561"));
|
||||
record.setDirector(FlowUtil.getPullDownLong(formData, "field3631103603262"));
|
||||
record.setHseManager(FlowUtil.getPullDownLong(formData, "field9101303604412"));
|
||||
record.setProjectTeamManager(FlowUtil.getPullDownLong(formData, "field3546303657580"));
|
||||
record.setSafetyQualitySafetyManager(FlowUtil.getPullDownLong(formData, "field8251603681095"));
|
||||
Integer count = xzSecurityQualityInspectionRecordMapper.selectCount(new LambdaQueryWrapper<XzSecurityQualityInspectionRecord>()
|
||||
.eq(XzSecurityQualityInspectionRecord::getInstanceId, instanceId));
|
||||
if (count > 0) {
|
||||
record.setNodeId(null);
|
||||
baseMapper.update(record, new LambdaUpdateWrapper<XzSecurityQualityInspectionRecord>().eq(XzSecurityQualityInspectionRecord::getInstanceId, instanceId));
|
||||
} else {
|
||||
baseMapper.insert(record);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
package com.zhgd.xmgl.modules.baotou.service;
|
||||
|
||||
import com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description: 见证取样记录
|
||||
* @author： pds
|
||||
* @date： 2024-12-20
|
||||
* @version： V1.0
|
||||
*/
|
||||
public interface IWitnessSamplingRecordService extends IService<WitnessSamplingRecord> {
|
||||
/**
|
||||
* 分页列表查询见证取样记录信息
|
||||
* @param param 参数map
|
||||
* @return
|
||||
*/
|
||||
IPage<WitnessSamplingRecord> queryPageList(HashMap<String, Object> param);
|
||||
/**
|
||||
* 列表查询见证取样记录信息
|
||||
* @param param 参数map
|
||||
* @return
|
||||
*/
|
||||
List<WitnessSamplingRecord> queryList(HashMap<String, Object> param);
|
||||
/**
|
||||
* 添加见证取样记录信息
|
||||
* @param witnessSamplingRecord 见证取样记录
|
||||
* @return
|
||||
*/
|
||||
void add(WitnessSamplingRecord witnessSamplingRecord);
|
||||
/**
|
||||
* 编辑见证取样记录信息
|
||||
* @param witnessSamplingRecord 见证取样记录
|
||||
* @return
|
||||
*/
|
||||
void edit(WitnessSamplingRecord witnessSamplingRecord);
|
||||
/**
|
||||
* 根据id删除见证取样记录信息
|
||||
* @param id 见证取样记录的id
|
||||
* @return
|
||||
*/
|
||||
void delete(String id);
|
||||
/**
|
||||
* 根据id查询见证取样记录信息
|
||||
* @param id 见证取样记录的id
|
||||
* @return
|
||||
*/
|
||||
WitnessSamplingRecord queryById(String id);
|
||||
|
||||
void saveFromFlow(Map<String, Object> map);
|
||||
}
|
||||
@ -175,23 +175,23 @@ public class ConfinedSpaceOperationServiceImpl extends ServiceImpl<ConfinedSpace
|
||||
}
|
||||
|
||||
private ConfinedSpaceOperation buildSpace(Map<String, Object> map) {
|
||||
Long projectGroupId = Optional.ofNullable(map.get("projectGroupId")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long jobApplicationUnit = Optional.ofNullable(map.get("jobApplicationUnit")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long deviceUnitId = Optional.ofNullable(map.get("deviceUnitId")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long applicantSignature = Optional.ofNullable(map.get("applicantSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long contractorSignature = Optional.ofNullable(map.get("contractorSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long supervisorSignature = Optional.ofNullable(map.get("supervisorSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long detectionAndAnalysisSignature = Optional.ofNullable(map.get("detectionAndAnalysisSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long operationSupervisor = Optional.ofNullable(map.get("operationSupervisor")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long epcContractor1 = Optional.ofNullable(map.get("epcContractor1")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long epcContractor2 = Optional.ofNullable(map.get("epcContractor2")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long supervisor1 = Optional.ofNullable(map.get("supervisor1")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long supervisor2 = Optional.ofNullable(map.get("supervisor2")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long projectTeam1 = Optional.ofNullable(map.get("projectTeam1")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long projectTeam2 = Optional.ofNullable(map.get("projectTeam2")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long safetyQualityEnvironmentalProtectionDepartment = Optional.ofNullable(map.get("safetyQualityEnvironmentalProtectionDepartment")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long operatorSignature = Optional.ofNullable(map.get("operatorSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long guardianSignature = Optional.ofNullable(map.get("guardianSignature")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long projectGroupId = FlowUtil.getPullDownLong(map, "projectGroupId");
|
||||
Long jobApplicationUnit = FlowUtil.getPullDownLong(map, "jobApplicationUnit");
|
||||
Long deviceUnitId = FlowUtil.getPullDownLong(map, "deviceUnitId");
|
||||
Long applicantSignature = FlowUtil.getPullDownLong(map, "applicantSignature");
|
||||
Long contractorSignature = FlowUtil.getPullDownLong(map, "contractorSignature");
|
||||
Long supervisorSignature = FlowUtil.getPullDownLong(map, "supervisorSignature");
|
||||
Long detectionAndAnalysisSignature = FlowUtil.getPullDownLong(map, "detectionAndAnalysisSignature");
|
||||
Long operationSupervisor = FlowUtil.getPullDownLong(map, "operationSupervisor");
|
||||
Long epcContractor1 = FlowUtil.getPullDownLong(map, "epcContractor1");
|
||||
Long epcContractor2 = FlowUtil.getPullDownLong(map, "epcContractor2");
|
||||
Long supervisor1 = FlowUtil.getPullDownLong(map, "supervisor1");
|
||||
Long supervisor2 = FlowUtil.getPullDownLong(map, "supervisor2");
|
||||
Long projectTeam1 = FlowUtil.getPullDownLong(map, "projectTeam1");
|
||||
Long projectTeam2 = FlowUtil.getPullDownLong(map, "projectTeam2");
|
||||
Long safetyQualityEnvironmentalProtectionDepartment = FlowUtil.getPullDownLong(map, "safetyQualityEnvironmentalProtectionDepartment");
|
||||
Long operatorSignature = FlowUtil.getPullDownLong(map, "operatorSignature");
|
||||
Long guardianSignature = FlowUtil.getPullDownLong(map, "guardianSignature");
|
||||
String operator = Optional.ofNullable(map.get("operator")).map(o -> StringUtils.join(((List) o), ",")).orElse(null);
|
||||
String jobHazardIdentificationDetail = Optional.ofNullable(map.get("jobHazardIdentificationDetail")).map(JSON::toJSONString).orElse(null);
|
||||
String num = MapUtils.getString(map, "num");
|
||||
|
||||
@ -104,6 +104,15 @@ public class EngineerControllerLevelServiceImpl extends ServiceImpl<EngineerCont
|
||||
e.setEpcContractor(FlowUtil.getPullDownLong(map,"epcContractor"));
|
||||
e.setConstructionUnit(FlowUtil.getPullDownLong(map,"constructionUnit"));
|
||||
e.setUploadAttachment(FlowUtil.getJSONString(map,"uploadAttachment"));
|
||||
e.setContractModel(FlowUtil.getPullDownInteger(map, "contractModel"));
|
||||
e.setEpcProfessionalEngineer(FlowUtil.getPullDownLong(map, "epcProfessionalEngineer"));
|
||||
e.setEpcTechnicalDirector(FlowUtil.getPullDownLong(map, "epcTechnicalDirector"));
|
||||
e.setSupervisionProfessionalEngineer(FlowUtil.getPullDownLong(map, "supervisionProfessionalEngineer"));
|
||||
e.setDirector(FlowUtil.getPullDownLong(map, "director"));
|
||||
e.setProjectTeamProfessionalEngineer(FlowUtil.getPullDownLong(map, "projectTeamProfessionalEngineer"));
|
||||
e.setProjectManager(FlowUtil.getPullDownLong(map, "projectManager"));
|
||||
e.setConstructionDepartmentProfessionalDirector(FlowUtil.getPullDownLong(map, "constructionDepartmentProfessionalDirector"));
|
||||
e.setMajor(FlowUtil.getPullDownInteger(map, "major"));
|
||||
baseMapper.insert(e);
|
||||
}
|
||||
|
||||
|
||||
@ -167,23 +167,23 @@ public class LiftingOperationServiceImpl extends ServiceImpl<LiftingOperationMap
|
||||
}
|
||||
|
||||
private LiftingOperation buildLift(Map<String, Object> map) {
|
||||
Long applicant = Optional.ofNullable(map.get("applicant")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long operationUnitConstructionApplicant = Optional.ofNullable(map.get("operationUnitConstructionApplicant")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long operationSupervision = Optional.ofNullable(map.get("operationSupervision")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long projectConstructionManagerOfConstructionContractor = Optional.ofNullable(map.get("projectConstructionManagerOfConstructionContractor")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long safetyManagerOfConstructionContractor = Optional.ofNullable(map.get("safetyManagerOfConstructionContractor")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long siteManagerProfessionalEngineer = Optional.ofNullable(map.get("siteManagerProfessionalEngineer")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long safetyManagerOfEpcContractor = Optional.ofNullable(map.get("safetyManagerOfEpcContractor")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long safetyEngineerOfSupervisionUnit = Optional.ofNullable(map.get("safetyEngineerOfSupervisionUnit")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long directorGeneralAgent = Optional.ofNullable(map.get("directorGeneralAgent")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long professionalEngineerOfProjectTeam = Optional.ofNullable(map.get("professionalEngineerOfProjectTeam")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long projectConstructionManagerOfProjectTeam = Optional.ofNullable(map.get("projectConstructionManagerOfProjectTeam")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long professionalEngineerOfConstructionManagementDepartment = Optional.ofNullable(map.get("professionalEngineerOfConstructionManagementDepartment")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
Long departmentManager = Optional.ofNullable(map.get("departmentManager")).map(o -> Convert.toLong(((List) o).get(0))).orElse(null);
|
||||
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);
|
||||
Long applicant = FlowUtil.getPullDownLong(map, "applicant");
|
||||
Long operationUnitConstructionApplicant = FlowUtil.getPullDownLong(map, "operationUnitConstructionApplicant");
|
||||
Long operationSupervision = FlowUtil.getPullDownLong(map, "operationSupervision");
|
||||
Long projectConstructionManagerOfConstructionContractor = FlowUtil.getPullDownLong(map, "projectConstructionManagerOfConstructionContractor");
|
||||
Long safetyManagerOfConstructionContractor = FlowUtil.getPullDownLong(map, "safetyManagerOfConstructionContractor");
|
||||
Long siteManagerProfessionalEngineer = FlowUtil.getPullDownLong(map, "siteManagerProfessionalEngineer");
|
||||
Long safetyManagerOfEpcContractor = FlowUtil.getPullDownLong(map, "safetyManagerOfEpcContractor");
|
||||
Long safetyEngineerOfSupervisionUnit = FlowUtil.getPullDownLong(map, "safetyEngineerOfSupervisionUnit");
|
||||
Long directorGeneralAgent = FlowUtil.getPullDownLong(map, "directorGeneralAgent");
|
||||
Long professionalEngineerOfProjectTeam = FlowUtil.getPullDownLong(map, "professionalEngineerOfProjectTeam");
|
||||
Long projectConstructionManagerOfProjectTeam = FlowUtil.getPullDownLong(map, "projectConstructionManagerOfProjectTeam");
|
||||
Long professionalEngineerOfConstructionManagementDepartment = FlowUtil.getPullDownLong(map, "professionalEngineerOfConstructionManagementDepartment");
|
||||
Long departmentManager = FlowUtil.getPullDownLong(map, "departmentManager");
|
||||
Long operationSupervisor = FlowUtil.getPullDownLong(map, "operationSupervisor");
|
||||
Long safetyEngineer = FlowUtil.getPullDownLong(map, "safetyEngineer");
|
||||
Long operationEquipment = FlowUtil.getPullDownLong(map, "operationEquipment");
|
||||
Integer level = Optional.ofNullable(map.get("level")).map(o -> Convert.toInt(((List) o).get(0))).orElse(null);
|
||||
String operationLocation = MapUtils.getString(map, "operationLocation");
|
||||
String operationContent = MapUtils.getString(map, "operationContent");
|
||||
String craneTypeLicensePlateNumber = MapUtils.getString(map, "craneTypeLicensePlateNumber");
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.zhgd.xmgl.modules.baotou.service.impl;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
@ -148,6 +149,12 @@ public class PouringOrderLedgerServiceImpl extends ServiceImpl<PouringOrderLedge
|
||||
e.setSupplyStation(FlowUtil.getString(map, "supplyStation"));
|
||||
e.setProfessionalSupervisionEngineer(FlowUtil.getPullDownLong(map, "professionalSupervisionEngineer"));
|
||||
e.setProfessionalSupervisionEngineerDate(FlowUtil.getDate(map, "professionalSupervisionEngineerDate"));
|
||||
e.setContractModel(FlowUtil.getPullDownInteger(map, "contractModel"));
|
||||
e.setEpcProfessionalEngineer(FlowUtil.getPullDownLong(map, "epcProfessionalEngineer"));
|
||||
e.setSupervisionProfessionalEngineer(FlowUtil.getPullDownLong(map, "supervisionProfessionalEngineer"));
|
||||
e.setProjectTeamProfessionalEngineer(FlowUtil.getPullDownLong(map, "projectTeamProfessionalEngineer"));
|
||||
e.setEpcContractor(FlowUtil.getPullDownLong(map, "epcContractor"));
|
||||
e.setConstructionContractor(FlowUtil.getPullDownLong(map, "constructionContractor"));
|
||||
baseMapper.insert(e);
|
||||
}
|
||||
|
||||
@ -190,7 +197,8 @@ public class PouringOrderLedgerServiceImpl extends ServiceImpl<PouringOrderLedge
|
||||
for (int j = 1; j <= 12; j++) {
|
||||
String finalJ = j < 10 ? "0" + j : j + "";
|
||||
String key = year + "-" + finalJ;
|
||||
BigDecimal decimal = ledgerList.stream().filter(o -> Objects.equals(MapUtils.getLong(record, "epcPcContractor"), o.getEpcPcContractor())
|
||||
BigDecimal decimal = ledgerList.stream().filter(o -> (((Objects.equals(MapUtils.getInteger(record, "contractModel"), 1)) && Objects.equals(MapUtils.getLong(record, "epcContractor"), o.getEpcContractor()))
|
||||
|| ((Objects.equals(MapUtils.getInteger(record, "contractModel"), 2)) && Objects.equals(MapUtils.getLong(record, "constructionContractor"), o.getConstructionContractor())))
|
||||
&& Objects.equals(MapUtils.getLong(record, "device"), o.getDevice())
|
||||
&& Objects.equals(DateUtil.format(o.getPouringBeginTime(), "yyyy-MM"), key)
|
||||
).map(PouringOrderLedger::getEstimatedPouringVolume).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
@ -207,7 +215,8 @@ public class PouringOrderLedgerServiceImpl extends ServiceImpl<PouringOrderLedge
|
||||
for (int j = 1; j <= end; j++) {
|
||||
String finalJ = j < 10 ? "0" + j : j + "";
|
||||
String key = year + "-" + month + "-" + finalJ;
|
||||
BigDecimal decimal = ledgerList.stream().filter(o -> Objects.equals(MapUtils.getLong(record, "epcPcContractor"), o.getEpcPcContractor())
|
||||
BigDecimal decimal = ledgerList.stream().filter(o -> (((Objects.equals(MapUtils.getInteger(record, "contractModel"), 1)) && Objects.equals(MapUtils.getLong(record, "epcContractor"), o.getEpcContractor()))
|
||||
|| ((Objects.equals(MapUtils.getInteger(record, "contractModel"), 2)) && Objects.equals(MapUtils.getLong(record, "constructionContractor"), o.getConstructionContractor())))
|
||||
&& Objects.equals(MapUtils.getLong(record, "device"), o.getDevice())
|
||||
&& Objects.equals(DateUtil.format(o.getPouringBeginTime(), "yyyy-MM-dd"), key)
|
||||
).map(PouringOrderLedger::getEstimatedPouringVolume).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
package com.zhgd.xmgl.modules.baotou.service.impl;
|
||||
import java.util.Date;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
@ -113,6 +114,14 @@ public class WelderAssessmentRequestServiceImpl extends ServiceImpl<WelderAssess
|
||||
e.setEngineeringConstructionMode(FlowUtil.getInteger(map, "engineeringConstructionMode"));
|
||||
e.setApplicationAssessmentDetailsTable(FlowUtil.getJSONString(map, "applicationAssessmentDetailsTable"));
|
||||
e.setAssessmentPersonnel(FlowUtil.getJSONString(map, "assessmentPersonnel"));
|
||||
e.setContractModel(FlowUtil.getPullDownInteger(map, "contractModel"));
|
||||
e.setEpcContractorPipingEngineer(FlowUtil.getPullDownLong(map, "epcContractorPipingEngineer"));
|
||||
e.setEpcContractorWeldingEngineer(FlowUtil.getPullDownLong(map, "epcContractorWeldingEngineer"));
|
||||
e.setSupervisingPipingEngineer(FlowUtil.getPullDownLong(map, "supervisingPipingEngineer"));
|
||||
e.setSupervisingWeldingEngineer(FlowUtil.getPullDownLong(map, "supervisingWeldingEngineer"));
|
||||
e.setProjectTeamPipingEngineer(FlowUtil.getPullDownLong(map, "projectTeamPipingEngineer"));
|
||||
e.setProjectTeamWeldingEngineer(FlowUtil.getPullDownLong(map, "projectTeamWeldingEngineer"));
|
||||
e.setConstructionDepartmentWeldingEngineer(FlowUtil.getPullDownLong(map, "constructionDepartmentWeldingEngineer"));
|
||||
baseMapper.insert(e);
|
||||
List<WorkerInfo> workerInfoList = workerInfoService.list(new LambdaQueryWrapper<WorkerInfo>()
|
||||
.eq(WorkerInfo::getProjectSn, e.getProjectSn()));
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
package com.zhgd.xmgl.modules.baotou.service.impl;
|
||||
import java.util.Date;
|
||||
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.xmgl.modules.baotou.entity.WitnessSamplingRecord;
|
||||
import com.zhgd.xmgl.modules.baotou.mapper.WitnessSamplingRecordMapper;
|
||||
import com.zhgd.xmgl.modules.baotou.service.IWitnessSamplingRecordService;
|
||||
import com.zhgd.xmgl.util.FlowUtil;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.zhgd.jeecg.common.system.query.QueryGenerator;
|
||||
import com.zhgd.xmgl.util.PageUtil;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.zhgd.xmgl.util.RefUtil;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
/**
|
||||
* @Description: 见证取样记录
|
||||
* @author： pds
|
||||
* @date： 2024-12-20
|
||||
* @version： V1.0
|
||||
*/
|
||||
@Service
|
||||
public class WitnessSamplingRecordServiceImpl extends ServiceImpl<WitnessSamplingRecordMapper, WitnessSamplingRecord> implements IWitnessSamplingRecordService {
|
||||
@Autowired
|
||||
private WitnessSamplingRecordMapper witnessSamplingRecordMapper;
|
||||
@Override
|
||||
public IPage<WitnessSamplingRecord> queryPageList(HashMap<String, Object> param) {
|
||||
QueryWrapper<WitnessSamplingRecord> queryWrapper = this.getQueryWrapper(param);
|
||||
Page<WitnessSamplingRecord> page = PageUtil.getPage(param);
|
||||
IPage<WitnessSamplingRecord> pageList = baseMapper.queryList(page, queryWrapper,param);
|
||||
pageList.setRecords(this.dealList(pageList.getRecords()));
|
||||
return pageList;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WitnessSamplingRecord> queryList(HashMap<String, Object> param) {
|
||||
QueryWrapper<WitnessSamplingRecord> queryWrapper = getQueryWrapper(param);
|
||||
return dealList(baseMapper.queryList(queryWrapper,param));
|
||||
}
|
||||
|
||||
private QueryWrapper<WitnessSamplingRecord> getQueryWrapper(HashMap<String, Object> param) {
|
||||
QueryWrapper<WitnessSamplingRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(WitnessSamplingRecord.class, param, true);
|
||||
queryWrapper.orderByDesc(RefUtil.fieldNameUlc(WitnessSamplingRecord::getId));
|
||||
return queryWrapper;
|
||||
}
|
||||
|
||||
private List<WitnessSamplingRecord> dealList(List<WitnessSamplingRecord> list) {
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void add(WitnessSamplingRecord witnessSamplingRecord) {
|
||||
witnessSamplingRecord.setId(null);
|
||||
baseMapper.insert(witnessSamplingRecord);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void edit(WitnessSamplingRecord witnessSamplingRecord) {
|
||||
WitnessSamplingRecord oldWitnessSamplingRecord = baseMapper.selectById(witnessSamplingRecord.getId());
|
||||
if(oldWitnessSamplingRecord==null) {
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.updateById(witnessSamplingRecord);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(String id) {
|
||||
WitnessSamplingRecord witnessSamplingRecord = baseMapper.selectById(id);
|
||||
if(witnessSamplingRecord==null) {
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
baseMapper.deleteById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public WitnessSamplingRecord queryById(String id) {
|
||||
WitnessSamplingRecord entity = baseMapper.queryById(id);
|
||||
if (entity == null) {
|
||||
throw new OpenAlertException("未找到对应实体");
|
||||
}
|
||||
return entity;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveFromFlow(Map<String, Object> map) {
|
||||
WitnessSamplingRecord e = new WitnessSamplingRecord();
|
||||
e.setProjectSn(FlowUtil.getString(map,"projectSn"));
|
||||
e.setNumber(FlowUtil.getString(map,"number"));
|
||||
e.setProjectName(FlowUtil.getString(map,"projectName"));
|
||||
e.setConstructionUnit(FlowUtil.getPullDownLong(map,"constructionUnit"));
|
||||
e.setBuildUnit(FlowUtil.getString(map,"buildUnit"));
|
||||
e.setManufacturer(FlowUtil.getString(map,"manufacturer"));
|
||||
e.setWitnessUnit(FlowUtil.getPullDownLong(map,"witnessUnit"));
|
||||
e.setUsageLocation(FlowUtil.getString(map,"usageLocation"));
|
||||
e.setSampleName(FlowUtil.getString(map,"sampleName"));
|
||||
e.setNumberOfSamplesOnSite(FlowUtil.getString(map,"numberOfSamplesOnSite"));
|
||||
e.setSpecificationModel(FlowUtil.getString(map,"specificationModel"));
|
||||
e.setNumberOfSamplesToBeTaken(FlowUtil.getString(map,"numberOfSamplesToBeTaken"));
|
||||
e.setSamplingLocation(FlowUtil.getString(map,"samplingLocation"));
|
||||
e.setSamplingDate(FlowUtil.getDate(map,"samplingDate"));
|
||||
e.setWitnessRecord(FlowUtil.getString(map,"witnessRecord"));
|
||||
e.setSamplingAndInspection(FlowUtil.getString(map,"samplingAndInspection"));
|
||||
e.setSampleTaker(FlowUtil.getPullDownLong(map,"sampleTaker"));
|
||||
e.setWitness(FlowUtil.getPullDownLong(map,"witness"));
|
||||
baseMapper.insert(e);
|
||||
}
|
||||
|
||||
}
|
||||
@ -145,7 +145,8 @@ public class SystemUser implements Serializable {
|
||||
private java.lang.String personMail;
|
||||
@ApiModelProperty(value = "岗位id")
|
||||
private java.lang.Long postId;
|
||||
|
||||
@ApiModelProperty(value = "电子签名")
|
||||
private java.lang.String electronicSignature;
|
||||
@TableField(exist = false)
|
||||
@ApiModelProperty(value = "角色ID（多个，分割）")
|
||||
private java.lang.String roleId;
|
||||
|
||||
@ -80,6 +80,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
||||
|
||||
http.authorizeRequests()
|
||||
//请求路径允许访问
|
||||
.antMatchers("/xmgl/witnessSamplingRecord/flow/save").permitAll()
|
||||
.antMatchers("/xmgl/confinedSpaceOperation/flow/instanceId/save").permitAll()
|
||||
.antMatchers("/xmgl/liftingOperation/flow/instanceId/save").permitAll()
|
||||
.antMatchers("/xmgl/firstOrderFire/flow/instanceId/save").permitAll()
|
||||
|
||||
@ -32,7 +32,6 @@ import com.wflow.workflow.config.WflowGlobalVarDef;
|
||||
import com.wflow.workflow.service.*;
|
||||
import com.wflow.workflow.service.impl.ProcessTaskServiceImpl;
|
||||
import com.wflow.workflow.utils.FlowableUtils;
|
||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||
import com.zhgd.xmgl.modules.baotou.entity.vo.CountFlowVO;
|
||||
import com.zhgd.xmgl.security.util.SecurityUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
@ -171,9 +170,11 @@ public class FlowSeviceUtil {
|
||||
|
||||
List<ProcessProgressVo.ProgressNode> progressNodeList = this.getFutureTask(instance, owner.getOwnerDeptId(), vars, nodeMap, modelHistory.getTenantId());
|
||||
if (CollUtil.isEmpty(progressNodeList)) {
|
||||
throw new OpenAlertException("获取下一个待处理的审批节点超时失败，instanceId=" + instanceId + "，nodeId=" + dfNodeId);
|
||||
log.warn("获取下一个待处理的审批节点超时失败，instanceId=" + instanceId + "，nodeId=" + dfNodeId);
|
||||
return null;
|
||||
} else {
|
||||
return progressNodeList.get(0);
|
||||
}
|
||||
return progressNodeList.get(0);
|
||||
}
|
||||
|
||||
private boolean isProcessDone(String process, String curNodeId, String dfNodeId) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user