完善一期用户

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/entity/YqGOrder.java

@@ -21,12 +21,18 @@ import java.util.List;
  * @date 2021-11-16
  */
 @Data
-@Accessors(chain = true)
 @TableName("yq_g_order")
 public class YqGOrder extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
+    private String value;
+
+    private List<String> photoList;
+    @TableField(exist = false)
+    private String house;
+    @TableField(exist = false)
+    private String userName;
     /**
      * 主键id
      */
@@ -41,9 +47,6 @@ public class YqGOrder extends BaseEntity {
     private Long foremanId;
     private Long workerId;
     private Long parentId;
-    private String value;
-    private String house;
-    private String userName;
 
 
 
@@ -70,12 +73,12 @@ public class YqGOrder extends BaseEntity {
     @NotNull(message = "工人id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long userId;
 
+    private String houseName;
     /**
      * 房屋id
      */
     // @ApiModelProperty(value = "房屋id")
     private Long houseId;
-    private String houseName;
 
     /**
      * 管子长度
@@ -129,6 +132,8 @@ public class YqGOrder extends BaseEntity {
 //    // @ApiModelProperty("当前页数")
 //    private Integer pageNum;
 
+    @TableField(exist = false)
+    private String jobNum;
     /**
      * 排序列
      */
@@ -141,7 +146,6 @@ public class YqGOrder extends BaseEntity {
     // @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
-    private List<String> photoList;
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     // @ApiModelProperty("时间")
@@ -150,10 +154,6 @@ public class YqGOrder extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     // @ApiModelProperty("时间")
     private Date endTime;
-    /**
-     * 工号前四位
-     */
-    private String jobNum;
 
     private Integer version;
     private String whether;

ruoyi-yiqi/src/main/resources/mapper/YqGOrderMapper.xml

@@ -56,7 +56,7 @@
         left join yq_g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
         left join yq_g_building d on ( c.building_id = d.id and d.del_flag = '0')
         left join yq_g_area e on ( d.area_id = e.id and e.del_flag = '0')
-        left join sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
+        left join yq_sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
         left join yq_g_user u on a.user_id = u.id
         where a.del_flag = '0'
         and a.service_type not in ('004','005','006')
@@ -177,12 +177,12 @@
         a.whether as whether,
         a.version as version,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
-        from yq_g_order a
+        from yq_yq_g_order a
         left join yq_g_house b on ( a.house_id = b.id and b.del_flag = '0')
         left join yq_g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
         left join yq_g_building d on ( c.building_id = d.id and d.del_flag = '0')
         left join yq_g_area e on ( d.area_id = e.id  and e.del_flag = '0')
-        left join sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
+        left join yq_sys_dict_data f on ( e.district = f.dict_value and f.dict_type='district')
         left join yq_g_user u on a.user_id = u.id
         where a.del_flag = '0' and a.order_status = '001'
         and a.service_type not in ('004','005','006')
@@ -232,7 +232,7 @@
     <select id="getExaminePipeType" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
         select count(DISTINCT o.id) as value,
             o.pipe_type as name
-        from yq_g_order o
+        from yq_yq_g_order o
                 left join yq_g_house a on ( o.house_id = a.id and a.del_flag = '0')
                 left join yq_g_unit b on ( a.unit_id = b.id and b.del_flag = '0')
                 left join yq_g_building c on ( b.building_id = c.id and c.del_flag = '0')
@@ -247,7 +247,7 @@
     <select id="getExaminePipeLength" resultType="com.ruoyi.yiqi.entity.YqGCensusVo">
         select count(DISTINCT o.id) as value,
             o.pipe_length as name
-        from yq_g_order o
+        from yq_yq_g_order o
                 left join yq_g_house a on ( o.house_id = a.id and a.del_flag = '0')
                 left join yq_g_unit b on ( a.unit_id = b.id  and b.del_flag = '0')
                 left join yq_g_building c on ( b.building_id = c.id  and c.del_flag = '0')
@@ -302,12 +302,12 @@
         a.whether as whether,
         a.version as version,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house
-        from yq_g_order a
+        from yq_yq_g_order a
         left join yq_g_house b on a.house_id = b.id
         left join yq_g_unit c on b.unit_id = c.id
         left join yq_g_building d on c.building_id = d.id
         left join yq_g_area e on d.area_id = e.id
-        left join sys_dict_data f on e.district = f.dict_value
+        left join yq_sys_dict_data f on e.district = f.dict_value
         where a.del_flag = '0'
         and a.service_type not in ('004','005','006')
         and f.dict_type='district'
@@ -379,13 +379,13 @@
         a.update_time as updateTime,
         CONCAT(f.dict_label,'-',e.name,'-',d.name,'-',c.name,'-',b.name) as house,
         a.whether as whether
-        from yq_g_order a
+        from yq_yq_g_order a
         left join yq_g_house b on ( a.house_id = b.id and b.del_flag = '0')
         left join yq_g_unit c on ( b.unit_id = c.id and c.del_flag = '0')
         left join yq_g_building d on ( c.building_id = d.id and d.del_flag = '0')
         left join yq_g_area e on ( d.area_id = e.id and e.del_flag = '0')
         left join yq_g_user u on a.user_id = u.id
-        left join sys_dict_data f on e.district = f.dict_value
+        left join yq_sys_dict_data f on e.district = f.dict_value
         where a.del_flag = '0'
         and a.service_type ='004'
         and f.dict_type='district'

ruoyi-yiqi/src/main/resources/mapper/YqGOrderPhotoMapper.xml

@@ -27,11 +27,11 @@
         e.name as building,
         f.name as area
         from yq_g_order_photo a
-        left join g_order b on a.order_id = b.id
-        left join g_house c on b.house_id = c.id
-        left join g_unit d on c.unit_id = d.id
-        left join g_building e on d.building_id=e.id
-        left join g_area f on e.area_id = f.id
+        left join yq_g_order b on a.order_id = b.id
+        left join yq_g_house c on b.house_id = c.id
+        left join yq_g_unit d on c.unit_id = d.id
+        left join yq_g_building e on d.building_id=e.id
+        left join yq_g_area f on e.area_id = f.id
         where b.id in
         <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
             #{item}