dcs 1 년 전
부모
커밋
6cf945a67c
2개의 변경된 파일22개의 추가작업 그리고 2개의 파일을 삭제
  1. 13 0
      virgo.api/src/main/java/com/bosshand/virgo/api/model/WorkOrder.java
  2. 9 2
      virgo.api/src/main/resources/mapper/WorkOrderMapper.xml

+ 13 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/model/WorkOrder.java

@@ -42,6 +42,11 @@ public class WorkOrder {
      */
     private String projectItemTargetRoomNumber;
 
+    /**
+     * 创建者id
+     */
+    private long userId;
+
     /**
      * 创建时间
      */
@@ -166,6 +171,14 @@ public class WorkOrder {
         this.projectItemTargetRoomNumber = projectItemTargetRoomNumber;
     }
 
+    public long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(long userId) {
+        this.userId = userId;
+    }
+
     public Date getDate() {
         return date;
     }

+ 9 - 2
virgo.api/src/main/resources/mapper/WorkOrderMapper.xml

@@ -10,6 +10,7 @@
         <result column="projectItemId" property="projectItemId"/>
         <result column="projectItemTargetId" property="projectItemTargetId"/>
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
+        <result column="userId" property="userId"/>
         <result column="date" property="date"/>
         <result column="name" property="name"/>
         <result column="type" property="type"/>
@@ -23,9 +24,9 @@
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.WorkOrder" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO work_order(`projectId`, `projectItemId`, `projectItemTargetId`, `projectItemTargetRoomId`, `date`,
+        INSERT INTO work_order(`projectId`, `projectItemId`, `projectItemTargetId`, `projectItemTargetRoomId`, `userId`, `date`,
                                `name`, `type`, `state`, `projectFlowId`, `flowUserList`, `attachment`, `document`, `receiver`, `data`)
-        VALUES (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, now(),
+        VALUES (#{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{userId}, now(),
                 #{name}, #{type}, #{state}, #{projectFlowId}, #{flowUserList}, #{attachment}, #{document}, #{receiver}, #{data})
     </insert>
 
@@ -73,6 +74,9 @@
             <if test="projectItemTargetRoomId!=0">
                 and projectItemTargetRoomId=#{projectItemTargetRoomId}
             </if>
+            <if test="userId!=0">
+                and userId=#{userId}
+            </if>
             <if test="name!=null">
                 and name=#{name}
             </if>
@@ -103,6 +107,9 @@
             <if test="p.projectItemTargetRoomId!=0">
                 and projectItemTargetRoomId=#{p.projectItemTargetRoomId}
             </if>
+            <if test="p.userId!=0">
+                and userId=#{p.userId}
+            </if>
             <if test="p.name!=null">
                 and name=#{p.name}
             </if>