fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/OperateFlowDataController.java

@@ -29,14 +29,18 @@ public class OperateFlowDataController {
     public Response get(@PathVariable long id) {
         OperateFlowData operateFlowData = operateFlowDataService.get(id);
         if (operateFlowData != null) {
-            operateFlowData.setProjectName(operateFlowData.getProjectId() != 0 ? projectItemTargetRoomService.getProject(operateFlowData.getProjectId()).getName() : null);
-            operateFlowData.setProjectItemName(operateFlowData.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(operateFlowData.getProjectItemId()).getName() : null);
-            operateFlowData.setProjectItemTargetName(operateFlowData.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(operateFlowData.getProjectItemTargetId()).getName() : null);
-            operateFlowData.setProjectItemTargetRoomName(operateFlowData.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(operateFlowData.getProjectItemTargetRoomId()).getName() : null);
+            setName(operateFlowData);
         }
         return Response.ok(operateFlowData);
     }
 
+    private void setName(OperateFlowData operateFlowData) {
+        operateFlowData.setProjectName(operateFlowData.getProjectId() != 0 ? projectItemTargetRoomService.getProject(operateFlowData.getProjectId()).getName() : null);
+        operateFlowData.setProjectItemName(operateFlowData.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(operateFlowData.getProjectItemId()).getName() : null);
+        operateFlowData.setProjectItemTargetName(operateFlowData.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(operateFlowData.getProjectItemTargetId()).getName() : null);
+        operateFlowData.setProjectItemTargetRoomName(operateFlowData.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(operateFlowData.getProjectItemTargetRoomId()).getName() : null);
+    }
+
     @ApiOperation(value = "查询", notes = "查询")
     @RequestMapping(value = "/query/{projectId}/{startDate}/{endDate}", method = RequestMethod.POST)
     public String census(@PathVariable long projectId, @PathVariable String startDate, @PathVariable String endDate){
@@ -49,10 +53,7 @@ public class OperateFlowDataController {
         List<OperateFlowData> list = operateFlowDataService.getListLimit(operateFlowData, currPage, pageSize);
         if (list.size() > 0) {
             for (OperateFlowData of : list) {
-                of.setProjectName(of.getProjectId() != 0 ? projectItemTargetRoomService.getProject(of.getProjectId()).getName() : null);
-                of.setProjectItemName(of.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(of.getProjectItemId()).getName() : null);
-                of.setProjectItemTargetName(of.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(of.getProjectItemTargetId()).getName() : null);
-                of.setProjectItemTargetRoomName(of.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(of.getProjectItemTargetRoomId()).getName() : null);
+                setName(of);
             }
         }
         int totalCount = operateFlowDataService.count(operateFlowData);
@@ -65,6 +66,7 @@ public class OperateFlowDataController {
     @ApiOperation(value = "新增", notes = "新增")
     @RequestMapping(value = "", method = RequestMethod.POST)
     public Response save(@RequestBody OperateFlowData operateFlowData) {
+        
         operateFlowDataService.save(operateFlowData);
         return Response.ok();
     }

virgo.api/src/main/java/com/bosshand/virgo/api/operate/model/OperateFlowData.java

@@ -11,12 +11,6 @@ public class OperateFlowData {
 
     private long id;
 
-    private long userId;
-
-    private String userName;
-
-    private String userPortrait;
-
     private long projectId;
 
     private String projectName;
@@ -50,6 +44,8 @@ public class OperateFlowData {
 
     private String createdByUserName;
 
+    private String createdByUserPortrait;;
+
     private String document;
 
     private String receiver;
@@ -68,30 +64,6 @@ public class OperateFlowData {
         this.id = id;
     }
 
-    public long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(long userId) {
-        this.userId = userId;
-    }
-
-    public String getUserName() {
-        return userName;
-    }
-
-    public void setUserName(String userName) {
-        this.userName = userName;
-    }
-
-    public String getUserPortrait() {
-        return userPortrait;
-    }
-
-    public void setUserPortrait(String userPortrait) {
-        this.userPortrait = userPortrait;
-    }
-
     public long getProjectId() {
         return projectId;
     }
@@ -220,6 +192,14 @@ public class OperateFlowData {
         this.createdByUserName = createdByUserName;
     }
 
+    public String getCreatedByUserPortrait() {
+        return createdByUserPortrait;
+    }
+
+    public void setCreatedByUserPortrait(String createdByUserPortrait) {
+        this.createdByUserPortrait = createdByUserPortrait;
+    }
+
     public String getDocument() {
         return document;
     }

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

@@ -6,14 +6,13 @@
 
     <resultMap type="com.bosshand.virgo.api.operate.model.OperateFlowData" id="operateFlowDataResult">
         <id column="id" property="id" />
-        <result column="userId" property="userId" />
-        <result column="userName" property="userName" />
-        <result column="userPortrait" property="userPortrait" />
         <result column="projectId" property="projectId" />
         <result column="projectItemId" property="projectItemId" />
         <result column="projectItemTargetId" property="projectItemTargetId" />
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId" />
         <result column="createdByUserId" property="createdByUserId" />
+        <result column="createdByUserName" property="createdByUserName" />
+        <result column="createdByUserPortrait" property="createdByUserPortrait" />
         <result column="deviceId" property="deviceId" />
         <result column="date" property="date" />
         <result column="projectFlowId" property="projectFlowId" />
@@ -28,7 +27,7 @@
     </resultMap>
 
     <sql id="query">
-        SELECT a.*, b.name as userName, b.portrait as userPortrait FROM operate_flow_data a left join mgr_user b on a.userId = b.id
+        SELECT a.*, b.name as createdByUserName, b.portrait as createdByUserPortrait FROM operate_flow_data a left join mgr_user b on a.createdByUserId = b.id
     </sql>
 
     <select id="get" resultMap="operateFlowDataResult">
@@ -123,11 +122,11 @@
 
     <insert id="save" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO operate_flow_data(
-            userId,projectId, projectItemId,
+            projectId, projectItemId,
             projectItemTargetId, projectItemTargetRoomId,
             deviceId, date, projectFlowId, flowUserList, state, flowData, createdByUserId, document, receiver, attachment, flowType, type)
         VALUES
-            (#{userId}, #{projectId}, #{projectItemId},
+            (#{projectId}, #{projectItemId},
              #{projectItemTargetId}, #{projectItemTargetRoomId},
              #{deviceId}, now(), #{projectFlowId}, #{flowUserList}, #{state}, #{flowData}, #{createdByUserId}, #{document}, #{receiver}, #{attachment}, #{flowType}, #{type})
     </insert>
@@ -139,7 +138,6 @@
     <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateFlowData">
         UPDATE operate_flow_data
         <trim prefix="set" suffixOverrides=",">
-            <if test="userId!=0">userId=#{userId},</if>
             <if test="projectId!=0">projectId=#{projectId},</if>
             <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
             <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>