Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/controller/YqGOrderController.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 //import com.ruoyi.gas.domain.vo.GOrderVo;
 //import com.ruoyi.gas.service.IGAreaService;
 //import com.ruoyi.gas.service.IGOrderService;
+import com.ruoyi.yiqi.entity.GOrderVo;
 import com.ruoyi.yiqi.entity.YqGOrder;
 import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
 import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
@@ -74,8 +75,8 @@ public class YqGOrderController extends BaseController {
     @Log(title = "工程管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(@Validated YqGOrder bo, HttpServletResponse response) {
-        List<YqGOrder> list = iGOrderService.getListExport(bo);
-        ExcelUtil.exportExcel(list, "工程管理", YqGOrder.class, response);
+        List<GOrderVo> list = iGOrderService.getListExport(bo);
+        ExcelUtil.exportExcel(list, "工程管理", GOrderVo.class, response);
     }
 
     /**

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

@@ -0,0 +1,135 @@
+package com.ruoyi.yiqi.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+/**
+ * 工程管理视图对象 g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class GOrderVo {
+
+	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+
+    /**
+     * 主键id
+     */
+	private Long id;
+	private Long anjianId;
+
+    /**
+     * 订单号
+     */
+	private String orderNum;
+
+	/**
+	 * 服务类别
+	 * 字典 ：001 上门未遇 002 正常施工 003 不符合规定
+	 * 非字典 004安检 005维修  006开栓
+	 */
+    @ExcelProperty(value = "服务类别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "service_type")
+	private String serviceType;
+
+	@ExcelProperty(value = "工人")
+	private String userName;
+
+	private Long userId;
+
+	@ExcelProperty(value = "房屋")
+	private String house;
+    /**
+     * 房屋id
+     */
+	private Long houseId;
+
+	private Long unitId;
+	private Long buildingId;
+	private Long areaId;
+	/**
+	 * 管子类别
+	 */
+	@ExcelProperty(value = "管子类别")
+	private String pipeType;
+	/**
+	 * 管子长度
+	 */
+	@ExcelProperty(value = "管子长度")
+	private String pipeLength;
+	@ExcelProperty(value = "自闭阀类型")
+	private String valveType;
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date time;
+	@ExcelProperty(value = "修改时间")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date updateTime;
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "工程状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "order_status")
+	private String orderStatus;
+
+    /**
+     * 审核状态
+     */
+    @ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "examine_status")
+	private String examineStatus;
+
+    /**
+     * 备注
+     */
+	@ExcelProperty(value = "备注")
+	private String remark;
+	/**
+	 * 审核意见
+	 */
+	@ExcelProperty(value = "意见")
+	private String reason;
+
+	private Integer version;
+	private String whether;
+
+
+	private List<String> photoList;
+
+	@ExcelProperty(value = "创建时间")
+	private String exportTime;
+
+	public String getExportTime() {
+		return exportTime;
+	}
+
+	public void setExportTime(Date exportTime) {
+		this.exportTime = DateToString(exportTime);
+	}
+
+	/**
+			* date类型时间转String类型时间（设置时区）
+			* @param time
+     * @return
+			 */
+	public static String DateToString(Date time){
+		TimeZone timeZoneSH = TimeZone.getTimeZone("Asia/Shanghai");
+		SimpleDateFormat outputFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+		outputFormat.setTimeZone(timeZoneSH);
+		return outputFormat.format(time);
+	}
+}

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/java/com/ruoyi/yiqi/mapper/YqGOrderMapper.java

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 //import com.ruoyi.gas.domain.bo.GOrderBo;
 //import com.ruoyi.gas.domain.vo.*;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
-import com.ruoyi.yiqi.entity.YqGCensusVo;
-import com.ruoyi.yiqi.entity.YqGOrder;
-import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
-import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
+import com.ruoyi.yiqi.entity.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,7 +20,7 @@ import java.util.List;
 public interface YqGOrderMapper extends BaseMapperPlus<YqGOrderMapper, YqGOrder, YqGOrder> {
 
     Page<YqGOrder> getListAll(@Param("p") YqGOrder bo, Page<?> page);
-    List<YqGOrder> getListExport(@Param("p") YqGOrder bo);
+    List<GOrderVo> getListExport(@Param("p") YqGOrder bo);
     Page<YqGOrder> getListExamine(@Param("p") YqGOrder bo, Page<?> page);
 
     YqGOrder getById(Long id);

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/IYqGOrderService.java

@@ -8,10 +8,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 //import com.ruoyi.gas.domain.vo.GOrderExportVoAnJian;
 //import com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu;
 //import com.ruoyi.gas.domain.vo.YqGOrder;
-import com.ruoyi.yiqi.entity.YqGCensusVo;
-import com.ruoyi.yiqi.entity.YqGOrder;
-import com.ruoyi.yiqi.entity.YqGOrderExportVoAnJian;
-import com.ruoyi.yiqi.entity.YqGOrderExportVoWeiXiu;
+import com.ruoyi.yiqi.entity.*;
 
 import java.util.Collection;
 import java.util.List;
@@ -79,7 +76,7 @@ public interface IYqGOrderService {
 	 * @param bo
 	 * @return
 	 */
-	List<YqGOrder> getListExport(YqGOrder bo);
+	List<GOrderVo> getListExport(YqGOrder bo);
 
 	/**
 	 * 安检列表

ruoyi-yiqi/src/main/java/com/ruoyi/yiqi/service/impl/YqGOrderServiceImpl.java

@@ -179,7 +179,7 @@ public class YqGOrderServiceImpl implements IYqGOrderService {
     }
 
     @Override
-    public List<YqGOrder> getListExport(YqGOrder bo) {
+    public List<GOrderVo> getListExport(YqGOrder bo) {
         return gOrderMapper.getListExport(bo);
     }
 

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')
@@ -99,7 +99,7 @@
         </if>
         order by time desc
     </select>
-    <select id="getListExport" resultType="com.ruoyi.yiqi.entity.YqGOrder">
+    <select id="getListExport" resultType="com.ruoyi.yiqi.entity.GOrderVo">
         select a.id as id,
         a.service_type as serviceType,
         u.name as userName,
@@ -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}