From b250bc5892939d11a0af3342312f130bf7951770 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 26 Apr 2024 22:27:27 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...AnalyseHardWareAlarmRecordServiceImpl.java | 4 +-- .../worker/entity/WorkerInfoAuditRecord.java | 3 ++ .../mapper/WorkerInfoAuditRecordMapper.java | 2 ++ .../xml/WorkerInfoAuditRecordMapper.xml | 28 +++++++++++++++++++ .../IWorkerInfoAuditRecordService.java | 3 ++ .../WorkerInfoAuditRecordServiceImpl.java | 9 ++++++ .../xz/controller/XzMaterialController.java | 6 +++- .../XzWorkerInfoAuditRecordController.java | 22 +++++++++++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 3 +- 9 files changed, 76 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 521325ffc..c595f7fa9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -181,14 +181,14 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl { List selectWorkerInfoAuditList(Page page, @Param("param")Map map); + + EntityMap viewWorkerInfoDetail(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml index 540a794d3..7fdf907f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml @@ -44,4 +44,32 @@ order by a.id desc + + diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java index 1c19f82a6..23aaec529 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerInfoAuditRecordService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.worker.entity.WorkerInfoAuditRecord; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -27,4 +28,6 @@ public interface IWorkerInfoAuditRecordService extends IService map); void rejectWorkerInfo(Map map); + + Map viewWorkerInfoDetail(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java index a77f93b02..96fbf33d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoAuditRecordServiceImpl.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -112,4 +113,12 @@ public class WorkerInfoAuditRecordServiceImpl extends ServiceImpl viewWorkerInfoDetail(Map map) { + Map data = new HashMap<>(); + EntityMap info = workerInfoAuditRecordMapper.viewWorkerInfoDetail(map); + data.put("workerInfo", info); + return data; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java index 31b6c9e44..2b8fec1fc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzMaterialController.java @@ -120,7 +120,7 @@ public class XzMaterialController { public Result save(@RequestBody String map) { JSONObject obj = JSONObject.parseObject(map); XzMaterial xzMaterial = new XzMaterial(); - String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; + String [] param = {"name", "specifications", "num", "remark", "model", "unit"}; List list = new ArrayList<>(); xzMaterial.setName(obj.getString("name")); xzMaterial.setEntryTime(obj.getDate("entryTime")); @@ -137,6 +137,10 @@ public class XzMaterialController { list.add(JSONObject.parseObject(JSON.toJSONString(detailObj), XzMaterialDetail.class)); } xzMaterial.setProjectSn(obj.getString("projectSn")); + List enterpriseIds = (List) obj.get("enterpriseId"); + if (enterpriseIds != null && enterpriseIds.size() >0) { + xzMaterial.setEnterpriseId(enterpriseIds.get(0)); + } xzMaterial.setXzMaterialList(list); xzMaterialService.saveInfo(xzMaterial); return Result.success("添加成功！"); diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java index f6fb7d08a..a007e0473 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzWorkerInfoAuditRecordController.java @@ -129,6 +129,19 @@ public class XzWorkerInfoAuditRecordController { return Result.success(workerSafeEducationWorker); } + /** + * 编辑 + * @param workerInfoAuditRecord + * @return + */ + @OperLog(operModul = "劳务管理",operType = "编辑劳务人员-审核",operDesc = "编辑劳务人员-审核表信息") + @ApiOperation(value = "编辑劳务人员-审核表信息", notes = "编辑劳务人员-审核表信息" , httpMethod="POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody WorkerInfoAuditRecord workerInfoAuditRecord) { + workerInfoAuditRecordService.editWorkerInfoAuditRecord(workerInfoAuditRecord); + return Result.ok(); + } + /** * 通过id删除 * @@ -222,4 +235,13 @@ public class XzWorkerInfoAuditRecordController { return Result.ok(); } + @ApiOperation(value = "查询某个人员所有相关数据", notes = "查询某个人员所有相关数据") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "人员ID", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping("/viewWorkerInfoDetail") + public Result> viewWorkerInfoDetail(@RequestBody Map map) { + return Result.success(workerInfoAuditRecordService.viewWorkerInfoDetail(map)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index d23a826fb..250a2fc8d 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -369,9 +369,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/xzWorkerInfoAuditRecord/adoptWorkerInfo").permitAll() .antMatchers("/xmgl/xzWorkerInfoAuditRecord/queryByCard").permitAll() .antMatchers("/xmgl/xzWorkerInfoAuditRecord/submit").permitAll() - .antMatchers("/xz/xzMaterial/save").permitAll() + .antMatchers("/xmgl/xzMaterial/save").permitAll() .antMatchers("/xmgl/dangerousEngineeringRecord/save").permitAll() .antMatchers("/xmgl/carInfo/save").permitAll() + .antMatchers("/xmgl/xzElectrical/**").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()