fix

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

@@ -111,6 +111,35 @@ public class Merchant {
      */
     private String entryTime;
 
+    /**
+     * 信用代码
+     */
+    private String creditCode;
+    /**
+     * 企业编码
+     */
+    private String enterpriseCode;
+    /**
+     * 企业标签
+     */
+    private String enterpriseLabel;
+    /**
+     * 企业里程碑
+     */
+    private String enterpriseMilestones;
+    /**
+     * 联系人
+     */
+    private String contacts;
+    /**
+     * 知识产权
+     */
+    private String intellectualPropertyRight;
+    /**
+     * 当年产出
+     */
+    private String produce;
+
     public long getId() {
         return id;
     }
@@ -286,4 +315,60 @@ public class Merchant {
     public void setEntryTime(String entryTime) {
         this.entryTime = entryTime;
     }
+
+    public String getCreditCode() {
+        return creditCode;
+    }
+
+    public void setCreditCode(String creditCode) {
+        this.creditCode = creditCode;
+    }
+
+    public String getEnterpriseCode() {
+        return enterpriseCode;
+    }
+
+    public void setEnterpriseCode(String enterpriseCode) {
+        this.enterpriseCode = enterpriseCode;
+    }
+
+    public String getEnterpriseLabel() {
+        return enterpriseLabel;
+    }
+
+    public void setEnterpriseLabel(String enterpriseLabel) {
+        this.enterpriseLabel = enterpriseLabel;
+    }
+
+    public String getEnterpriseMilestones() {
+        return enterpriseMilestones;
+    }
+
+    public void setEnterpriseMilestones(String enterpriseMilestones) {
+        this.enterpriseMilestones = enterpriseMilestones;
+    }
+
+    public String getContacts() {
+        return contacts;
+    }
+
+    public void setContacts(String contacts) {
+        this.contacts = contacts;
+    }
+
+    public String getIntellectualPropertyRight() {
+        return intellectualPropertyRight;
+    }
+
+    public void setIntellectualPropertyRight(String intellectualPropertyRight) {
+        this.intellectualPropertyRight = intellectualPropertyRight;
+    }
+
+    public String getProduce() {
+        return produce;
+    }
+
+    public void setProduce(String produce) {
+        this.produce = produce;
+    }
 }

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

@@ -132,6 +132,11 @@ public class OperateDevice {
      */
     private String maintenanceRecord;
 
+    /**
+     * 绑定位置
+     */
+    private String modelBindPosition;
+
     /**
      * DTO 变更总数
      */
@@ -379,6 +384,14 @@ public class OperateDevice {
         this.maintenanceRecord = maintenanceRecord;
     }
 
+    public String getModelBindPosition() {
+        return modelBindPosition;
+    }
+
+    public void setModelBindPosition(String modelBindPosition) {
+        this.modelBindPosition = modelBindPosition;
+    }
+
     public int getChangeCount() {
         return changeCount;
     }

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

@@ -28,11 +28,19 @@
         <result column="data" property="data"/>
         <result column="roomIds" property="roomIds"/>
         <result column="entryTime" property="entryTime"/>
+
+        <result column="creditCode" property="creditCode"/>
+        <result column="enterpriseCode" property="enterpriseCode"/>
+        <result column="enterpriseLabel" property="enterpriseLabel"/>
+        <result column="enterpriseMilestones" property="enterpriseMilestones"/>
+        <result column="contacts" property="contacts"/>
+        <result column="intellectualPropertyRight" property="intellectualPropertyRight"/>
+        <result column="produce" property="produce"/>
     </resultMap>
 
     <insert id="insert" parameterType="com.bosshand.virgo.api.model.Merchant" useGeneratedKeys="true" keyProperty="id">
-        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`, `roomIds`, `entryTime`)
-        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data}, #{roomIds}, #{entryTime})
+        INSERT INTO merchant(`address`, `businessScope`, `corporateScale`, `corporatePhilosophy`, `corporateCulture`, `contactInformation`, `fax`, `email`, `organizationId`, `projectId`, `industryType`, `name`, `legalPerson`, `establishDate`, `businessTerm`, `registeredCapital`, `status`, `data`, `roomIds`, `entryTime`, `creditCode`, `enterpriseCode`, `enterpriseLabel`, `enterpriseMilestones`, `contacts`, `intellectualPropertyRight`, `produce`)
+        VALUES (#{address}, #{businessScope}, #{corporateScale}, #{corporatePhilosophy}, #{corporateCulture}, #{contactInformation}, #{fax}, #{email}, #{organizationId}, #{projectId}, #{industryType}, #{name}, #{legalPerson}, #{establishDate}, #{businessTerm}, #{registeredCapital}, #{status}, #{data}, #{roomIds}, #{entryTime}, #{creditCode}, #{enterpriseCode}, #{enterpriseLabel}, #{enterpriseMilestones}, #{contacts}, #{intellectualPropertyRight}, #{produce})
     </insert>
 
     <delete id="delete">
@@ -63,6 +71,14 @@
             <if test="data!=null">data=#{data},</if>
             <if test="roomIds!=null">roomIds=#{roomIds},</if>
             <if test="entryTime!=null">entryTime=#{entryTime},</if>
+
+            <if test="creditCode!=null">creditCode=#{creditCode},</if>
+            <if test="enterpriseCode!=null">enterpriseCode=#{enterpriseCode},</if>
+            <if test="enterpriseLabel!=null">enterpriseLabel=#{enterpriseLabel},</if>
+            <if test="enterpriseMilestones!=null">enterpriseMilestones=#{enterpriseMilestones},</if>
+            <if test="contacts!=null">contacts=#{contacts},</if>
+            <if test="intellectualPropertyRight!=null">intellectualPropertyRight=#{intellectualPropertyRight},</if>
+            <if test="produce!=null">produce=#{produce},</if>
         </trim>
         WHERE id=#{id}
     </update>
@@ -95,6 +111,14 @@
             <if test="data!=null">and data=#{data}</if>
             <if test="roomIds!=null">and roomIds=#{roomIds}</if>
             <if test="entryTime!=null">and entryTime=#{entryTime}</if>
+
+            <if test="creditCode!=null">and creditCode=#{creditCode}</if>
+            <if test="enterpriseCode!=null">and enterpriseCode=#{enterpriseCode}</if>
+            <if test="enterpriseLabel!=null">and enterpriseLabel=#{enterpriseLabel}</if>
+            <if test="enterpriseMilestones!=null">and enterpriseMilestones=#{enterpriseMilestones}</if>
+            <if test="contacts!=null">and contacts=#{contacts}</if>
+            <if test="intellectualPropertyRight!=null">and intellectualPropertyRight=#{intellectualPropertyRight}</if>
+            <if test="produce!=null">and produce=#{produce}</if>
         </where>
     </select>
 
@@ -122,6 +146,14 @@
             <if test="data!=null">and data=#{data}</if>
             <if test="roomIds!=null">and roomIds=#{roomIds}</if>
             <if test="entryTime!=null">and entryTime=#{entryTime}</if>
+
+            <if test="creditCode!=null">and creditCode=#{creditCode}</if>
+            <if test="enterpriseCode!=null">and enterpriseCode=#{enterpriseCode}</if>
+            <if test="enterpriseLabel!=null">and enterpriseLabel=#{enterpriseLabel}</if>
+            <if test="enterpriseMilestones!=null">and enterpriseMilestones=#{enterpriseMilestones}</if>
+            <if test="contacts!=null">and contacts=#{contacts}</if>
+            <if test="intellectualPropertyRight!=null">and intellectualPropertyRight=#{intellectualPropertyRight}</if>
+            <if test="produce!=null">and produce=#{produce}</if>
         </where>
     </select>
 
@@ -149,6 +181,14 @@
             <if test="p.data!=null">and data=#{p.data}</if>
             <if test="p.roomIds!=null">and roomIds=#{p.roomIds}</if>
             <if test="p.entryTime!=null">and entryTime=#{p.entryTime}</if>
+
+            <if test="p.creditCode!=null">and creditCode=#{p.creditCode}</if>
+            <if test="p.enterpriseCode!=null">and enterpriseCode=#{p.enterpriseCode}</if>
+            <if test="p.enterpriseLabel!=null">and enterpriseLabel=#{p.enterpriseLabel}</if>
+            <if test="p.enterpriseMilestones!=null">and enterpriseMilestones=#{p.enterpriseMilestones}</if>
+            <if test="p.contacts!=null">and contacts=#{p.contacts}</if>
+            <if test="p.intellectualPropertyRight!=null">and intellectualPropertyRight=#{p.intellectualPropertyRight}</if>
+            <if test="p.produce!=null">and produce=#{p.produce}</if>
         </where>
         limit #{currIndex} , #{pageSize}
     </select>

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

@@ -33,6 +33,7 @@
         <result column="liaisonPhone" property="liaisonPhone"/>
         <result column="entryTime" property="entryTime"/>
         <result column="maintenanceRecord" property="maintenanceRecord"/>
+        <result column="modelBindPosition" property="modelBindPosition"/>
     </resultMap>
 
     <select id="get" resultMap="OperateDeviceResult">
@@ -68,6 +69,7 @@
             <if test="liaisonPhone!=null">and liaisonPhone=#{liaisonPhone}</if>
             <if test="entryTime!=null">and entryTime=#{entryTime}</if>
             <if test="maintenanceRecord!=null">and maintenanceRecord=#{maintenanceRecord}</if>
+            <if test="modelBindPosition!=null">and modelBindPosition=#{modelBindPosition}</if>
         </where>
     </select>
 
@@ -100,6 +102,7 @@
             <if test="liaisonPhone!=null">and liaisonPhone=#{liaisonPhone}</if>
             <if test="entryTime!=null">and entryTime=#{entryTime}</if>
             <if test="maintenanceRecord!=null">and maintenanceRecord=#{maintenanceRecord}</if>
+            <if test="modelBindPosition!=null">and modelBindPosition=#{modelBindPosition}</if>
         </where>
     </select>
 
@@ -132,6 +135,7 @@
             <if test="od.liaisonPhone!=null">and liaisonPhone=#{od.liaisonPhone}</if>
             <if test="od.entryTime!=null">and entryTime=#{od.entryTime}</if>
             <if test="od.maintenanceRecord!=null">and maintenanceRecord=#{od.maintenanceRecord}</if>
+            <if test="od.modelBindPosition!=null">and modelBindPosition=#{od.modelBindPosition}</if>
         </where>
         limit #{currIndex} , #{pageSize}
     </select>
@@ -139,10 +143,10 @@
     <insert id="save" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice" useGeneratedKeys="true" keyProperty="id">
         INSERT into operate_device(operateDeviceLevelId, projectId, projectItemId, projectItemTargetId, projectItemTargetRoomId, name, type, designNumber, assetNumber, deviceNumber,
                                    deviceBrand, deviceModel, deviceSerialNumber, attachment, remark, document, state,
-                                   code, godownId, modelBindType, modelBindContent, manufacturer, liaison, liaisonPhone, entryTime, maintenanceRecord)
+                                   code, godownId, modelBindType, modelBindContent, manufacturer, liaison, liaisonPhone, entryTime, maintenanceRecord, modelBindPosition)
         values(#{operateDeviceLevelId}, #{projectId}, #{projectItemId}, #{projectItemTargetId}, #{projectItemTargetRoomId}, #{name}, #{type}, #{designNumber},
                #{assetNumber}, #{deviceNumber}, #{deviceBrand}, #{deviceModel}, #{deviceSerialNumber}, #{attachment}, #{remark}, #{document}, #{state},
-               #{code}, #{godownId}, #{modelBindType}, #{modelBindContent}, #{manufacturer}, #{liaison}, #{liaisonPhone}, #{entryTime}, #{maintenanceRecord})
+               #{code}, #{godownId}, #{modelBindType}, #{modelBindContent}, #{manufacturer}, #{liaison}, #{liaisonPhone}, #{entryTime}, #{maintenanceRecord}, #{modelBindPosition})
     </insert>
 
     <update id="update" parameterType="com.bosshand.virgo.api.operate.model.OperateDevice">
@@ -174,6 +178,7 @@
             <if test="liaisonPhone!=null">and liaisonPhone=#{liaisonPhone},</if>
             <if test="entryTime!=null">and entryTime=#{entryTime},</if>
             <if test="maintenanceRecord!=null">and maintenanceRecord=#{maintenanceRecord},</if>
+            <if test="modelBindPosition!=null">and modelBindPosition=#{modelBindPosition},</if>
         </trim>
         WHERE id=#{id}
     </update>