fix

virgo.api/src/main/java/com/bosshand/virgo/api/model/ProjectItemTargetRoom.java

@@ -66,15 +66,25 @@ public class ProjectItemTargetRoom {
     private long chargePersonId;
 
     /**
-     * 负责人名称
+     * DTO-负责人名称
      */
     private String chargePersonName;
 
     /**
-     * 负责人头像
+     * DTO-负责人头像
      */
     private String chargePersonPortrait;
 
+    /**
+     * DTO-负责人手机号
+     */
+    private String chargePersonPhone;
+
+    /**
+     * DTO-当前项目组织名
+     */
+    private String organizationName;
+
     /**
      * 名称
      */
@@ -319,6 +329,22 @@ public class ProjectItemTargetRoom {
         this.chargePersonPortrait = chargePersonPortrait;
     }
 
+    public String getChargePersonPhone() {
+        return chargePersonPhone;
+    }
+
+    public void setChargePersonPhone(String chargePersonPhone) {
+        this.chargePersonPhone = chargePersonPhone;
+    }
+
+    public String getOrganizationName() {
+        return organizationName;
+    }
+
+    public void setOrganizationName(String organizationName) {
+        this.organizationName = organizationName;
+    }
+
     public String getName() {
         return name;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/service/ProjectItemTargetRoomService.java

@@ -88,6 +88,7 @@ public class ProjectItemTargetRoomService {
 
     private void setDtoName(ProjectItemTargetRoom room) {
         Project project = this.getProject(room.getProjectId());
+        room.setOrganizationName(project.getOrganizationName());
         room.setProjectName(project.getName());
         room.setCoordinates(project.getCoordinates());
         room.setSupportingFacilities(project.getSupportingFacilities());

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

@@ -14,6 +14,7 @@
         <result column="chargePersonName" property="chargePersonName"/>
         <result column="chargePersonName" property="chargePersonName"/>
         <result column="chargePersonPortrait" property="chargePersonPortrait"/>
+        <result column="chargePersonPhone" property="chargePersonPhone"/>
         <result column="name" property="name"/>
         <result column="roomTypeId" property="roomTypeId"/>
         <result column="roomNumber" property="roomNumber"/>
@@ -36,7 +37,7 @@
     </resultMap>
 
     <sql id="ProjectItemTargetRoomQuery">
-        SELECT a.*, b.name as chargePersonName, b.portrait as chargePersonPortrait FROM project_item_target_room a LEFT JOIN mgr_user b ON a.chargePersonId = b.id
+        SELECT a.*, b.name as chargePersonName, b.portrait as chargePersonPortrait, b.phone as chargePersonPhone FROM project_item_target_room a LEFT JOIN mgr_user b ON a.chargePersonId = b.id
     </sql>
 
     <select id="get" resultMap="projectItemTargetRoomResult">

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

@@ -68,7 +68,7 @@
 	</select>
 
 	<select id="getProject" resultMap="result">
-		SELECT * FROM project WHERE id=#{id}
+		SELECT a.*, b.name as organizationName FROM project a LEFT JOIN mgr_organization b ON a.organizationId = b.id WHERE a.id=#{id}
 	</select>
 
 	<select id="getAll" resultMap="result">

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

@@ -10,7 +10,7 @@
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.RoomCollection" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO room_collection(`projectItemTargetRoomId`, `userId`, `date`) VALUES (#{projectItemTargetRoomId}, #{userId}, now())
+        INSERT ignore INTO room_collection(`projectItemTargetRoomId`, `userId`, `date`) VALUES (#{projectItemTargetRoomId}, #{userId}, now())
     </insert>
 
     <select id="get" resultMap="result">

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

@@ -54,7 +54,6 @@ public class ClientController {
         return Response.ok();
     }
 
-    @OperationControllerLog(module = "CRM", operation = "客户管理-标准模板下载")
     @ApiOperation("标准模板下载")
     @RequestMapping(value = "/downloadModel", method = RequestMethod.GET)
     public Response getModel(final HttpServletResponse response) throws Exception {