fix

virgo.api/src/main/java/com/bosshand/virgo/api/test/controller/TestCont.java

@@ -210,6 +210,12 @@ public class TestCont {
         return Response.ok(testService.get(data));
     }
 
+    @ApiOperation("电子巡更-打卡详情获取")
+    @RequestMapping(value = "/clockIn/get/{id}", method = RequestMethod.GET)
+    public Response getInfo(@PathVariable long id) {
+        return Response.ok(testService.getInfo(id));
+    }
+
     @ApiOperation("电子巡更-打卡保存")
     @RequestMapping(value = "/clockIn/save", method = RequestMethod.POST)
     public Response save(@RequestBody ClockIn data) {

virgo.api/src/main/java/com/bosshand/virgo/api/test/dao/ClockInDao.java

@@ -18,4 +18,5 @@ public interface ClockInDao {
 
     int getDistinctPointIds(List<Long> pointIds);
 
+    ClockIn getInfo(long id);
 }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/ClockIn.java

@@ -9,14 +9,22 @@ public class ClockIn {
     private long id;
     private long projectId;
     private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
     private String name;
     private long userId;
     private String userName;
     private String content;
+
+    /**
+     * 路径id
+     */
+    private long testGId;
     /**
      * 打卡点
      */
     private long pointId;
+
     @JsonFormat(shape=JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private String date;
 
@@ -44,6 +52,22 @@ public class ClockIn {
         this.projectItemId = projectItemId;
     }
 
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
     public String getName() {
         return name;
     }
@@ -68,14 +92,6 @@ public class ClockIn {
         this.userName = userName;
     }
 
-    public String getDate() {
-        return date;
-    }
-
-    public void setDate(String date) {
-        this.date = date;
-    }
-
     public String getContent() {
         return content;
     }
@@ -84,6 +100,14 @@ public class ClockIn {
         this.content = content;
     }
 
+    public long getTestGId() {
+        return testGId;
+    }
+
+    public void setTestGId(long testGId) {
+        this.testGId = testGId;
+    }
+
     public long getPointId() {
         return pointId;
     }
@@ -91,4 +115,12 @@ public class ClockIn {
     public void setPointId(long pointId) {
         this.pointId = pointId;
     }
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
 }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/ElectronicPatrol.java

@@ -8,6 +8,8 @@ public class ElectronicPatrol {
     private long id;
     private long projectId;
     private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
     private String name;
     private String date;
     private long userId;
@@ -38,6 +40,22 @@ public class ElectronicPatrol {
         this.projectItemId = projectItemId;
     }
 
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
     public String getName() {
         return name;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/model/Routes.java

@@ -10,6 +10,9 @@ public class Routes {
     private long id;
     private String name;
     private long projectId;
+    private long projectItemId;
+    private long projectItemTargetId;
+    private long projectItemTargetRoomId;
     private String bimId;
     private String content;
     private List<RoutesPoint> points;
@@ -38,6 +41,30 @@ public class Routes {
         this.projectId = projectId;
     }
 
+    public long getProjectItemId() {
+        return projectItemId;
+    }
+
+    public void setProjectItemId(long projectItemId) {
+        this.projectItemId = projectItemId;
+    }
+
+    public long getProjectItemTargetId() {
+        return projectItemTargetId;
+    }
+
+    public void setProjectItemTargetId(long projectItemTargetId) {
+        this.projectItemTargetId = projectItemTargetId;
+    }
+
+    public long getProjectItemTargetRoomId() {
+        return projectItemTargetRoomId;
+    }
+
+    public void setProjectItemTargetRoomId(long projectItemTargetRoomId) {
+        this.projectItemTargetRoomId = projectItemTargetRoomId;
+    }
+
     public String getBimId() {
         return bimId;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/test/service/TestService.java

@@ -184,6 +184,10 @@ public class TestService {
         return clockIndao.get(data);
     }
 
+    public ClockIn getInfo(long id) {
+        return clockIndao.getInfo(id);
+    }
+
     public CountF clockInLeak(long projectId) {
         int leak = 0;
         List<Routes> list = routesdao.getProjectId(projectId);

virgo.api/src/main/resources/mapper/ClockInMapper.xml

@@ -4,18 +4,26 @@
 
 <mapper namespace="com.bosshand.virgo.api.test.dao.ClockInDao">
 
-    <resultMap type="com.bosshand.virgo.api.test.model.ClockIn" id="DResult" >
+<resultMap type="com.bosshand.virgo.api.test.model.ClockIn" id="DResult" >
         <id column="id" property="id"/>
         <result column="projectId" property="projectId"/>
         <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="name" property="name"/>
         <result column="userId" property="userId"/>
         <result column="userName" property="userName"/>
         <result column="date" property="date"/>
+        <result column="testGId" property="testGId"/>
         <result column="pointId" property="pointId"/>
         <result column="content" property="content"/>
     </resultMap>
 
+    <select id="getInfo" resultMap="DResult">
+        SELECT * FROM test_d where id = #{id}
+    </select>
+
+
     <select id="get" resultMap="DResult">
         SELECT * FROM test_d
         <where>
@@ -25,6 +33,12 @@
             <if test="projectItemId != 0">
                 and projectItemId = #{projectItemId}
             </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
             <if test="name != null">
                 and name = #{name}
             </if>
@@ -37,6 +51,9 @@
             <if test="date != null">
                 and date = #{date}
             </if>
+            <if test="testGId != 0">
+                and testGId = #{testGId}
+            </if>
             <if test="pointId != 0">
                 and pointId = #{pointId}
             </if>
@@ -93,8 +110,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.test.model.ClockIn" useGeneratedKeys="true" keyProperty="id">
-        INSERT into test_d(projectId, projectItemId, name, userId, userName, date, pointId, content)
-        values (#{projectId}, #{projectItemId}, #{name}, #{userId}, #{userName}, now(), #{pointId}, #{content})
+        INSERT into test_d(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, name, userId, userName, date, testGId, pointId, content)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{name}, #{userId}, #{userName}, now(), #{testGId}, #{pointId}, #{content})
     </insert>
 
 </mapper>

virgo.api/src/main/resources/mapper/ElectronicPatrolMapper.xml

@@ -8,6 +8,8 @@
         <id column="id" property="id"/>
         <result column="projectId" property="projectId"/>
         <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="name" property="name"/>
         <result column="userId" property="userId"/>
         <result column="userName" property="userName"/>
@@ -24,6 +26,12 @@
             <if test="projectItemId != 0">
                 and projectItemId = #{projectItemId}
             </if>
+            <if test="projectItemTargetId != 0">
+                and projectItemTargetId = #{projectItemTargetId}
+            </if>
+            <if test="projectItemTargetRoomId != 0">
+                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+            </if>
             <if test="userId != 0">
                 and userId = #{userId}
             </if>
@@ -44,8 +52,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.test.model.ElectronicPatrol" useGeneratedKeys="true" keyProperty="id">
-        INSERT into test_j(projectId, projectItemId, userId, userName, date, name, content)
-        values (#{projectId}, #{projectItemId}, #{userId}, #{userName}, now(), #{name}, #{content})
+        INSERT into test_j(projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, userId, userName, date, name, content)
+        values (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{userId}, #{userName}, now(), #{name}, #{content})
     </insert>
 
 </mapper>

virgo.api/src/main/resources/mapper/RoutesMapper.xml

@@ -8,6 +8,9 @@
         <id column="id" property="id"/>
         <result column="name" property="name"/>
         <result column="projectId" property="projectId"/>
+        <result column="projectItemId" property="projectItemId"/>
+        <result column="projectItemTargetId" property="projectItemTargetId"/>
+        <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
         <result column="bimId" property="bimId"/>
         <result column="content" property="content"/>
         <collection property="points" ofType="com.bosshand.virgo.api.test.model.RoutesPoint" resultMap="com.bosshand.virgo.api.test.dao.RoutesPointDao.HResult" columnPrefix="t_"/>
@@ -27,6 +30,9 @@
         <include refid="query"/>
         <where>
             <if test="projectId!=0">and g.projectId=#{projectId}</if>
+            <if test="projectItemId!=0">and g.projectItemId=#{projectItemId}</if>
+            <if test="projectItemTargetId!=0">and g.projectItemTargetId=#{projectItemTargetId}</if>
+            <if test="projectItemTargetRoomId!=0">and g.projectItemTargetRoomId=#{projectItemTargetRoomId}</if>
             <if test="bimId!=null">and g.bimId=#{bimId}</if>
             <if test="name!=null">and g.name=#{name}</if>
         </where>
@@ -38,7 +44,8 @@
     </select>
 
     <insert id="save" parameterType="com.bosshand.virgo.api.test.model.Routes" useGeneratedKeys="true" keyProperty="id">
-        INSERT into test_g(name,projectId, bimId, content) values (#{name}, #{projectId}, #{bimId}, #{content})
+        INSERT into test_g(name, projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, bimId, content)
+        values (#{name}, #{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{bimId}, #{content})
     </insert>
 
 </mapper>