From 51a0837b26c420099b7a5c6d861515602d29f84a Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 26 Dec 2023 11:45:44 +0800 Subject: [PATCH] =?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 --- .../modules/rt/controller/RtToolController.java | 11 +++++++++++ .../rt/entity/RtDesignChangeContactSheet.java | 2 ++ .../zhgd/xmgl/modules/rt/entity/RtWorkTicket.java | 3 +++ .../xmgl/modules/rt/entity/vo/CountRtToolVo.java | 14 ++++++++++++++ .../rt/mapper/RtRiskSecurityLibraryTypeMapper.java | 4 ++++ .../zhgd/xmgl/modules/rt/mapper/RtToolMapper.java | 4 ++++ ...tWorkTicketToRiskSecurityLibraryTypeMapper.java | 1 - .../mapper/xml/RtRiskSecurityLibraryTypeMapper.xml | 9 +++++++++ .../xmgl/modules/rt/mapper/xml/RtToolMapper.xml | 7 +++++++ .../modules/rt/mapper/xml/RtWorkTicketMapper.xml | 4 ++++ ...RtWorkTicketToRiskSecurityLibraryTypeMapper.xml | 14 ++++++++++++++ .../xmgl/modules/rt/service/IRtToolService.java | 3 +++ .../modules/rt/service/impl/RtToolServiceImpl.java | 6 ++++++ 13 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java index e85c157ef..239b26134 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.rt.entity.RtTool; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import com.zhgd.xmgl.modules.rt.service.IRtToolService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -142,4 +143,14 @@ public class RtToolController { return result; } + @ApiOperation(value = "统计榕图-工器具信息", notes = "统计榕图-工器具信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countRtTool") + public Result countRtTool(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtToolService.countRtTool(paramMap)); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java index 540ab36ad..f333c3e55 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java @@ -121,4 +121,6 @@ public class RtDesignChangeContactSheet implements Serializable { @Excel(name = "项目sn", width = 15) @ApiModelProperty(value = "项目sn") private java.lang.String projectSn; + @ApiModelProperty(value = "联系单编号") + private java.lang.String contactTicketNumber; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java index 06f27fe93..e0e2b94b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtWorkTicket.java @@ -204,5 +204,8 @@ public class RtWorkTicket implements Serializable { @ApiModelProperty(value = "视频配置") @TableField(exist = false) private ProjectVideoConfig projectVideoConfig; + @TableField(exist = false) + @ApiModelProperty(value = "榕图-风险安全库-作业类型、工序及部位List") + private List rtRiskSecurityLibraryTypeList; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java new file mode 100644 index 000000000..953c9aea4 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.rt.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountRtToolVo { + @ApiModelProperty("工器具总数") + private Integer count; + @ApiModelProperty("当日入库量") + private Integer entryCount; + @ApiModelProperty("当日出库量") + private Integer exitCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java index 16d234f91..eb6e2afbb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtRiskSecurityLibraryTypeMapper.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.rt.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -29,4 +30,7 @@ public interface RtRiskSecurityLibraryTypeMapper extends BaseMapper selectAllByRtWorkTicketId(@Param("rtWorkTicketId") Long rtWorkTicketId); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java index b17b23abe..cd41b6fbd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java @@ -1,9 +1,12 @@ package com.zhgd.xmgl.modules.rt.mapper; import com.zhgd.xmgl.modules.rt.entity.RtTool; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; + /** * @Description: 榕图-工器具 * @author： pds @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface RtToolMapper extends BaseMapper { + CountRtToolVo countRtTool(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketToRiskSecurityLibraryTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketToRiskSecurityLibraryTypeMapper.java index 174db7e47..4ef463f90 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketToRiskSecurityLibraryTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketToRiskSecurityLibraryTypeMapper.java @@ -17,5 +17,4 @@ import java.util.List; public interface RtWorkTicketToRiskSecurityLibraryTypeMapper extends BaseMapper { List selectTypeIdsStrByRtWorkTicketId(@Param("rtWorkTicketId") Long rtWorkTicketId); - } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeMapper.xml index 300b7166c..41da6e2b5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeMapper.xml @@ -88,4 +88,13 @@ WHERE full_name LIKE N'${oldFullName}%' and project_sn = #{projectSn}; + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml index 69bc88c15..5a15fef69 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml @@ -1,4 +1,11 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml index 5171bf3ac..4a2f2e429 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml @@ -10,6 +10,10 @@ + + select rt_risk_security_library_type_id diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java index b33d97ba3..bacebcfd1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.service; import com.zhgd.xmgl.modules.rt.entity.RtTool; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import java.util.HashMap; import java.util.List; @@ -24,4 +25,6 @@ public interface IRtToolService extends IService { void edit(RtTool rtTool); void updateRtToolStatus(RtTool rtTool); + + CountRtToolVo countRtTool(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java index fa736c9ac..5ed4cb83b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java @@ -9,6 +9,7 @@ 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.rt.entity.RtTool; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import com.zhgd.xmgl.modules.rt.mapper.RtToolMapper; import com.zhgd.xmgl.modules.rt.service.IRtToolService; import com.zhgd.xmgl.util.PageUtil; @@ -102,6 +103,11 @@ public class RtToolServiceImpl extends ServiceImpl impleme .eq(RtTool::getDevSn, rtTool.getDevSn())); } + @Override + public CountRtToolVo countRtTool(HashMap paramMap) { + return baseMapper.countRtTool(paramMap); + } + private void setExitTimeIf(RtTool rtTool) { if (Objects.equals(rtTool.getToolStatus(), 2)) { rtTool.setExitTime(new Date());