bug修复

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<CountRtToolVo> countRtTool(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
+        return Result.success(rtToolService.countRtTool(paramMap));
+    }
+
+
 }

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;
 }

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<RtRiskSecurityLibraryType> rtRiskSecurityLibraryTypeList;
 
 }

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;
+}

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<RtRiskSecuri
     int deleteRecordById(Long id);
 
     void updateRtRiskSecurityLibraryTypeFullName(@Param("oldFullName") String oldFullName, @Param("newFullName") String fullName, @Param("projectSn") String projectSn);
+
+    List<RtRiskSecurityLibraryType> selectAllByRtWorkTicketId(@Param("rtWorkTicketId") Long rtWorkTicketId);
+
 }

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<RtTool> {
 
+    CountRtToolVo countRtTool(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketToRiskSecurityLibraryTypeMapper.java

@@ -17,5 +17,4 @@ import java.util.List;
 public interface RtWorkTicketToRiskSecurityLibraryTypeMapper extends BaseMapper<RtWorkTicketToRiskSecurityLibraryType> {
     List<String> selectTypeIdsStrByRtWorkTicketId(@Param("rtWorkTicketId") Long rtWorkTicketId);
 
-
 }

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};
     </update>
+
+    <select id="selectAllByRtWorkTicketId"
+            resultType="com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType">
+        select
+        rrslt.*
+        from rt_risk_security_library_type rrslt join
+        rt_work_ticket_to_risk_security_library_type rwttrslt on rrslt.id = rwttrslt.rt_risk_security_library_type_id
+        where rwttrslt.rt_work_ticket_id=#{rtWorkTicketId}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtToolMapper.xml

@@ -1,4 +1,11 @@
 <?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.rt.mapper.RtToolMapper">
+    <select id="countRtTool" resultType="com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo">
+        select count(*) count,
+        ifnull(sum(if(tool_status=1 and entry_time>=current_date,1,0)),0) entryCount,
+        ifnull(sum(if(tool_status=2 and exit_time>=current_date,1,0)),0) exitCount
+        from rt_tool
+        where project_sn=#{projectSn}
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml

@@ -10,6 +10,10 @@
         <collection property="rtRiskSecurityLibraryTypeIdList" column="id" ofType="java.lang.String"
                     select="com.zhgd.xmgl.modules.rt.mapper.RtWorkTicketToRiskSecurityLibraryTypeMapper.selectTypeIdsStrByRtWorkTicketId">
         </collection>
+        <collection property="rtRiskSecurityLibraryTypeList" column="id"
+                    ofType="com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType"
+                    select="com.zhgd.xmgl.modules.rt.mapper.RtRiskSecurityLibraryTypeMapper.selectAllByRtWorkTicketId">
+        </collection>
     </resultMap>
     <select id="queryList" resultMap="queryListResultMap">
         select rwt.*,

src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketToRiskSecurityLibraryTypeMapper.xml

@@ -1,6 +1,20 @@
 <?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.rt.mapper.RtWorkTicketToRiskSecurityLibraryTypeMapper">
+    <sql id="Base_Column_List">
+        id,
+        rt_risk_security_library_type_id,
+        rt_work_ticket_id,
+        create_time,
+        update_time
+    </sql>
+    <resultMap id="BaseResultMap" type="com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType">
+        <result column="id" property="id"/>
+        <result column="rt_risk_security_library_type_id" property="rtRiskSecurityLibraryTypeId"/>
+        <result column="rt_work_ticket_id" property="rtWorkTicketId"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
     <select id="selectTypeIdsStrByRtWorkTicketId" resultType="java.lang.String">
         select
         rt_risk_security_library_type_id

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<RtTool> {
     void edit(RtTool rtTool);
 
     void updateRtToolStatus(RtTool rtTool);
+
+    CountRtToolVo countRtTool(HashMap<String, Object> paramMap);
 }

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<RtToolMapper, RtTool> impleme
                 .eq(RtTool::getDevSn, rtTool.getDevSn()));
     }
 
+    @Override
+    public CountRtToolVo countRtTool(HashMap<String, Object> paramMap) {
+        return baseMapper.countRtTool(paramMap);
+    }
+
     private void setExitTimeIf(RtTool rtTool) {
         if (Objects.equals(rtTool.getToolStatus(), 2)) {
             rtTool.setExitTime(new Date());