Ver código fonte

完善一期用户

JX.Li 7 meses atrás
pai
commit
9b8580d570

+ 3 - 2
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);
     }
 
     /**

+ 135 - 0
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);
+	}
+}

+ 2 - 5
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);

+ 2 - 5
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);
 
 	/**
 	 * 安检列表

+ 1 - 1
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);
     }
 

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

@@ -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,