贞达市政后端增加人员分级；安检维修加是否字段、导出功能；修改工人工号前四位查询功能；

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GOrderController.java

@@ -1,20 +1,15 @@
 package com.ruoyi.web.controller.gas;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
-import cn.hutool.core.date.DateUtil;
-
-import com.ruoyi.gas.domain.bo.GUserBo;
-import com.ruoyi.gas.domain.vo.GUserVo;
+import com.ruoyi.gas.domain.vo.GOrderExportVoAnJian;
+import com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu;
 import com.ruoyi.gas.service.IGAreaService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 
-import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -117,8 +112,8 @@ public class GOrderController extends BaseController {
      * @return
      */
     @GetMapping("/submitY")
-    public AjaxResult submitY(Long[] ids,String reason) {
-        iGOrderService.submitY(Arrays.asList(ids),reason);
+    public AjaxResult submitY(Long[] ids,String reason,Integer version) {
+        iGOrderService.submitY(Arrays.asList(ids),reason,version);
         areaService.write(Arrays.asList(ids));
         return AjaxResult.success();
     }
@@ -128,8 +123,8 @@ public class GOrderController extends BaseController {
      * @return
      */
     @GetMapping("/submitN")
-    public AjaxResult<Void> submitN(Long[] ids,String reason) {
-        return toAjax(iGOrderService.submitN(Arrays.asList(ids),reason) ? 1 : 0);
+    public AjaxResult<Void> submitN(Long[] ids,String reason,Integer version) {
+        return toAjax(iGOrderService.submitN(Arrays.asList(ids),reason,version) ? 1 : 0);
     }
     /**
      * 删除工程管理
@@ -224,6 +219,18 @@ public class GOrderController extends BaseController {
     }
 
     /**
+     * 安检导出
+     */
+    @ApiOperation("安检导出")
+    @PreAuthorize("@ss.hasPermi('gas:order:getListAnJianExport')")
+    @Log(title = "安检导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/getListAnJianExport")
+    public void getListAnJianExport(@Validated GOrderBo bo, HttpServletResponse response) {
+        List<GOrderExportVoAnJian> list = iGOrderService.getListAnJianExport(bo);
+        ExcelUtil.exportExcel(list, "安检导出", GOrderExportVoAnJian.class, response);
+    }
+
+    /**
      * 维修列表
      * @param bo
      * @return
@@ -234,6 +241,18 @@ public class GOrderController extends BaseController {
     }
 
     /**
+     * 维修导出
+     */
+    @ApiOperation("维修导出")
+    @PreAuthorize("@ss.hasPermi('gas:order:getListWeiXiuExport')")
+    @Log(title = "维修导出", businessType = BusinessType.EXPORT)
+    @GetMapping("/getListWeiXiuExport")
+    public void getListWeiXiuExport(@Validated GOrderBo bo, HttpServletResponse response) {
+        List<GOrderExportVoWeiXiu> list = iGOrderService.getListWeiXiuExport(bo);
+        ExcelUtil.exportExcel(list, "安检导出", GOrderExportVoWeiXiu.class, response);
+    }
+
+    /**
      * 开栓列表
      * @param bo
      * @return

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GUserController.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.vo.GUserForemanVo;
 import com.ruoyi.system.aspect.annotation.DataDictClass;
 import lombok.RequiredArgsConstructor;

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MUser.java

@@ -52,4 +52,13 @@ public class MUser extends BaseEntity {
      */
     private String password;
 
+    /**
+     * 工程权限
+     */
+    private String power;
+    /**
+     * 民用工程权限
+     */
+    private String civilPower;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GOrder.java

@@ -80,4 +80,8 @@ public class GOrder extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    @Version
+    private Integer version;
+    private String whether;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GUser.java

@@ -48,4 +48,13 @@ public class GUser extends BaseEntity {
     @TableLogic
     private String delFlag;
     private String password;
+    /**
+     * 工程权限
+     */
+    private String power;
+    /**
+     * 民用工程权限
+     */
+    private String civilPower;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GOrderBo.java

@@ -149,4 +149,6 @@ public class GOrderBo extends BaseEntity {
      */
     private String jobNum;
 
+    private Integer version;
+    private String whether;
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GUserBo.java

@@ -75,4 +75,15 @@ public class GUserBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
+
+    /**
+     * 工程权限
+     */
+    @ApiModelProperty(value = "工程权限")
+    private String power;
+    /**
+     * 民用工程权限
+     */
+    @ApiModelProperty(value = "民用工程权限")
+    private String civilPower;
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderExportVoAnJian.java

@@ -0,0 +1,58 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+
+/**
+ * 安检维修导出vo g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@ApiModel("安检维修导出vo")
+@ExcelIgnoreUnannotated
+public class GOrderExportVoAnJian {
+
+	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+
+    /**
+     * 主键id
+     */
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	@ExcelProperty(value = "工人")
+	private String userName;
+
+	@ExcelProperty(value = "房屋")
+	private String house;
+
+	@ExcelProperty(value = "订单时间")
+	@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")
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+
+	@ExcelProperty(value = "是否合格")
+	private String whether;
+    /**
+     * 备注
+     */
+	@ApiModelProperty("备注")
+	@ExcelProperty(value = "备注")
+	private String remark;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderExportVoWeiXiu.java

@@ -0,0 +1,62 @@
+package com.ruoyi.gas.domain.vo;
+
+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
+
+
+/**
+ * 安检维修导出vo g_order
+ *
+ * @author ruoyi
+ * @date 2021-11-16
+ */
+@Data
+@ApiModel("安检维修导出vo")
+@ExcelIgnoreUnannotated
+public class GOrderExportVoWeiXiu {
+
+	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
+
+    /**
+     * 主键id
+     */
+	@ApiModelProperty("主键id")
+	private Long id;
+
+	@ExcelProperty(value = "工人")
+	private String userName;
+
+	@ExcelProperty(value = "房屋")
+	private String house;
+
+	@ExcelProperty(value = "订单时间")
+	@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")
+	@ApiModelProperty("修改时间")
+	private Date updateTime;
+
+	@ExcelProperty(value = "是否维修")
+	private String whether;
+    /**
+     * 备注
+     */
+	@ApiModelProperty("备注")
+	@ExcelProperty(value = "备注")
+	private String remark;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GOrderVo.java

@@ -10,8 +10,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Locale;
+import java.util.TimeZone;
 
 
 /**
@@ -26,6 +29,7 @@ import java.util.List;
 public class GOrderVo {
 
 	private static final long serialVersionUID = 1L;
+	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.CHINA);
 
     /**
      * 主键id
@@ -81,9 +85,7 @@ public class GOrderVo {
 	@ExcelProperty(value = "自闭阀类型")
 	@ApiModelProperty("自闭阀类型")
 	private String valveType;
-	@ExcelProperty(value = "创建时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty("创建时间")
 	private Date time;
 	@ExcelProperty(value = "修改时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -115,10 +117,34 @@ public class GOrderVo {
 	 */
 	private String reason;
 
-
+	private Integer version;
+	private String whether;
 
 
 
 	private List<String> photoList;
 
+	@ExcelProperty(value = "创建时间")
+	@ApiModelProperty("创建时间")
+	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-gas/src/main/java/com/ruoyi/gas/domain/vo/GUserVo.java

@@ -54,6 +54,15 @@ public class GUserVo {
 	@ApiModelProperty("密码")
 	private String password;
 
+	/**
+	 * 工程权限
+	 */
+	private String power;
+	/**
+	 * 民用工程权限
+	 */
+	private String civilPower;
+
 
 	private String parentName;
 
@@ -100,4 +109,20 @@ public class GUserVo {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+	public String getPower() {
+		return power;
+	}
+
+	public void setPower(String power) {
+		this.power = power;
+	}
+
+	public String getCivilPower() {
+		return civilPower;
+	}
+
+	public void setCivilPower(String civilPower) {
+		this.civilPower = civilPower;
+	}
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GOrderMapper.java

@@ -3,12 +3,8 @@ package com.ruoyi.gas.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.gas.domain.GOrder;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
-import com.ruoyi.gas.domain.bo.GBuildingBo;
 import com.ruoyi.gas.domain.bo.GOrderBo;
-import com.ruoyi.gas.domain.vo.GBuildingVo;
-import com.ruoyi.gas.domain.vo.GCensusVo;
-import com.ruoyi.gas.domain.vo.GHouseVo;
-import com.ruoyi.gas.domain.vo.GOrderVo;
+import com.ruoyi.gas.domain.vo.*;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -37,8 +33,12 @@ public interface GOrderMapper extends BaseMapperPlus<GOrder> {
     Page<GOrderVo> getListByStatus(@Param("p") GOrderBo bo, Page<?> page);
     //安检列表
     Page<GOrderVo> getListAnJian(@Param("p") GOrderBo bo, Page<?> page);
+    //安检导出
+    List<GOrderExportVoAnJian> getListAnJianExport(@Param("p") GOrderBo bo);
     //维修列表
     Page<GOrderVo> getListWeiXiu(@Param("p") GOrderBo bo, Page<?> page);
+    //维修导出
+    List<GOrderExportVoWeiXiu> getListWeiXiuExport(@Param("p") GOrderBo bo);
     //开栓列表
     Page<GOrderVo> getListKaiShuan(@Param("p") GOrderBo bo, Page<?> page);
     GOrder getByHouseId(Long houseId);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGOrderService.java

@@ -1,14 +1,13 @@
 package com.ruoyi.gas.service;
 
 import com.ruoyi.gas.domain.GOrder;
-import com.ruoyi.gas.domain.bo.GUserBo;
 import com.ruoyi.gas.domain.vo.GCensusVo;
+import com.ruoyi.gas.domain.vo.GOrderExportVoAnJian;
+import com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu;
 import com.ruoyi.gas.domain.vo.GOrderVo;
 import com.ruoyi.gas.domain.bo.GOrderBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.gas.domain.vo.GUserVo;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
 import java.util.List;
@@ -49,8 +48,8 @@ public interface IGOrderService extends IServicePlus<GOrder, GOrderVo> {
 	 * @return
 	 */
 	Boolean updateByBo(GOrderBo bo);
-	Boolean submitY(List<Long> ids,String reason);
-	Boolean submitN(List<Long> ids,String reason);
+	Boolean submitY(List<Long> ids,String reason,Integer version);
+	Boolean submitN(List<Long> ids,String reason,Integer version);
 
 	/**
 	 * 校验并删除数据
@@ -85,11 +84,24 @@ public interface IGOrderService extends IServicePlus<GOrder, GOrderVo> {
 	TableDataInfo<GOrderVo> getListAnJian(GOrderBo bo);
 
 	/**
+	 * 安检导出
+	 * @param bo
+	 * @return
+	 */
+	List<GOrderExportVoAnJian> getListAnJianExport(GOrderBo bo);
+
+	/**
 	 * 维修列表
 	 * @param bo
 	 * @return
 	 */
 	TableDataInfo<GOrderVo> getListWeiXiu(GOrderBo bo);
+	/**
+	 * 维修导出
+	 * @param bo
+	 * @return
+	 */
+	List<GOrderExportVoWeiXiu> getListWeiXiuExport(GOrderBo bo);
 
 	/**
 	 * 开栓列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -753,8 +753,8 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
         String format = sdf.format(new Date());
         // 文件夹的路径，写入服务器的 /tmp 文件夹下
-//        String filePath = path + po.getName();
-        String filePath = "D:\\zhsq_qk\\御景名都B";
+        String filePath = path + po.getName();
+//        String filePath = "D:\\zhsq_qk\\御景名都B";
         // 导出的zip路径
         String zipFilePath = path + "tmp_" + format + ".zip";
         // 导出的zip名字

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GOrderServiceImpl.java

@@ -1,34 +1,24 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.Constants;
 import com.ruoyi.common.utils.*;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.gas.domain.GOrderPhoto;
-import com.ruoyi.gas.domain.vo.GCensusVo;
-import com.ruoyi.gas.domain.vo.GOrderPhotoVo;
-import com.ruoyi.gas.domain.vo.GUserVo;
+import com.ruoyi.gas.domain.vo.*;
 import com.ruoyi.gas.mapper.GOrderPhotoMapper;
-import com.ruoyi.gas.mapper.GUserMapper;
-import com.ruoyi.gas.service.IGAreaService;
-import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.gas.domain.bo.GOrderBo;
-import com.ruoyi.gas.domain.vo.GOrderVo;
 import com.ruoyi.gas.domain.GOrder;
 import com.ruoyi.gas.mapper.GOrderMapper;
 import com.ruoyi.gas.service.IGOrderService;
 
-import java.io.*;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -130,7 +120,7 @@ public class GOrderServiceImpl extends ServicePlusImpl<GOrderMapper, GOrder, GOr
     }
 
     @Override
-    public Boolean submitY(List<Long> ids, String reason) {
+    public Boolean submitY(List<Long> ids, String reason,Integer version) {
         Collection<GOrder> order = new ArrayList<>();
         for (int i = 0; i < ids.size(); i++) {
             GOrderBo bo = new GOrderBo();
@@ -142,6 +132,7 @@ public class GOrderServiceImpl extends ServicePlusImpl<GOrderMapper, GOrder, GOr
                     bo.setReason(reason);
                 }
             }
+            bo.setVersion(version);
             GOrder update = BeanUtil.toBean(bo, GOrder.class);
             order.add(update);
         }
@@ -149,7 +140,7 @@ public class GOrderServiceImpl extends ServicePlusImpl<GOrderMapper, GOrder, GOr
     }
 
     @Override
-    public Boolean submitN(List<Long> ids, String reason) {
+    public Boolean submitN(List<Long> ids, String reason,Integer version) {
         Collection<GOrder> order = new ArrayList<>();
         for (int i = 0; i < ids.size(); i++) {
             GOrderBo bo = new GOrderBo();
@@ -161,6 +152,7 @@ public class GOrderServiceImpl extends ServicePlusImpl<GOrderMapper, GOrder, GOr
                     bo.setReason(reason);
                 }
             }
+            bo.setVersion(version);
             GOrder update = BeanUtil.toBean(bo, GOrder.class);
             order.add(update);
         }
@@ -323,4 +315,13 @@ public class GOrderServiceImpl extends ServicePlusImpl<GOrderMapper, GOrder, GOr
         return PageUtils.buildDataInfo(list);
     }
 
+    @Override
+    public List<GOrderExportVoAnJian> getListAnJianExport(GOrderBo bo) {
+        return gOrderMapper.getListAnJianExport(bo);
+    }
+
+    @Override
+    public List<GOrderExportVoWeiXiu> getListWeiXiuExport(GOrderBo bo) {
+        return gOrderMapper.getListWeiXiuExport(bo);
+    }
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -84,7 +84,7 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
         if (StringUtils.isEmpty(update.getPassword())) {
             update.setPassword(SecurityUtils.encryptPassword("123456"));
         }else {
-            update.setPassword(SecurityUtils.encryptPassword(update.getPassword()));
+            update.setPassword(update.getPassword());
         }
         return updateById(update);
     }

ruoyi-gas/src/main/resources/mapper/GOrderMapper.xml

@@ -22,6 +22,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="reason" column="reason"/>
+        <result property="version" column="version"/>
     </resultMap>
 
     <select id="getListAll" resultType="com.ruoyi.gas.domain.vo.GOrderVo">
@@ -35,6 +36,7 @@
         a.examine_status as examineStatus,
         a.remark as remark,
         a.time as time,
+        a.whether as whether,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house
         from g_order a
         left join g_house b on a.house_id = b.id
@@ -73,7 +75,7 @@
             and a.house_id = #{p.houseId}
         </if>
         <if test="p.jobNum != null  and p.jobNum != ''">
-            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
         </if>
         <if test=" p.starTime != null">
             and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
@@ -93,8 +95,9 @@
         a.order_status as orderStatus,
         a.examine_status as examineStatus,
         a.remark as remark,
-        a.time as time,
+        a.time as exportTime,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether,
         a.house_id as houseId
         from g_order a
         left join g_house b on a.house_id = b.id
@@ -133,7 +136,7 @@
             and a.house_id = #{p.houseId}
         </if>
         <if test="p.jobNum != null  and p.jobNum != ''">
-            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
         </if>
         <if test=" p.starTime != null">
             and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
@@ -154,12 +157,14 @@
         a.examine_status as examineStatus,
         a.remark as remark,
         a.time as time,
+        a.whether as whether,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house
         from g_order a
         left join g_house b on a.house_id = b.id
         left join g_unit c on b.unit_id = c.id
         left join g_building d on c.building_id = d.id
         left join g_area e on d.area_id = e.id
+        left join g_user u on a.user_id = u.id
         where a.del_flag = '0' and a.order_status = '001'
         and b.del_flag = '0'
         and c.del_flag = '0'
@@ -178,6 +183,9 @@
         <if test="p.examineStatus != null  and p.examineStatus != ''">
             and a.examine_status = #{p.examineStatus}
         </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND SUBSTRING(u.job_num, 1,4) like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
         order by time desc
     </select>
     <select id="getById" resultType="com.ruoyi.gas.domain.vo.GOrderVo">
@@ -287,6 +295,7 @@
         a.examine_status as examineStatus,
         a.remark as remark,
         a.time as time,
+        a.whether as whether,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house
         from g_order a
         left join g_house b on a.house_id = b.id
@@ -312,6 +321,7 @@
         a.remark as remark,
         a.time as time,
         a.update_time as updateTime,
+        a.whether as whether,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house
         from g_order a
         left join g_house b on a.house_id = b.id
@@ -351,12 +361,59 @@
         </if>
         order by a.update_time desc
     </select>
+    <select id="getListAnJianExport" resultType="com.ruoyi.gas.domain.vo.GOrderExportVoAnJian">
+        select a.id as id,
+        (select name from g_user where id = a.user_id) as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether
+        from g_order a
+        left join g_house b on a.house_id = b.id
+        left join g_unit c on b.unit_id = c.id
+        left join g_building d on c.building_id = d.id
+        left join g_area e on d.area_id = e.id
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and b.del_flag = '0'
+        and c.del_flag = '0'
+        and d.del_flag = '0'
+        and e.del_flag = '0'
+        and a.service_type ='004'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        order by a.update_time desc,userName
+    </select>
     <select id="getListWeiXiu" resultType="com.ruoyi.gas.domain.vo.GOrderVo">
         select a.id as id,
         (select name from g_user where id = a.user_id) as userName,
         a.remark as remark,
         a.time as time,
         a.update_time as updateTime,
+        a.whether as whether,
         CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house
         from g_order a
         left join g_house b on a.house_id = b.id
@@ -396,6 +453,52 @@
         </if>
         order by a.update_time desc
     </select>
+    <select id="getListWeiXiuExport" resultType="com.ruoyi.gas.domain.vo.GOrderExportVoWeiXiu">
+        select a.id as id,
+        (select name from g_user where id = a.user_id) as userName,
+        a.remark as remark,
+        a.time as time,
+        a.update_time as updateTime,
+        CONCAT(e.name,'-',d.name,'-',c.name,'-',b.name) as house,
+        a.whether as whether
+        from g_order a
+        left join g_house b on a.house_id = b.id
+        left join g_unit c on b.unit_id = c.id
+        left join g_building d on c.building_id = d.id
+        left join g_area e on d.area_id = e.id
+        left join g_user u on a.user_id = u.id
+        where a.del_flag = '0'
+        and b.del_flag = '0'
+        and c.del_flag = '0'
+        and d.del_flag = '0'
+        and e.del_flag = '0'
+        and a.service_type ='005'
+        <if test="p.userId != null  and p.userId != ''">
+            and a.user_id = #{p.userId}
+        </if>
+        <if test="p.areaId != null  and p.areaId != ''">
+            and e.id = #{p.areaId}
+        </if>
+        <if test="p.buildingId != null  and p.buildingId != ''">
+            and d.id = #{p.buildingId}
+        </if>
+        <if test="p.unitId != null  and p.unitId != ''">
+            and c.id = #{p.unitId}
+        </if>
+        <if test="p.houseId != null  and p.houseId != ''">
+            and a.house_id = #{p.houseId}
+        </if>
+        <if test="p.jobNum != null  and p.jobNum != ''">
+            AND u.job_num like CONCAT(CONCAT(#{p.jobNum}), '%')
+        </if>
+        <if test=" p.starTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> DATE_FORMAT(#{p.starTime},'%Y-%m-%d 00:00:00')
+        </if>
+        <if test=" p.endTime != null">
+            and DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> DATE_FORMAT(#{p.endTime},'%Y-%m-%d 23:59:59')
+        </if>
+        order by a.update_time desc,userName
+    </select>
     <select id="getListKaiShuan" resultType="com.ruoyi.gas.domain.vo.GOrderVo">
         select a.id as id,
         (select name from g_user where id = a.user_id) as userName,

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -14,6 +14,8 @@
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="power" column="power"/>
+        <result property="civilPower" column="civil_power"/>
     </resultMap>
     <select id="getList" resultType="com.ruoyi.gas.domain.vo.GUserVo">
         select id as id,

ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/MOrder.java

@@ -84,4 +84,7 @@ public class MOrder extends BaseEntity {
     @TableLogic
     private String delFlag;
 
+    private Integer version;
+    private String whether;
+
 }

ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/bo/MOrderBo.java

@@ -150,4 +150,7 @@ public class MOrderBo extends BaseEntity {
     private String buildingName;
     private String unitName;
     private String houseName;
+
+    private Integer version;
+    private String whether;
 }

ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MOrderVo.java

@@ -79,7 +79,7 @@ public class MOrderVo {
 	@ApiModelProperty("订单时间")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date time;
-	
+
     /**
      * 管子类型
      */
@@ -125,4 +125,6 @@ public class MOrderVo {
 	 * 审核意见
 	 */
 	private String reason;
+	private Integer version;
+	private String whether;
 }

ruoyi-mobile/src/main/java/com/ruoyi/mobile/domain/vo/MUserVo.java

@@ -63,4 +63,13 @@ public class MUserVo {
 	private String password;
 
 
+	/**
+	 * 工程权限
+	 */
+	private String power;
+	/**
+	 * 民用工程权限
+	 */
+	private String civilPower;
+
 }

ruoyi-mobile/src/main/java/com/ruoyi/mobile/service/impl/MUserServiceImpl.java

@@ -75,7 +75,10 @@ public class MUserServiceImpl extends ServicePlusImpl<MUserMapper, MUser, MUserV
     @Override
     public MUserVo getName() {
         MUserVo vo = new MUserVo();
-        vo.setName(SecurityUtils.getWxLoginUser().getMUser().getName());
+        MUser user = SecurityUtils.getWxLoginUser().getMUser();
+        vo.setName(user.getName());
+        vo.setPower(user.getPower());
+        vo.setCivilPower(user.getCivilPower());
         return vo;
     }