diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConstructionEquipmentToolController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConstructionEquipmentToolController.java index 00e1e0e16..d821b4c9b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConstructionEquipmentToolController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/ConstructionEquipmentToolController.java @@ -186,7 +186,7 @@ public class ConstructionEquipmentToolController { for (ConstructionEquipmentTool tool : list) { minioUtils.downloadFile(tool.getQrCode()); Image qrCodeImg = ImgUtil.read(PathUtil.getBasePath() + "/" + tool.getQrCode()); - Font font = new Font("宋体", Font.PLAIN, 55); + Font font = new Font("微软雅黑", Font.PLAIN, 55); final BufferedImage destImage = ImgUtil.read(new ClassPathResource("template/施工设备机具打印图片模板.jpg").getInputStream()); final Graphics2D gf = destImage.createGraphics(); // 抗锯齿 diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/EngineerControllerCheck.java b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/EngineerControllerCheck.java index 7a66113d2..72a583c93 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/entity/EngineerControllerCheck.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/entity/EngineerControllerCheck.java @@ -109,26 +109,33 @@ public class EngineerControllerCheck implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value="质量监督机构签收日期") private java.util.Date qualitySupervisionAgencyReceiptDate ; - /**创建时间 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 ; - + /** + * 创建时间 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; + @ApiModelProperty(value = "建设监理意见") + private java.lang.String constructionSupervisorOpinion; + @ApiModelProperty(value = "区域项目组意见") + private java.lang.String regionalProjectTeamOpinion; @TableField(exist = false) - @ApiModelProperty(value="装置/单元工程名称") - private java.lang.String deviceUnitProjectName ; + @ApiModelProperty(value = "装置/单元工程名称") + private java.lang.String deviceUnitProjectName; @TableField(exist = false) - @ApiModelProperty(value="EPC承包商名称") - private java.lang.String epcContractorName ; + @ApiModelProperty(value = "EPC承包商名称") + private java.lang.String epcContractorName; @TableField(exist = false) - @ApiModelProperty(value="施工单位名称") - private java.lang.String constructionUnitName ; + @ApiModelProperty(value = "施工单位名称") + private java.lang.String constructionUnitName; @TableField(exist = false) @ApiModelProperty(value="涉及技术专业名称") private java.lang.String technicalExpertiseInvolvedName ; diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/WorkerAdmissionDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/WorkerAdmissionDetailMapper.xml index 779fd3a66..cf8854ff8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/WorkerAdmissionDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/mapper/xml/WorkerAdmissionDetailMapper.xml @@ -32,7 +32,6 @@ left join enterprise_info ei1 on ei1.id=t.epc_cbs left join enterprise_info ei2 on ei2.id=t.enterprise_id left join device_unit du1 on du1.id=t.work_area - left join worker_info wi on wi.id_card=t.id_card and t.project_sn=wi.project_sn diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java index 229636313..622782d9f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseModuleController.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.basicdata.controller; +import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -13,7 +16,6 @@ import com.zhgd.xmgl.modules.basicdata.mapper.BaseModuleMapper; import com.zhgd.xmgl.modules.basicdata.service.IBaseAuthorityService; import com.zhgd.xmgl.modules.basicdata.service.IBaseModuleService; import com.zhgd.xmgl.security.util.SecurityUtils; -import com.zhgd.xmgl.util.JoBuilder; import com.zhgd.xmgl.util.MessageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -234,6 +236,59 @@ public class BaseModuleController { return Result.success(baseModuleService.getModuleAndMenuList(paramMap)); } +// @ApiOperation(value = "查询配置的模块和菜单列表", notes = "查询配置的模块和菜单列表", httpMethod = "POST") +// @ApiImplicitParams({ +// @ApiImplicitParam(name = "userId", value = "用户id", paramType = "body", required = true, dataType = "String"), +// @ApiImplicitParam(name = "moduleType", value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板", paramType = "body", required = true, dataType = "String"), +// @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), +// @ApiImplicitParam(name = "isApp", required = false, value = "1是app登录", paramType = "body"), +// }) +// @PostMapping(value = "/getModuleAndMenuList") +// public Result> getModuleAndMenuList(@ApiIgnore @RequestBody HashMap paramMap) { +// Map moduleAndMenuList = baseModuleService.getModuleAndMenuList(paramMap); +// JSONArray modules = JSON.parseArray(JSON.toJSONString(moduleAndMenuList.get("moduleList"))); +// for (int i = 0; i < modules.size(); i++) { +// StringBuilder sb = new StringBuilder(); +// JSONObject moduleJo = modules.getJSONObject(i); +// sb.append(moduleJo.getString("moduleName")); +//// System.out.println(sb.toString()); +// JSONArray menus = (JSONArray) moduleJo.getJSONArray("menuList"); +// for (int j = 0; j < menus.size(); j++) { +// JSONObject menu = menus.getJSONObject(j); +// StringBuilder sb1 = new StringBuilder(sb.toString()); +// sb1.append("=-="+menu.getString("menuName")); +//// System.out.println(sb1.toString()); +// printMneu(menu,sb1); +// } +// } +// return Result.success(moduleAndMenuList); +// } +// +// private void printMneu(JSONObject menu, StringBuilder sb1) { +// JSONArray menuList = menu.getJSONArray("menuList"); +// if (CollUtil.isNotEmpty(menuList)) { +// for (int i = 0; i < menuList.size(); i++) { +// StringBuilder sb2 = new StringBuilder(sb1.toString()); +// JSONObject menu1 = menuList.getJSONObject(i); +// sb2.append("=-="+menu1.getString("menuName")); +//// System.out.println(sb2.toString()); +// printMneu(menu1, sb2); +// } +// } else { +// JSONArray actionList = menu.getJSONArray("actionList"); +// if (CollUtil.isNotEmpty(actionList)) { +// for (int j = 0; j < actionList.size(); j++) { +// StringBuilder sb2 = new StringBuilder(sb1.toString()); +// sb2.append("=-=>"+actionList.getJSONObject(j).getString("name")); +// System.out.println(sb2.toString()); +// } +// } else { +// System.out.println(sb1.toString()); +// } +// +// } +// } + @ApiOperation(value = "app查询项目账号的模块和菜单列表", notes = "app查询项目账号的模块和菜单列表", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "moduleType", value = "模块类型，1企业模块，2项目后台模块，3企业后台，4项目看板", paramType = "body", required = true, dataType = "String"), diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java index 13a601117..367898f5d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/controller/DangerousEngineeringRecordController.java @@ -144,7 +144,7 @@ public class DangerousEngineeringRecordController { dangerousEngineeringRecord.setEngineeringName(MapUtils.getString(map, "engineeringName")); dangerousEngineeringRecord.setProjectSn(MapUtils.getString(map, "projectSn")); dangerousEngineeringRecord.setEngineeringSurvey(MapUtils.getString(map, "engineeringSurvey")); - dangerousEngineeringRecord.setPersonLiableId(systemUser.getUserId()); +// dangerousEngineeringRecord.setPersonLiableId(systemUser.getUserId()); dangerousEngineeringRecord.setEngineeringTypeId(engineeringType.getId()); dangerousEngineeringRecord.setEngineeringTypeName(engineeringType.getTypeName()); // dangerousEngineeringRecord.setBuildStartTime(buildTime.get(0)); diff --git a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java index 3c15702cb..8fab90c54 100644 --- a/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java +++ b/src/main/java/com/zhgd/xmgl/modules/dangerous/entity/DangerousEngineeringRecord.java @@ -129,6 +129,7 @@ public class DangerousEngineeringRecord implements Serializable { @ApiModelProperty(value = "方案交底附件") private java.lang.String specialConstructionSchemeFile; @ApiModelProperty(value = "责任人id") + @Deprecated private java.lang.Long personLiableId; @ApiModelProperty(value = "已结束？1是，0否") private java.lang.Integer isEnd; diff --git a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java index e382ccc6e..2bf665069 100644 --- a/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/exam/service/impl/ExamTrainRecordServiceImpl.java @@ -350,7 +350,7 @@ public class ExamTrainRecordServiceImpl extends ServiceImpl()