Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

target/classes/main/resources/mapper/MouldEquipmentMapper.xml

@@ -18,11 +18,12 @@
         <result column="temperature" property="temperature" />
         <result column="agent" property="agent" />
         <result column="stage" property="stage" />
+        <result column="sim" property="sim" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent,stage
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim
     </sql>
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
         <id column="id" property="id" />
@@ -39,6 +40,7 @@
         <result column="agent" property="agent" />
         <result column="modelName" property="modelName" />
         <result column="stage" property="stage" />
+        <result column="sim" property="sim" />
     </resultMap>
 
     <select id="getListByCompanyId" resultMap="BaseResultMapVO">
@@ -65,7 +67,7 @@
     <select id="getList" resultMap="BaseResultMapVO">
         select
         tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent,
-        tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
+        tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,tbme.sim sim,
         tbme.is_use, tbme.hill_number,tbc.company_name companyName,tbm.model_no modelNo,tbm.model_name modelName,tbme.stage
         from
         tb_mould_equipment tbme

target/classes/main/resources/mapper/MouldMapper.xml

@@ -30,13 +30,13 @@
         <result column="maintain_count" property="maintainCount" />
         <result column="holes" property="holes" />
         <result column="pre_update_id" property="preUpdateId" />
+        <result column="history_run_times" property="historyRunTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, produce_company_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times, is_maintain, maintain_count, holes, pre_update_id
+        id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, produce_company_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times, is_maintain, maintain_count, holes, pre_update_id, history_run_times
     </sql>
-
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
         <id column="id" property="id"/>
         <result column="maintain_count" property="maintainCount" />
@@ -203,7 +203,7 @@
     </select>
 
     <select id="selectListByCompanyId" resultMap="BaseResultMapVO">
-select
+        select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,tbm.is_maintain,tbm.holes,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,tbm.company_id,tbco.company_name produce_company_name,tbm.produce_company_id,
         tbp.manager mangerName,tbco.company_address area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
@@ -227,18 +227,20 @@ select
         on
         tbco.id = tbm.produce_company_id
         where
-          tbm.company_id = #{companyId}
-          AND tbm.equipment_id is not null
-          AND tbm.project_id is null
+        tbm.company_id = #{companyId}
+        AND tbm.equipment_id is not null
+        AND tbm.project_id is null
         <if test="projectId != null">
-          OR tbm.project_id = #{projectId}
+            OR tbm.project_id = #{projectId}
         </if>
     </select>
-    
+
     <update id="updateModelProjectIdAndEquipmentIdToNullById">
         update
           tb_mould
           SET /*project_id = NULL , */equipment_id = NULL
           where id = #{model.id}
     </update>
+
+
 </mapper>