From 220b69a0dc544193b15527893034a022a1a6d305 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 30 Apr 2024 10:13:06 +0800 Subject: [PATCH 1/4] =?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 --- ...iAnalyseHardWareAlarmRecordServiceImpl.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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 60dd4337f..b69904dd5 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 @@ -173,21 +173,21 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl dictList = dictionaryItemService.getDictList(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, aiAnalyseHardWareRecord.getProjectSn()); for (DictionaryItem dictionaryItem : dictList) { From fa00ee8cdc7110398959f8e142bf3a0cd77aed77 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 30 Apr 2024 14:16:41 +0800 Subject: [PATCH 2/4] =?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 --- .../service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 b69904dd5..13d6ef847 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 @@ -178,14 +178,14 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl Date: Tue, 30 Apr 2024 16:32:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/mybatis/DataScopeHandler.java | 1 + .../basicdata/mapper/xml/SystemUserMapper.xml | 3 + .../basicdata/service/ISystemUserService.java | 14 +- .../entity/DangerousEngineeringRecord.java | 41 +++--- .../xml/DangerousEngineeringRecordMapper.xml | 13 +- .../modules/video/mapper/VideoItemMapper.java | 2 + .../impl/UserDevAuthorityServiceImpl.java | 2 +- ...gerousEngineeringAcceptanceController.java | 130 +++++++++++++++++ .../XzDangerousEngineeringAcceptance.java | 133 ++++++++++++++++++ ...zDangerousEngineeringAcceptanceMapper.java | 26 ++++ ...XzDangerousEngineeringAcceptanceMapper.xml | 19 +++ ...DangerousEngineeringAcceptanceService.java | 27 ++++ ...erousEngineeringAcceptanceServiceImpl.java | 111 +++++++++++++++ 13 files changed, 496 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDangerousEngineeringAcceptanceController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDangerousEngineeringAcceptanceMapper.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDangerousEngineeringAcceptanceService.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java index a87f0f523..1bc972c5e 100644 --- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java +++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java @@ -100,6 +100,7 @@ public class DataScopeHandler implements DataPermissionHandler { tables.put("xz_material", "enterprise_id"); tables.put("inspect_task_record", "enterprise_id"); tables.put("xz_security_inspect_task_record", "enterprise_id"); + tables.put("xz_security_quality_inspection_record", "enterprise_id"); return tables; } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml index 2879fd0dd..716d5b1f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml @@ -35,6 +35,9 @@ and pe.enterprise_type_id = #{enterpriseTypeId} + + and a.user_id = #{userId} + SELECT a.*,IFNULL(tp.hidden_danger_num,0) hidden_danger_num, - (case when a.build_end_time is not null and a.build_end_time!='' and a.build_end_time <DATE_FORMAT(now(),"%Y-%m-%d") then 3 - when a.build_end_time is not null and a.build_end_time!='' and a.build_start_time is not null and a.build_start_time!='' - and a.build_end_time >=DATE_FORMAT(now(),"%Y-%m-%d") and a.build_start_time <=DATE_FORMAT(now(),"%Y-%m-%d") then 2 - else 1 END) engineering_state + (case when a.build_end_time is not null and a.build_end_time!='' and a.build_end_time <DATE_FORMAT(now(),"%Y-%m-%d") + then 3 + when a.build_end_time is not null and a.build_end_time!='' and a.build_start_time is not null and + a.build_start_time!='' + and a.build_end_time >=DATE_FORMAT(now(),"%Y-%m-%d") and a.build_start_time <=DATE_FORMAT(now(),"%Y-%m-%d") + then 2 + else 1 END) engineering_state, + if(a.final_acceptance_status=1 and now()>=if(LENGTH(a.plan_end_time) = 10, CONCAT(DATE_FORMAT(a.plan_end_time, + '%Y-%m-%d'), ' 23:59:59'), a.plan_end_time),1,0) isOverdue from dangerous_engineering_record a LEFT JOIN (SELECT engineering_id,COUNT(1) hidden_danger_num from hidden_danger_inspection_record diff --git a/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java b/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java index 81644b1a6..bfbc3e053 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/mapper/VideoItemMapper.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.video.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.annotation.DataScope; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.video.entity.VideoItem; import com.zhgd.xmgl.modules.yunlianwanwu.middle.entity.VideoItemConfigBo; @@ -18,6 +19,7 @@ import java.util.Map; * @version： V1.0 */ @Mapper +@DataScope(includeTable = "video_item") public interface VideoItemMapper extends BaseMapper { List selectVideoItemListByVideoId(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UserDevAuthorityServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UserDevAuthorityServiceImpl.java index cad5f39d3..3dceb7e1f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UserDevAuthorityServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UserDevAuthorityServiceImpl.java @@ -116,7 +116,7 @@ public class UserDevAuthorityServiceImpl extends ServiceImpl().eq(UserDevAuthority::getUserId, userId)); + UserDevAuthority userEnterprise = baseMapper.selectOne(new LambdaQueryWrapper().eq(UserDevAuthority::getUserId, userId).eq(UserDevAuthority::getDevType, 2)); String enterpriseId; if (userEnterprise == null || StringUtils.isBlank(userEnterprise.getDevId())) { enterpriseId = "0"; diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDangerousEngineeringAcceptanceController.java b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDangerousEngineeringAcceptanceController.java new file mode 100644 index 000000000..5e59fbfec --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/controller/XzDangerousEngineeringAcceptanceController.java @@ -0,0 +1,130 @@ +package com.zhgd.xmgl.modules.xz.controller; + +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.List; + +import com.zhgd.jeecg.common.api.vo.Result; +import org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance; +import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService; + +import org.simpleframework.xml.core.Validate; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @Title: Controller + * @Description: 星纵-危大验收 + * @author： pds + * @date： 2024-04-30 + * @version： V1.0 + */ +@RestController +@RequestMapping("/xmgl/xzDangerousEngineeringAcceptance") +@Slf4j +@Api(tags = "星纵-危大验收相关Api") +public class XzDangerousEngineeringAcceptanceController { + @Autowired + private IXzDangerousEngineeringAcceptanceService xzDangerousEngineeringAcceptanceService; + + /** + * 分页列表查询 + * + * @return + */ + @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"), + @ApiImplicitParam(name = "applyAcceptanceUserId", value = "申请验收人id", paramType = "query", required = false, dataType = "String"), + @ApiImplicitParam(name = "acceptanceUserId", value = "验收人id", paramType = "query", required = false, dataType = "String"), + }) + @GetMapping(value = "/page") + public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(xzDangerousEngineeringAcceptanceService.queryPageList(paramMap)); + } + + /** + * 列表查询 + * + * @return + */ + @ApiOperation(value = "列表查询星纵-危大验收信息", notes = "列表查询星纵-危大验收信息", httpMethod = "GET") + @GetMapping(value = "/list") + public Result> queryList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(xzDangerousEngineeringAcceptanceService.queryList(paramMap)); + } + + /** + * 添加 + * + * @param xzDangerousEngineeringAcceptance + * @return + */ + @ApiOperation(value = "添加星纵-危大验收信息", notes = "添加星纵-危大验收信息", httpMethod = "POST") + @PostMapping(value = "/add") + public Result add(@RequestBody @Validate XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance) { + xzDangerousEngineeringAcceptanceService.add(xzDangerousEngineeringAcceptance); + return Result.ok(); + } + + /** + * 编辑 + * + * @param xzDangerousEngineeringAcceptance + * @return + */ + @ApiOperation(value = "编辑星纵-危大验收信息", notes = "编辑星纵-危大验收信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance) { + xzDangerousEngineeringAcceptanceService.edit(xzDangerousEngineeringAcceptance); + return Result.ok(); + } + + /** + * 通过id删除 + * + * @return + */ + @ApiOperation(value = "删除星纵-危大验收信息", notes = "删除星纵-危大验收信息", httpMethod = "POST") + @ApiImplicitParam(name = "id", value = "星纵-危大验收ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") + @PostMapping(value = "/delete") + public Result delete(@ApiIgnore @RequestBody HashMap map) { + xzDangerousEngineeringAcceptanceService.delete(MapUtils.getString(map, "id")); + return Result.ok(); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + @ApiOperation(value = "通过id查询星纵-危大验收信息", notes = "通过id查询星纵-危大验收信息", httpMethod = "GET") + @ApiImplicitParam(name = "id", value = "星纵-危大验收ID", paramType = "query", required = true, dataType = "Integer") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + Result result = new Result(); + XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance = xzDangerousEngineeringAcceptanceService.getById(id); + if (xzDangerousEngineeringAcceptance == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(xzDangerousEngineeringAcceptance); + result.setSuccess(true); + } + return result; + } + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java new file mode 100644 index 000000000..e1b00e6b2 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzDangerousEngineeringAcceptance.java @@ -0,0 +1,133 @@ +package com.zhgd.xmgl.modules.xz.entity; + +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 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 javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Description: 星纵-危大验收 + * @author： pds + * @date： 2024-04-30 + * @version： V1.0 + */ +@Data +@TableName("xz_dangerous_engineering_acceptance") +@ApiModel(value = "XzDangerousEngineeringAcceptance实体类", description = "XzDangerousEngineeringAcceptance") +public class XzDangerousEngineeringAcceptance 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") + @NotNull + private java.lang.Long engineeringId; + /** + * 计划执行时间 + */ + @Excel(name = "计划执行时间", width = 20, format = "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 = "计划执行时间") + private java.util.Date planTime; + /** + * 申请验收单位id + */ + @Excel(name = "申请验收单位id", width = 15) + @ApiModelProperty(value = "申请验收单位id") + private java.lang.Long applyAcceptanceUnitId; + /** + * 申请验收人id + */ + @Excel(name = "申请验收人id", width = 15) + @ApiModelProperty(value = "申请验收人id") + private java.lang.Long applyAcceptanceUserId; + /** + * 验收单位id + */ + @Excel(name = "验收单位id", width = 15) + @ApiModelProperty(value = "验收单位id") + @NotNull + private java.lang.Long acceptanceUnitId; + /** + * 验收人id + */ + @Excel(name = "验收人id", width = 15) + @ApiModelProperty(value = "验收人id") + @NotNull + private java.lang.Long acceptanceUserId; + /** + * 验收结果1合格2不合格 + */ + @Excel(name = "验收结果1合格2不合格", width = 15) + @ApiModelProperty(value = "验收结果1合格2不合格") + private java.lang.Integer acceptanceResult; + /** + * 验收描述 + */ + @Excel(name = "验收描述", width = 15) + @ApiModelProperty(value = "验收描述") + private java.lang.String acceptanceDesc; + /** + * 现场图片 + */ + @Excel(name = "现场图片", width = 15) + @ApiModelProperty(value = "现场图片") + private java.lang.String photo; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @Excel(name = "创建时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "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 + */ + @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "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 String engineeringName; + @TableField(exist = false) + @ApiModelProperty(value = "申请验收单位名称（显示用，新增不用传）") + private String applyAcceptanceUnitName; + @TableField(exist = false) + @ApiModelProperty(value = "申请验收人名称（显示用，新增不用传）") + private String applyAcceptanceUserName; + @TableField(exist = false) + @ApiModelProperty(value = "验收单位名称（显示用，新增不用传）") + private String acceptanceUnitName; + @TableField(exist = false) + @ApiModelProperty(value = "验收人名称（显示用，新增不用传）") + private String acceptanceUserName; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDangerousEngineeringAcceptanceMapper.java b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDangerousEngineeringAcceptanceMapper.java new file mode 100644 index 000000000..e31fd24d8 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/XzDangerousEngineeringAcceptanceMapper.java @@ -0,0 +1,26 @@ +package com.zhgd.xmgl.modules.xz.mapper; + +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 com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance; +import org.apache.ibatis.annotations.Mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description: 星纵-危大验收 + * @author： pds + * @date： 2024-04-30 + * @version： V1.0 + */ +@Mapper +public interface XzDangerousEngineeringAcceptanceMapper extends BaseMapper { + + List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml new file mode 100644 index 000000000..c0cafd66e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzDangerousEngineeringAcceptanceMapper.xml @@ -0,0 +1,19 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDangerousEngineeringAcceptanceService.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDangerousEngineeringAcceptanceService.java new file mode 100644 index 000000000..c0e624f86 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/IXzDangerousEngineeringAcceptanceService.java @@ -0,0 +1,27 @@ +package com.zhgd.xmgl.modules.xz.service; + +import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.HashMap; +import java.util.List; + +/** + * @Description: 星纵-危大验收 + * @author： pds + * @date： 2024-04-30 + * @version： V1.0 + */ +public interface IXzDangerousEngineeringAcceptanceService extends IService { + + IPage queryPageList(HashMap paramMap); + + List queryList(HashMap paramMap); + + void add(XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance); + + void edit(XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance); + + void delete(String id); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java new file mode 100644 index 000000000..bb2446342 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzDangerousEngineeringAcceptanceServiceImpl.java @@ -0,0 +1,111 @@ +package com.zhgd.xmgl.modules.xz.service.impl; + +import cn.hutool.core.collection.CollUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.execption.OpenAlertException; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; +import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl; +import com.zhgd.xmgl.modules.dangerous.entity.DangerousEngineeringRecord; +import com.zhgd.xmgl.modules.dangerous.mapper.DangerousEngineeringRecordMapper; +import com.zhgd.xmgl.modules.xz.entity.XzDangerousEngineeringAcceptance; +import com.zhgd.xmgl.modules.xz.mapper.XzDangerousEngineeringAcceptanceMapper; +import com.zhgd.xmgl.modules.xz.service.IXzDangerousEngineeringAcceptanceService; +import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.PageUtil; +import com.zhgd.xmgl.util.RefUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.HashMap; +import java.util.List; +import java.util.Objects; + +/** + * @Description: 星纵-危大验收 + * @author： pds + * @date： 2024-04-30 + * @version： V1.0 + */ +@Service +@Transactional(rollbackFor = Exception.class) +public class XzDangerousEngineeringAcceptanceServiceImpl extends ServiceImpl implements IXzDangerousEngineeringAcceptanceService { + @Autowired + DangerousEngineeringRecordMapper dangerousEngineeringRecordMapper; + @Autowired + private XzDangerousEngineeringAcceptanceMapper xzDangerousEngineeringAcceptanceMapper; + @Autowired + private SystemUserServiceImpl systemUserService; + + @Override + public IPage queryPageList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + Page page = PageUtil.getPage(paramMap); + IPage pageList = baseMapper.queryList(page, queryWrapper); + pageList.setRecords(dealList(pageList.getRecords())); + return pageList; + } + + @Override + public List queryList(HashMap paramMap) { + QueryWrapper queryWrapper = getQueryWrapper(paramMap); + return dealList(baseMapper.queryList(queryWrapper)); + } + + private QueryWrapper getQueryWrapper(HashMap paramMap) { + String alias = "xdea."; + QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(XzDangerousEngineeringAcceptance.class, paramMap, alias); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzDangerousEngineeringAcceptance::getCreateTime)); + return queryWrapper; + } + + private List dealList(List list) { + return list; + } + + @Override + public void add(XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance) { + xzDangerousEngineeringAcceptance.setId(null); + Long userId = SecurityUtils.getUser().getUserId(); + xzDangerousEngineeringAcceptance.setApplyAcceptanceUserId(userId); + HashMap map = new HashMap<>(); + map.put("userId", userId); + List userList = systemUserService.getProjectChilderSystemUserList(map); + if (CollUtil.isNotEmpty(userList)) { + xzDangerousEngineeringAcceptance.setApplyAcceptanceUnitId(userList.get(0).getEnterpriseId()); + } + baseMapper.insert(xzDangerousEngineeringAcceptance); + } + + @Override + public void edit(XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance) { + XzDangerousEngineeringAcceptance oldXzDangerousEngineeringAcceptance = baseMapper.selectById(xzDangerousEngineeringAcceptance.getId()); + if (oldXzDangerousEngineeringAcceptance == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.updateById(xzDangerousEngineeringAcceptance); + + if (Objects.equals(xzDangerousEngineeringAcceptance.getAcceptanceResult(), 1)) { + dangerousEngineeringRecordMapper.update(null, new LambdaUpdateWrapper() + .eq(DangerousEngineeringRecord::getId, oldXzDangerousEngineeringAcceptance.getEngineeringId()) + .set(DangerousEngineeringRecord::getFinalAcceptanceStatus, 2) + ); + } + } + + @Override + public void delete(String id) { + XzDangerousEngineeringAcceptance xzDangerousEngineeringAcceptance = baseMapper.selectById(id); + if (xzDangerousEngineeringAcceptance == null) { + throw new OpenAlertException("未找到对应实体"); + } + baseMapper.deleteById(id); + } + + +} From ab2bb2f621ff459245aafb2a93cd21bf18137b23 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Tue, 30 Apr 2024 18:19:08 +0800 Subject: [PATCH 4/4] =?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 --- .../xz/controller/XzMaterialController.java | 23 ++++++++++++++++--- .../xmgl/modules/xz/entity/XzMaterial.java | 9 ++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) 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 67253ac1a..cc238a5ad 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 @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.xz.controller; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -163,10 +164,26 @@ public class XzMaterialController { @PostMapping(value = "/save") public Result save(@RequestBody JSONObject obj) { log.info("添加材料信息" + JSON.toJSONString(obj)); + List enterpriseIds = (List) obj.get("enterpriseId"); XzMaterial xzMaterial = new XzMaterial(); String [] param = {"name", "model", "specifications", "unit", "num", "remark"}; List list = new ArrayList<>(); - xzMaterial.setName(obj.getString("name")); + XzMaterial exist = xzMaterialService.getOne(Wrappers.lambdaQuery() + .like(XzMaterial::getName, DateUtil.today()) + .orderByDesc(XzMaterial::getCreateTime).last("limit 1")); + if (exist == null) { + xzMaterial.setName(DateUtil.today() + "/01批次"); + xzMaterial.setNum(1); + } else { + Integer index = exist.getNum(); + index = index + 1; + if (index < 10) { + xzMaterial.setName(DateUtil.today() + "/第0" + index + "批次"); + } else { + xzMaterial.setName(DateUtil.today() + "/第" + index + "批次"); + } + xzMaterial.setNum(index); + } xzMaterial.setEntryTime(obj.getDate("entryTime")); JSONArray detail = obj.getJSONArray("detail"); if (detail != null) { @@ -183,11 +200,11 @@ public class XzMaterialController { } } xzMaterial.setProjectSn(obj.getString("projectSn")); - List enterpriseIds = (List) obj.get("enterpriseId"); - if (enterpriseIds != null && enterpriseIds.size() >0) { + if (enterpriseIds != null && enterpriseIds.size() > 0) { xzMaterial.setEnterpriseId(enterpriseIds.get(0)); } xzMaterial.setXzMaterialList(list); + xzMaterial.setCreateTime(new Date()); xzMaterialService.saveInfo(xzMaterial); return Result.success("添加成功！"); } diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java index 489c3ecdb..d5a820c34 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/entity/XzMaterial.java @@ -39,6 +39,12 @@ public class XzMaterial implements Serializable { @Excel(name = "批次名称", width = 15) @ApiModelProperty(value = "批次名称") private String name; + /** + * 批次数量 + */ + @Excel(name = "批次数量", width = 15) + @ApiModelProperty(value = "批次数量") + private Integer num; /** * 入场时间 */ @@ -58,6 +64,9 @@ public class XzMaterial implements Serializable { @ApiModelProperty(value = "企业id") private String enterpriseId; + @ApiModelProperty(value = "创建时间") + private Date createTime; + @TableField(exist = false) @ApiModelProperty(value = "企业名称") private String enterpriseName;