fix

virgo.manager/src/main/java/com/bosshand/virgo/controller/InfoController.java

@@ -1,8 +1,9 @@
-package com.bosshand.virgo.controller;
+package com.bosshand.virgo.api.controller;
 
-import com.bosshand.virgo.core.model.UserInfo;
+import com.bosshand.virgo.api.model.UserInfo;
+import com.bosshand.virgo.api.service.ProjectItemTargetRoomService;
+import com.bosshand.virgo.api.service.UserInfoService;
 import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.service.UserInfoService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,6 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("info")
 public class InfoController {
 
+    @Autowired
+    ProjectItemTargetRoomService projectItemTargetRoomService;
+
     @Autowired
     UserInfoService userInfoService;
 
@@ -34,7 +38,14 @@ public class InfoController {
     @ApiOperation(value = "获取", notes = "获取")
     @RequestMapping(value = "/get", method = RequestMethod.POST)
     public Response get(@RequestBody UserInfo userInfo) {
-        return Response.ok(userInfoService.get(userInfo));
+        UserInfo info = userInfoService.get(userInfo);
+        if (info != null) {
+            info.setProjectName(info.getProjectId() != 0 ? projectItemTargetRoomService.getProject(info.getProjectId()).getName() : null);
+            info.setProjectItemName(info.getProjectItemId() != 0 ? projectItemTargetRoomService.getProjectItem(info.getProjectItemId()).getName() : null);
+            info.setProjectItemTargetName(info.getProjectItemTargetId() != 0 ? projectItemTargetRoomService.getProjectItemTarget(info.getProjectItemTargetId()).getName() : null);
+            info.setProjectItemTargetRoomName(info.getProjectItemTargetRoomId() != 0 ? projectItemTargetRoomService.getProjectItemTargetRoom(info.getProjectItemTargetRoomId()).getName() : null);
+        }
+        return Response.ok(info);
     }
 
 }

virgo.core/src/main/java/com/bosshand/virgo/core/dao/UserInfoDao.java

@@ -1,6 +1,6 @@
-package com.bosshand.virgo.core.dao;
+package com.bosshand.virgo.api.dao;
 
-import com.bosshand.virgo.core.model.UserInfo;
+import com.bosshand.virgo.api.model.UserInfo;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

virgo.core/src/main/java/com/bosshand/virgo/core/model/UserInfo.java

@@ -1,4 +1,4 @@
-package com.bosshand.virgo.core.model;
+package com.bosshand.virgo.api.model;
 
 public class UserInfo {
 

virgo.manager/src/main/java/com/bosshand/virgo/service/UserInfoService.java

@@ -1,7 +1,8 @@
-package com.bosshand.virgo.service;
+package com.bosshand.virgo.api.service;
 
-import com.bosshand.virgo.core.dao.UserInfoDao;
-import com.bosshand.virgo.core.model.UserInfo;
+
+import com.bosshand.virgo.api.dao.UserInfoDao;
+import com.bosshand.virgo.api.model.UserInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

virgo.core/src/main/resources/mapper/UserInfoMapper.xml

@@ -2,20 +2,16 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.bosshand.virgo.core.dao.UserInfoDao">
+<mapper namespace="com.bosshand.virgo.api.dao.UserInfoDao">
 
-    <resultMap type="com.bosshand.virgo.core.model.UserInfo" id="result" >
+    <resultMap type="com.bosshand.virgo.api.model.UserInfo" id="result" >
         <id column="id" property="id"/>
         <result column="organizationId" property="organizationId"/>
         <result column="organizationName" property="organizationName"/>
         <result column="projectId" property="projectId"/>
-        <result column="projectName" property="projectName"/>
         <result column="projectItemId" property="projectItemId"/>
-        <result column="projectItemName" property="projectItemName"/>
         <result column="projectItemTargetId" property="projectItemTargetId"/>
-        <result column="projectItemTargetName" property="projectItemTargetName"/>
         <result column="projectItemTargetRoomId" property="projectItemTargetRoomId"/>
-        <result column="projectItemTargetRoomName" property="projectItemTargetRoomName"/>
         <result column="entryDate" property="entryDate"/>
         <result column="userId" property="userId"/>
         <result column="state" property="state"/>
@@ -26,49 +22,42 @@
     </resultMap>
 
     <select id="get" resultMap="result">
-        select * from mgr_user_info
+        select a.*, b.name as organizationName from mgr_user_info a left join mgr_organization b on b.id = a.organizationId
         <where>
             <if test="organizationId != 0">
-                and organizationId = #{organizationId}
+                and a.organizationId = #{organizationId}
             </if>
             <if test="projectId != 0">
-                and projectId = #{projectId}
+                and a.projectId = #{projectId}
             </if>
             <if test="projectItemId != 0">
-                and projectItemId = #{projectItemId}
+                and a.projectItemId = #{projectItemId}
             </if>
             <if test="projectItemTargetId != 0">
-                and projectItemTargetId = #{projectItemTargetId}
+                and a.projectItemTargetId = #{projectItemTargetId}
             </if>
             <if test="projectItemTargetRoomId != 0">
-                and projectItemTargetRoomId = #{projectItemTargetRoomId}
+                and a.projectItemTargetRoomId = #{projectItemTargetRoomId}
             </if>
             <if test="userId != 0">
-                and userId = #{userId}
+                and a.userId = #{userId}
             </if>
         </where>
     </select>
 
-    <insert id="save" parameterType="com.bosshand.virgo.core.model.UserInfo" useGeneratedKeys="true" keyProperty="id">
-        INSERT into mgr_user_info(organizationId, organizationName, projectId, projectName, projectItemId, projectItemName, projectItemTargetId, projectItemTargetName,
-                                  projectItemTargetRoomId, projectItemTargetRoomName, entryDate, userId, state, employeePosition, position, workBusiness, data)
-        values(#{organizationId}, #{organizationName}, #{projectId}, #{projectName}, #{projectItemId},#{projectItemName}, #{projectItemTargetId}, #{projectItemTargetName},
-               #{projectItemTargetRoomId},#{projectItemTargetRoomName}, #{entryDate}, #{userId}, #{state}, #{employeePosition}, #{position}, #{workBusiness}, #{data})
+    <insert id="save" parameterType="com.bosshand.virgo.api.model.UserInfo" useGeneratedKeys="true" keyProperty="id">
+        INSERT into mgr_user_info(organizationId, projectId,  projectItemId, projectItemTargetId,projectItemTargetRoomId, entryDate, userId, state, employeePosition, position, workBusiness, data)
+        values(#{organizationId}, #{projectId},  #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{entryDate}, #{userId}, #{state}, #{employeePosition}, #{position}, #{workBusiness}, #{data})
     </insert>
 
-    <update id="update" parameterType="com.bosshand.virgo.core.model.UserInfo">
+    <update id="update" parameterType="com.bosshand.virgo.api.model.UserInfo">
         UPDATE mgr_user_info
         <trim prefix="set" suffixOverrides=",">
             <if test="organizationId!=0">organizationId=#{organizationId},</if>
-            <if test="organizationName!=null">organizationName=#{organizationName},</if>
             <if test="projectId!=0">projectId=#{projectId},</if>
-            <if test="projectName!=null">projectName=#{projectName},</if>
             <if test="projectItemId!=0">projectItemId=#{projectItemId},</if>
-            <if test="projectItemName!=null">projectItemName=#{projectItemName},</if>
             <if test="projectItemTargetId!=0">projectItemTargetId=#{projectItemTargetId},</if>
-            <if test="projectItemTargetName!=null">projectItemTargetName=#{projectItemTargetName},</if>
             <if test="projectItemTargetRoomId!=0">projectItemTargetRoomId=#{projectItemTargetRoomId},</if>
-            <if test="projectItemTargetRoomName!=null">projectItemTargetRoomName=#{projectItemTargetRoomName},</if>
             <if test="entryDate!=null">entryDate=#{entryDate},</if>
             <if test="userId!=0">userId=#{userId},</if>
             <if test="state!=0">state=#{state},</if>