fix

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

@@ -152,6 +152,11 @@ public class Contract {
 
     private List<Tag> tagList;
 
+    /**
+     * 项目id
+     */
+    private long projectId;
+
     /**
      * 房源ids
      */
@@ -416,6 +421,14 @@ public class Contract {
         this.tagList = tagList;
     }
 
+    public long getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(long projectId) {
+        this.projectId = projectId;
+    }
+
     public String getProjectItemTargetRoomIds() {
         return projectItemTargetRoomIds;
     }

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

@@ -33,6 +33,7 @@
         <result column="lateFeesProportion" property="lateFeesProportion"/>
         <result column="lateFeesCeiling" property="lateFeesCeiling"/>
         <result column="tagIds" property="tagIds"/>
+        <result column="projectId" property="projectId"/>
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
         <result column="document" property="document"/>
@@ -69,6 +70,7 @@
         <result column="lateFeesProportion" property="lateFeesProportion"/>
         <result column="lateFeesCeiling" property="lateFeesCeiling"/>
         <result column="tagIds" property="tagIds"/>
+        <result column="projectId" property="projectId"/>
         <result column="projectItemTargetRoomIds" property="projectItemTargetRoomIds"/>
         <result column="attachment" property="attachment"/>
         <result column="document" property="document"/>
@@ -82,10 +84,10 @@
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Contract" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO contract(`code`, `createDate`, `organizationId`, `organizationName`, `roleId`, `roleName`, `investmentPromotion`, `operator`, `investmentPromotionName`, `operatorName`,`tenantType`, `merchantId`, `merchantName`, `clientId`, `clientName`,
                              `tenant`, `industry`, `corporation`, `signatory`, `tenantContactPerson`, `signingDate`, `startDate`, `endDate`,
-                             `lateFeesStartingDays`, `lateFeesProportion`, `lateFeesCeiling`, `tagIds`, `projectItemTargetRoomIds`, `attachment`, `document`, `status`, `data`)
+                             `lateFeesStartingDays`, `lateFeesProportion`, `lateFeesCeiling`, `tagIds`, `projectId`, `projectItemTargetRoomIds`, `attachment`, `document`, `status`, `data`)
         VALUES (#{code}, now(), #{organizationId}, #{organizationName}, #{roleId}, #{roleName}, #{investmentPromotion}, #{operator}, #{investmentPromotionName}, #{operatorName}, #{tenantType}, #{merchantId}, #{merchantName}, #{clientId}, #{clientName}, #{tenant},
                 #{industry}, #{corporation}, #{signatory}, #{tenantContactPerson}, #{signingDate}, #{startDate}, #{endDate}, #{lateFeesStartingDays},
-                #{lateFeesProportion}, #{lateFeesCeiling}, #{tagIds}, #{projectItemTargetRoomIds}, #{attachment}, #{document}, #{status}, #{data})
+                #{lateFeesProportion}, #{lateFeesCeiling}, #{tagIds}, #{projectId}, #{projectItemTargetRoomIds}, #{attachment}, #{document}, #{status}, #{data})
     </insert>
 
     <delete id="delete">
@@ -119,6 +121,7 @@
             <if test="lateFeesProportion!=null">lateFeesProportion=#{lateFeesProportion},</if>
             <if test="lateFeesCeiling!=null">lateFeesCeiling=#{lateFeesCeiling},</if>
             <if test="tagIds!=null">tagIds=#{tagIds},</if>
+            <if test="projectId!=0">projectId=#{projectId},</if>
             <if test="projectItemTargetRoomIds!=null">projectItemTargetRoomIds=#{projectItemTargetRoomIds},</if>
             <if test="attachment!=null">attachment=#{attachment},</if>
             <if test="document!=null">document=#{document},</if>
@@ -193,6 +196,7 @@
                     FIND_IN_SET (#{tagId}, tagIds)
                 </foreach>
             </if>
+            <if test="projectId!=0">and projectId=#{projectId}</if>
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
             <if test="document!=null">and document=#{document}</if>
@@ -233,6 +237,7 @@
                     FIND_IN_SET (#{tagId}, tagIds)
                 </foreach>
             </if>
+            <if test="projectId!=0">and projectId=#{projectId}</if>
             <if test="projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{projectItemTargetRoomIds}</if>
             <if test="attachment!=null">and attachment=#{attachment}</if>
             <if test="document!=null">and document=#{document}</if>
@@ -273,6 +278,7 @@
                     FIND_IN_SET (#{tagId}, tagIds)
                 </foreach>
             </if>
+            <if test="p.projectId!=0">and projectId=#{p.projectId}</if>
             <if test="p.projectItemTargetRoomIds!=null">and projectItemTargetRoomIds=#{p.projectItemTargetRoomIds}</if>
             <if test="p.attachment!=null">and attachment=#{p.attachment}</if>
             <if test="p.document!=null">and document=#{p.document}</if>

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

@@ -14,8 +14,9 @@ public interface MgrOrganizationProjectDao {
 
     List<MgrOrganizationProject> getUserProject(long userId);
 
+    List<MgrOrganizationProject> getList(MgrOrganizationProject mgrOrganizationProject);
+
     int insert(MgrOrganizationProject mgrOrganizationProject);
 
     int delete(long projectId);
-
 }

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

@@ -27,6 +27,19 @@
         select * from mgr_organization_project where userId = #{userId}
     </select>
 
+    <select id="getList" resultMap="mgrOrganizationProjectResult">
+        select * from mgr_organization_project
+        <where>
+            <if test="organizationId!=0">and organizationId=#{organizationId}</if>
+            <if test="projectId!=0">and projectId=#{projectId}</if>
+            <if test="userId!=0">and userId=#{userId}</if>
+            <if test="clientId!=0">and clientId=#{clientId}</if>
+            <if test="agentId!=0">and agentId=#{agentId}</if>
+            <if test="merchantId!=0">and merchantId=#{merchantId}</if>
+            <if test="identityId!=0">and identityId=#{identityId}</if>
+        </where>
+    </select>
+
     <insert id="insert">
         insert into mgr_organization_project (organizationId, projectId, userId, clientId, agentId, merchantId, identityId)
         value (#{organizationId}, #{projectId}, #{userId}, #{clientId}, #{agentId}, #{merchantId}, #{identityId})

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

@@ -24,4 +24,10 @@ public class OrganizationProjectController {
         return Response.ok();
     }
 
+    @ApiOperation("获取绑定")
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Response getBindProject(@RequestBody MgrOrganizationProject mgrOrganizationProject) {
+        return Response.ok(organizationProjectService.getList(mgrOrganizationProject));
+    }
+
 }

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

@@ -17,6 +17,10 @@ public class OrganizationProjectService {
         return mgrOrganizationProjectDao.get(organizationId, userId);
     }
 
+    public List<MgrOrganizationProject> getList(MgrOrganizationProject mgrOrganizationProject) {
+        return mgrOrganizationProjectDao.getList(mgrOrganizationProject);
+    }
+
     public int insert(MgrOrganizationProject mgrOrganizationProject) {
         return mgrOrganizationProjectDao.insert(mgrOrganizationProject);
     }