新增历史结算;

新增租单管理

src/main/java/com/gxwebsoft/tower/entity/TowerEquipment.java

@@ -32,9 +32,17 @@ public class TowerEquipment implements Serializable {
     @ApiModelProperty(value = "设备名称")
     private String name;
 
+    @ApiModelProperty(value = "设备名称")
+    @TableField(exist = false)
+    private String equipmentName;
+
     @ApiModelProperty(value = "设备型号")
     private String model;
 
+    @ApiModelProperty(value = "设备型号")
+    @TableField(exist = false)
+    private String equipmentModel;
+
     @ApiModelProperty(value = "设备编号")
     private String equipmentNo;
 

src/main/java/com/gxwebsoft/tower/entity/TowerFall.java

@@ -42,7 +42,7 @@ public class TowerFall implements Serializable {
     private Integer companyId;
 
     @ApiModelProperty(value = "产权单位名称")
-    @TableField(exist = false)
+//    @TableField(exist = false)
     private String companyName;
 
     @ApiModelProperty(value = "出厂日期")

src/main/java/com/gxwebsoft/tower/mapper/xml/TowerWarehouseMapper.xml

@@ -49,9 +49,9 @@
             <if test="param.comments != null">
                 AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
             </if>
-            <if test="param.username != null">
+<!--            <if test="param.username != null">-->
-                AND a.username = #{param.username}
+<!--                AND a.username = #{param.username}-->
-            </if>
+<!--            </if>-->
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>

src/test/java/com/gxwebsoft/generator/TowerGenerator.java

@@ -48,8 +48,10 @@ public class TowerGenerator {
 //        "tower_model"
 //      "tower_contract",
 //      "tower_contract_equipment",
-      "tower_settle",
+//      "tower_settle",
 //      "tower_settle_detail",
+//      "tower_history_settle",
+      "tower_rent_record",
     };
     // 需要去除的表前缀
     private static final String[] TABLE_PREFIX = new String[]{