fix

virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemTargetRoomController.java

@@ -188,7 +188,7 @@ public class ProjectItemTargetRoomController {
         return map;
     }
 
-    @ApiOperation("工作台-房源管理")
+    @ApiOperation("项目工作台-房源管理")
     @RequestMapping(value = "/roomCount/{projectId}", method = RequestMethod.GET)
     public Response roomCount(@PathVariable long projectId) {
         return Response.ok(projectItemTargetRoomService.roomCount(projectId));

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

@@ -34,7 +34,10 @@
             od.deviceModel as operateDevice_deviceModel,
             od.deviceSerialNumber as operateDevice_deviceSerialNumber,
             od.attachment as operateDevice_attachment,
-            od.remark as operateDevice_remark
+            od.remark as operateDevice_remark,
+            od.modelBindType as operateDevice_modelBindType,
+            od.modelBindContent as operateDevice_modelBindContent,
+            od.modelBindPosition as operateDevice_modelBindPosition
         FROM operate_device_level odl left join operate_device od on odl.id = od.operateDeviceLevelId
     </sql>
 

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

@@ -25,4 +25,7 @@ public interface MgrClientDao {
     List<MgrClient> getLimit(@Param("p") MgrClient p, @Param("currIndex") int currIndex, @Param("pageSize") int pageSize);
 
     List<Map<Integer, Integer>> typeCount(MgrClient mgrClient);
+
+    Map<String, Object> projectCount(long projectId);
+
 }

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

@@ -153,4 +153,8 @@
         limit #{currIndex} , #{pageSize}
     </select>
 
+    <select id="projectCount" resultType="map">
+        SELECT COUNT(`id`) as totalNumber, COUNT(if(`type`=6,true,null)) as negotiateNumber, COUNT(if(MONTH(visitingTime) = MONTH(NOW()),true,null)) as monthNowAddNumber FROM mgr_client WHERE projectId = #{projectId}
+    </select>
+
 </mapper>

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

@@ -131,4 +131,9 @@ public class ClientController {
         return Response.ok(clientService.typeCount(mgrClient));
     }
 
+    @ApiOperation("项目工作台-客户管理")
+    @RequestMapping(value = "/count/{projectId}", method = RequestMethod.POST)
+    public Response projectCount(@PathVariable long projectId) {
+        return Response.ok(clientService.projectCount(projectId));
+    }
 }

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

@@ -125,4 +125,9 @@ public class ClientService {
         return null;
     }
 
+
+    public Map<String, Object> projectCount(long projectId) {
+        return clientDao.projectCount(projectId);
+    }
+
 }