工单管理后台功能

客户后台管理

common/src/main/java/com/jpsoft/employment/modules/base/dao/CommentInfoDAO.java

@@ -14,5 +14,6 @@ public interface CommentInfoDAO {
 	CommentInfo get(String id);
 	int delete(String id);
 	List<CommentInfo> list();
+	List<CommentInfo> findByWorkOrderId(String workOrderId);
 	List<CommentInfo> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.base.dao;
+
+import java.util.List;
+import org.springframework.stereotype.Repository;
+import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface ConstructionProgressDAO {
+	int insert(ConstructionProgress entity);
+	int update(ConstructionProgress entity);
+	int exist(String id);
+	ConstructionProgress get(String id);
+	int delete(String id);
+	List<ConstructionProgress> list();
+	List<ConstructionProgress> findByWorkOrderId(String workOrderId);
+	List<ConstructionProgress> search(Map<String, Object> searchParams, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/dao/InstallationRequirementDAO.java

@@ -14,5 +14,6 @@ public interface InstallationRequirementDAO {
 	InstallationRequirement get(String id);
 	int delete(String id);
 	List<InstallationRequirement> list();
+	InstallationRequirement findByWorkOrderId(String workOrderId);
 	List<InstallationRequirement> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dao/ReceiveRequireDAO.java

@@ -14,5 +14,6 @@ public interface ReceiveRequireDAO {
 	ReceiveRequire get(String id);
 	int delete(String id);
 	List<ReceiveRequire> list();
+	ReceiveRequire findByWorkOrderId(String workOrderId);
 	List<ReceiveRequire> search(Map<String, Object> searchParams, List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/dto/WorkOrderAllDataDTO.java

@@ -0,0 +1,19 @@
+package com.jpsoft.employment.modules.base.dto;
+
+import com.jpsoft.employment.modules.base.entity.*;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WorkOrderAllDataDTO {
+    private WorkOrder workOrder;
+    private InstallationRequirement installationRequirement;
+    private ReceiveRequire receiveRequire;
+    private String customerName;
+    private String customerPhone;
+    private List<CommentInfo> commentInfoList;
+    private TechnicianInfo technicianInfo;
+    private List<String> imageList;
+    private List<ConstructionProgress> ConstructionProgressList;
+}

common/src/main/java/com/jpsoft/employment/modules/base/entity/CommentInfo.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -57,5 +59,10 @@ public class CommentInfo {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+
+				@Transient
+	@ApiModelProperty(value = "评价客户")
+	private String companyName;
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/ConstructionProgress.java

@@ -0,0 +1,81 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.springframework.data.annotation.Transient;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+  描述:base_construction_progress的实体类
+ */
+@Data
+@ApiModel(value = "base_construction_progress的实体类")
+public class ConstructionProgress {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "标题")
+	private String title;
+	
+				@ApiModelProperty(value = "图片")
+	private String image;
+	
+				@ApiModelProperty(value = "提交人")
+	private String submitBy;
+	
+				@ApiModelProperty(value = "提交人类型（1：客户，2：师傅）")
+	private String submitType;
+	
+					@ApiModelProperty(value = "提交时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date submitTime;
+	
+			@ApiModelProperty(value = "工单ID")
+	private String workOrderId;
+	
+				@ApiModelProperty(value = "排序号")
+	private Integer index;
+	
+					@ApiModelProperty(value = "创建时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date createTime;
+	
+				@ApiModelProperty(value = "更新时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date updateTime;
+	
+			@ApiModelProperty(value = "删除标示")
+	private Boolean delFlag;
+	
+				@ApiModelProperty(value = "创建人")
+	private String createBy;
+	
+				@ApiModelProperty(value = "更新人")
+	private String updateBy;
+
+
+				@Transient
+	@ApiModelProperty(value = "提交人")
+	private String submitByN;
+
+	@Transient
+	@ApiModelProperty(value = "图片")
+	private List<String> imageList;
+
+
+	@Transient
+	@ApiModelProperty(value = "提交日期")
+	private String submitDate;
+	
+		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java

@@ -32,8 +32,7 @@ public class InstallationRequirement {
 	private String location;
 	
 				@ApiModelProperty(value = "水箱材质")
-	private String material
-;
+	private String material;
 	
 				@ApiModelProperty(value = "水箱尺寸")
 	private BigDecimal size;
@@ -101,5 +100,22 @@ public class InstallationRequirement {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+
+	@ApiModelProperty(value = "施工地图")
+	private String map;
+
+	@ApiModelProperty(value = "施工位置")
+	private String constructionLocation;
+
+	@ApiModelProperty(value = "施工环境")
+	private String environment;
+
+	@ApiModelProperty(value = "体积")
+	private BigDecimal volume;
+
+	@ApiModelProperty(value = "补贴金额")
+	private BigDecimal subsidyAmount;
+
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java

@@ -4,6 +4,8 @@ import java.io.Serializable;
 import java.util.Date;
 import java.text.SimpleDateFormat;
 import java.math.BigDecimal;
+
+import org.springframework.data.annotation.Transient;
 import org.springframework.format.annotation.DateTimeFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -87,5 +89,25 @@ public class WorkOrder {
 	
 				@ApiModelProperty(value = "更新人")
 	private String updateBy;
+
+	@ApiModelProperty(value = "客户名称")
+	private String customerName;
+
+	@ApiModelProperty(value = "客户电话")
+	private String customerPhone;
+
+	@ApiModelProperty(value = "查看人数")
+	private Integer viewNum;
+
+
+
+	@Transient
+	@ApiModelProperty(value = "支付状态")
+	private String payStatusN;
+
+
+	@Transient
+	@ApiModelProperty(value = "发起客户")
+	private String companyName;
 	
 		}

common/src/main/java/com/jpsoft/employment/modules/base/service/CommentInfoService.java

@@ -13,5 +13,6 @@ public interface CommentInfoService {
 	int update(CommentInfo model);
 	int delete(String id);
 	List<CommentInfo> list();
+	List<CommentInfo> findByWorkOrderId(String workOrderId);
 	Page<CommentInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/ConstructionProgressService.java

@@ -0,0 +1,18 @@
+package com.jpsoft.employment.modules.base.service;
+
+import java.util.List;
+import java.util.Map;
+import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface ConstructionProgressService {
+	ConstructionProgress get(String id);
+	boolean exist(String id);
+	int insert(ConstructionProgress model);
+	int update(ConstructionProgress model);
+	int delete(String id);
+	List<ConstructionProgress> list();
+	List<ConstructionProgress> findByWorkOrderId(String workOrderId);
+	Page<ConstructionProgress> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/InstallationRequirementService.java

@@ -13,5 +13,6 @@ public interface InstallationRequirementService {
 	int update(InstallationRequirement model);
 	int delete(String id);
 	List<InstallationRequirement> list();
+	InstallationRequirement findByWorkOrderId(String workOrderId);
 	Page<InstallationRequirement> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/ReceiveRequireService.java

@@ -13,5 +13,6 @@ public interface ReceiveRequireService {
 	int update(ReceiveRequire model);
 	int delete(String id);
 	List<ReceiveRequire> list();
+	ReceiveRequire findByWorkOrderId(String workOrderId);
 	Page<ReceiveRequire> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 }

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/CommentInfoServiceImpl.java

@@ -58,6 +58,12 @@ public class CommentInfoServiceImpl implements CommentInfoService {
 		// TODO Auto-generated method stub
 		return commentInfoDAO.list();
 	}
+
+
+	@Override
+	public List<CommentInfo> findByWorkOrderId(String workOrderId){
+		return commentInfoDAO.findByWorkOrderId(workOrderId);
+	}
 		
 	@Override
 	public Page<CommentInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.java

@@ -0,0 +1,75 @@
+package com.jpsoft.employment.modules.base.service.impl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import javax.annotation.Resource;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import com.jpsoft.employment.modules.base.dao.ConstructionProgressDAO;
+import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
+import com.jpsoft.employment.modules.base.service.ConstructionProgressService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="constructionProgressService")
+public class ConstructionProgressServiceImpl implements ConstructionProgressService {
+	@Resource(name="constructionProgressDAO")
+	private ConstructionProgressDAO constructionProgressDAO;
+
+	@Override
+	public ConstructionProgress get(String id) {
+		// TODO Auto-generated method stub
+		return constructionProgressDAO.get(id);
+	}
+
+	@Override
+	public int insert(ConstructionProgress model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return constructionProgressDAO.insert(model);
+	}
+
+	@Override
+	public int update(ConstructionProgress model) {
+		// TODO Auto-generated method stub
+		return constructionProgressDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return constructionProgressDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = constructionProgressDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<ConstructionProgress> list() {
+		// TODO Auto-generated method stub
+		return constructionProgressDAO.list();
+	}
+
+	@Override
+	public List<ConstructionProgress> findByWorkOrderId(String workOrderId){
+		return constructionProgressDAO.findByWorkOrderId(workOrderId);
+	}
+		
+	@Override
+	public Page<ConstructionProgress> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<ConstructionProgress> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            constructionProgressDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/InstallationRequirementServiceImpl.java

@@ -58,6 +58,12 @@ public class InstallationRequirementServiceImpl implements InstallationRequireme
 		// TODO Auto-generated method stub
 		return installationRequirementDAO.list();
 	}
+
+
+	@Override
+	public InstallationRequirement findByWorkOrderId(String workOrderId){
+		return installationRequirementDAO.findByWorkOrderId(workOrderId);
+	}
 		
 	@Override
 	public Page<InstallationRequirement> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ReceiveRequireServiceImpl.java

@@ -58,6 +58,12 @@ public class ReceiveRequireServiceImpl implements ReceiveRequireService {
 		// TODO Auto-generated method stub
 		return receiveRequireDAO.list();
 	}
+
+
+	@Override
+	public ReceiveRequire findByWorkOrderId(String workOrderId){
+		return receiveRequireDAO.findByWorkOrderId(workOrderId);
+	}
 		
 	@Override
 	public Page<ReceiveRequire> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {

common/src/main/resources/mapper/base/CommentInfo.xml

@@ -95,6 +95,10 @@ id_,company_id,work_order_id,star_rating,content_,image_,date_time,create_time,u
 	<select id="list" resultMap="CommentInfoMap">
 		select * from base_comment_info
 	</select>
+	<select id="findByWorkOrderId" resultMap="CommentInfoMap">
+		select * from base_comment_info where del_flag=false and work_order_id=#{0}
+	</select>
+
 	<select id="search" parameterType="hashmap" resultMap="CommentInfoMap">
 		<![CDATA[
 			select * from base_comment_info

common/src/main/resources/mapper/base/ConstructionProgress.xml

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- namespace必须指向DAO接口 -->
+<mapper namespace="com.jpsoft.employment.modules.base.dao.ConstructionProgressDAO">
+	<resultMap id="ConstructionProgressMap" type="com.jpsoft.employment.modules.base.entity.ConstructionProgress">
+		<id property="id" column="id_" />
+			<result property="title" column="title_" />
+			<result property="image" column="image_" />
+			<result property="submitBy" column="submit_by" />
+			<result property="submitType" column="submit_type" />
+			<result property="submitTime" column="submit_time" />
+			<result property="workOrderId" column="work_order_id" />
+			<result property="index" column="index_" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			<result property="delFlag" column="del_flag" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.ConstructionProgress">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_construction_progress
+	    (id_,title_,image_,submit_by,submit_type,submit_time,work_order_id,index_,create_time,update_time,del_flag,create_by,update_by)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{title,jdbcType=VARCHAR}
+,#{image,jdbcType=VARCHAR}
+,#{submitBy,jdbcType=VARCHAR}
+,#{submitType,jdbcType=VARCHAR}
+,#{submitTime,jdbcType= TIMESTAMP }
+,#{workOrderId,jdbcType=VARCHAR}
+,#{index,jdbcType= NUMERIC }
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_construction_progress where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.ConstructionProgress">
+		update base_construction_progress
+		<set>
+				<if test="title!=null">
+		title_=#{title,jdbcType=VARCHAR},
+		</if>
+				<if test="image!=null">
+		image_=#{image,jdbcType=VARCHAR},
+		</if>
+				<if test="submitBy!=null">
+		submit_by=#{submitBy,jdbcType=VARCHAR},
+		</if>
+				<if test="submitType!=null">
+		submit_type=#{submitType,jdbcType=VARCHAR},
+		</if>
+				<if test="submitTime!=null">
+		submit_time=#{submitTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="workOrderId!=null">
+		work_order_id=#{workOrderId,jdbcType=VARCHAR},
+		</if>
+				<if test="index!=null">
+		index_=#{index,jdbcType= NUMERIC },
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="ConstructionProgressMap">
+		select 
+id_,title_,image_,submit_by,submit_type,submit_time,work_order_id,index_,create_time,update_time,del_flag,create_by,update_by		from base_construction_progress where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_construction_progress where id_=#{0}
+	</select>
+	<select id="list" resultMap="ConstructionProgressMap">
+		select * from base_construction_progress
+	</select>
+	<select id="findByWorkOrderId" resultMap="ConstructionProgressMap">
+		select * from base_construction_progress where del_flag=false and work_order_id=#{0}
+	</select>
+
+	<select id="search" parameterType="hashmap" resultMap="ConstructionProgressMap">
+		<![CDATA[
+			select * from base_construction_progress
+		]]>
+		<where>
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+</mapper>

common/src/main/resources/mapper/base/InstallationRequirement.xml

@@ -31,6 +31,13 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="map" column="map_" />
+			<result property="constructionLocation" column="construction_location" />
+			<result property="environment" column="environment" />
+			<result property="volume" column="volume_" />
+			<result property="material" column="material_" />
+			<result property="subsidyAmount" column="subsidy_amount" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.InstallationRequirement">
 	<!--
@@ -40,8 +47,8 @@
 	-->
 	<![CDATA[
 		insert into base_installation_requirement
-	    (id_,title_,address_,image_,location_,material
-_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance _criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance _criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by,
+	    map_,construction_location,environment,volume_,subsidy_amount)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -49,8 +56,7 @@ _,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budg
 ,#{address,jdbcType=VARCHAR}
 ,#{image,jdbcType=VARCHAR}
 ,#{location,jdbcType=VARCHAR}
-,#{material
-,jdbcType=VARCHAR}
+,#{material,jdbcType=VARCHAR}
 ,#{size,jdbcType= NUMERIC }
 ,#{numerical,jdbcType= NUMERIC }
 ,#{isIrregular,jdbcType= NUMERIC }
@@ -72,6 +78,11 @@ _,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budg
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{map,jdbcType=VARCHAR}
+,#{constructionLocation,jdbcType=VARCHAR}
+,#{environment,jdbcType=VARCHAR}
+,#{volume,jdbcType= NUMERIC }
+,#{subsidyAmount,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -159,12 +170,26 @@ _,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budg
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+		<if test="map!=null">
+			map_=#{map,jdbcType=VARCHAR},
+		</if>
+		<if test="constructionLocation!=null">
+			construction_location=#{constructionLocation,jdbcType=VARCHAR},
+		</if>
+		<if test="environment!=null">
+			environment=#{environment,jdbcType=VARCHAR},
+		</if>
+		<if test="volume!=null">
+			volume_=#{volume,jdbcType= NUMERIC },
+		</if>
+		<if test="subsidyAmount!=null">
+			subsidy_amount=#{subsidyAmount,jdbcType= NUMERIC },
+		</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="InstallationRequirementMap">
-		select 
-id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amount_,difficulty_,is_subsidy,subsidy_type,budget_,period_,termination_period,completion_pay_prop,requirement,stage_requirements,acceptance _criteria,sales_requirement,work_order_id,create_time,update_time,del_flag,create_by,update_by		from base_installation_requirement where id_=#{0}
+		select * from base_installation_requirement where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_installation_requirement where id_=#{0}
@@ -172,6 +197,9 @@ id_,title_,address_,image_,location_,material_,size_,numerical_,is_irregular,amo
 	<select id="list" resultMap="InstallationRequirementMap">
 		select * from base_installation_requirement
 	</select>
+	<select id="findByWorkOrderId" resultMap="InstallationRequirementMap">
+		select * from base_installation_requirement where del_flag=false and work_order_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="InstallationRequirementMap">
 		<![CDATA[
 			select * from base_installation_requirement

common/src/main/resources/mapper/base/ReceiveRequire.xml

@@ -95,6 +95,9 @@ id_,amount_,completed_num,is_qualification,is_insurance_certificate,order_model,
 	<select id="list" resultMap="ReceiveRequireMap">
 		select * from base_receive_require
 	</select>
+	<select id="findByWorkOrderId" resultMap="ReceiveRequireMap">
+		select * from base_receive_require where del_flag=false and work_order_id=#{0}
+	</select>
 	<select id="search" parameterType="hashmap" resultMap="ReceiveRequireMap">
 		<![CDATA[
 			select * from base_receive_require

common/src/main/resources/mapper/base/WorkOrder.xml

@@ -26,6 +26,10 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+			<result property="customerName" column="customer_name" />
+			<result property="customerPhone" column="customer_phone" />
+			<result property="viewNum" column="view_num" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
 	<!--
@@ -35,7 +39,8 @@
 	-->
 	<![CDATA[
 		insert into base_work_order
-	    (id_,number_,title_,address_,date_,tag_,image_,status_,price_,location_,company_id,map_,construction_location,environment,volume_,technician_id,pay_status,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,number_,title_,address_,date_,tag_,image_,status_,price_,location_,company_id,map_,construction_location,environment,volume_,technician_id,pay_status,create_time,update_time,del_flag,create_by,update_by,
+	    customer_name,customer_phone,view_num)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -60,6 +65,9 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{customerName,jdbcType=VARCHAR}
+,#{customerPhone,jdbcType=VARCHAR}
+,#{viewNum,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -132,12 +140,20 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="customerName!=null">
+				customer_name=#{customerName,jdbcType=VARCHAR},
+			</if>
+			<if test="customerPhone!=null">
+				customer_phone=#{customerPhone,jdbcType=VARCHAR},
+			</if>
+			<if test="viewNum!=null">
+				view_num=#{viewNum,jdbcType=NUMERIC},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="WorkOrderMap">
-		select 
-id_,number_,title_,address_,date_,tag_,image_,status_,price_,location_,company_id,map_,construction_location,environment,volume_,technician_id,pay_status,create_time,update_time,del_flag,create_by,update_by		from base_work_order where id_=#{0}
+		select * from base_work_order where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_work_order where id_=#{0}
@@ -150,6 +166,7 @@ id_,number_,title_,address_,date_,tag_,image_,status_,price_,location_,company_i
 			select * from base_work_order
 		]]>
 		<where>
+			del_flag = false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

web/src/main/java/com/jpsoft/employment/modules/base/controller/ConstructionProgressController.java

@@ -0,0 +1,227 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
+import com.jpsoft.employment.modules.base.service.ConstructionProgressService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/constructionProgress")
+public class ConstructionProgressController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ConstructionProgressService constructionProgressService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<ConstructionProgress> create(){
+        MessageResult<ConstructionProgress> msgResult = new MessageResult<>();
+
+        ConstructionProgress constructionProgress = new ConstructionProgress();
+
+        msgResult.setData(constructionProgress);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<ConstructionProgress> add(@RequestBody ConstructionProgress constructionProgress,@RequestAttribute String subject){
+        MessageResult<ConstructionProgress> msgResult = new MessageResult<>();
+
+        try {
+            constructionProgress.setId(UUID.randomUUID().toString());
+			constructionProgress.setDelFlag(false);
+            constructionProgress.setCreateBy(subject);
+            constructionProgress.setCreateTime(new Date());
+
+            int affectCount = constructionProgressService.insert(constructionProgress);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(constructionProgress);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<ConstructionProgress> edit(@PathVariable("id") String id){
+        MessageResult<ConstructionProgress> msgResult = new MessageResult<>();
+
+        try {
+            ConstructionProgress constructionProgress = constructionProgressService.get(id);
+
+            if (constructionProgress != null) {
+                msgResult.setResult(true);
+                msgResult.setData(constructionProgress);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<ConstructionProgress> update(@RequestBody ConstructionProgress constructionProgress,@RequestAttribute String subject){
+        MessageResult<ConstructionProgress> msgResult = new MessageResult<>();
+
+        try {
+		    constructionProgress.setUpdateBy(subject);
+            constructionProgress.setUpdateTime(new Date());
+		
+            int affectCount = constructionProgressService.update(constructionProgress);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(constructionProgress);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="删除用户")
+    @PostMapping("delete/{id}")
+    public MessageResult<ConstructionProgress> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<ConstructionProgress> msgResult = new MessageResult<>();
+
+        try {
+			
+			ConstructionProgress constructionProgress = constructionProgressService.get(id);
+            constructionProgress.setDelFlag(true);
+            constructionProgress.setUpdateBy(subject);
+            constructionProgress.setUpdateTime(new Date());
+			
+			int affectCount = constructionProgressService.update(constructionProgress);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                ConstructionProgress constructionProgress = constructionProgressService.get(id);
+                constructionProgress.setDelFlag(true);
+                constructionProgress.setUpdateBy(subject);
+                constructionProgress.setUpdateTime(new Date());
+
+                affectCount += constructionProgressService.update(constructionProgress);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String id,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParams.put("id","%" + id + "%");
+        }
+
+
+        Page<ConstructionProgress> page = constructionProgressService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}

web/src/main/java/com/jpsoft/employment/modules/base/controller/WorkOrderController.java

@@ -1,11 +1,13 @@
 package com.jpsoft.employment.modules.base.controller;
 
 import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
+import com.jpsoft.employment.modules.base.entity.*;
+import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
-import com.jpsoft.employment.modules.base.entity.WorkOrder;
-import com.jpsoft.employment.modules.base.service.WorkOrderService;
+import com.jpsoft.employment.modules.sys.service.DataDictionaryService;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -24,11 +26,31 @@ public class WorkOrderController {
 
     @Autowired
     private WorkOrderService workOrderService;
-	
-	
-	@ApiOperation(value="创建空记录")
+
+    @Autowired
+    private InstallationRequirementService installationRequirementService;
+
+    @Autowired
+    private ReceiveRequireService receiveRequireService;
+
+    @Autowired
+    private DataDictionaryService dataDictionaryService;
+
+    @Autowired
+    private CommentInfoService commentInfoService;
+
+    @Autowired
+    private CustomerInfoService customerInfoService;
+
+    @Autowired
+    private TechnicianInfoService technicianInfoService;
+
+    @Autowired
+    private ConstructionProgressService constructionProgressService;
+
+    @ApiOperation(value = "创建空记录")
     @GetMapping("create")
-    public MessageResult<WorkOrder> create(){
+    public MessageResult<WorkOrder> create() {
         MessageResult<WorkOrder> msgResult = new MessageResult<>();
 
         WorkOrder workOrder = new WorkOrder();
@@ -39,14 +61,14 @@ public class WorkOrderController {
         return msgResult;
     }
 
-    @ApiOperation(value="添加信息")
+    @ApiOperation(value = "添加信息")
     @PostMapping("add")
-    public MessageResult<WorkOrder> add(@RequestBody WorkOrder workOrder,@RequestAttribute String subject){
+    public MessageResult<WorkOrder> add(@RequestBody WorkOrder workOrder, @RequestAttribute String subject) {
         MessageResult<WorkOrder> msgResult = new MessageResult<>();
 
         try {
             workOrder.setId(UUID.randomUUID().toString());
-			workOrder.setDelFlag(false);
+            workOrder.setDelFlag(false);
             workOrder.setCreateBy(subject);
             workOrder.setCreateTime(new Date());
 
@@ -59,9 +81,8 @@ public class WorkOrderController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库添加失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -70,24 +91,93 @@ public class WorkOrderController {
         return msgResult;
     }
 
-    @ApiOperation(value="获取信息")
+    @ApiOperation(value = "获取信息")
     @GetMapping("edit/{id}")
-    public MessageResult<WorkOrder> edit(@PathVariable("id") String id){
-        MessageResult<WorkOrder> msgResult = new MessageResult<>();
+    public MessageResult<WorkOrderAllDataDTO> edit(@PathVariable("id") String id) {
+        MessageResult<WorkOrderAllDataDTO> msgResult = new MessageResult<>();
 
         try {
+            WorkOrderAllDataDTO dto = new WorkOrderAllDataDTO();
             WorkOrder workOrder = workOrderService.get(id);
 
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy/MM/dd");
+
             if (workOrder != null) {
+
+                InstallationRequirement installationRequirement = installationRequirementService.findByWorkOrderId(workOrder.getId());
+                dto.setInstallationRequirement(installationRequirement);
+
+                ReceiveRequire receiveRequire = receiveRequireService.findByWorkOrderId(id);
+                dto.setReceiveRequire(receiveRequire);
+
+                dto.setCustomerName(workOrder.getCustomerName());
+                dto.setCustomerPhone(workOrder.getCustomerPhone());
+
+                List<String> imageList = new ArrayList<>();
+
+                if (StringUtils.isNotEmpty(workOrder.getImage())) {
+                    String[] imageArr = workOrder.getImage().split(",");
+                    imageList = Arrays.asList(imageArr);
+                }
+
+                dto.setImageList(imageList);
+
+                dto.setWorkOrder(workOrder);
+
+                TechnicianInfo technicianInfo = technicianInfoService.get(workOrder.getTechnicianId());
+
+                if (technicianInfo != null) {
+                    dto.setTechnicianInfo(technicianInfo);
+                }
+
+                List<CommentInfo> commentInfoList = commentInfoService.findByWorkOrderId(id);
+
+                for (CommentInfo commentInfo : commentInfoList) {
+                    //获取评论人
+                    CustomerInfo customerInfo = customerInfoService.get(commentInfo.getCompanyId());
+                    if (customerInfo != null) {
+                        commentInfo.setCompanyName(customerInfo.getRealName());
+                    }
+                }
+
+                dto.setCommentInfoList(commentInfoList);
+
+                List<ConstructionProgress> ConstructionProgressList = constructionProgressService.findByWorkOrderId(id);
+
+                for (ConstructionProgress constructionProgress : ConstructionProgressList) {
+                    List<String> imageListPro = new ArrayList<>();
+                    if (StringUtils.isNotEmpty(constructionProgress.getImage())) {
+                        String[] imageArr = constructionProgress.getImage().split(",");
+                        imageListPro = Arrays.asList(imageArr);
+                    }
+
+                    constructionProgress.setImageList(imageListPro);
+
+                    if("1".equals(constructionProgress.getSubmitType())){
+                        CustomerInfo customerInfo = customerInfoService.get(constructionProgress.getSubmitBy());
+                        if(customerInfo!=null){
+                            constructionProgress.setSubmitByN(customerInfo.getRealName());
+                        }
+                    }else if("2".equals(constructionProgress.getSubmitType())){
+                        TechnicianInfo technicianInfo1 = technicianInfoService.get(constructionProgress.getSubmitBy());
+                        if(technicianInfo1!=null){
+                            constructionProgress.setSubmitByN(technicianInfo1.getRealName());
+                        }
+                    }
+
+                    constructionProgress.setSubmitDate(sdf.format(constructionProgress.getSubmitTime()));
+                }
+
+                dto.setConstructionProgressList(ConstructionProgressList);
+
                 msgResult.setResult(true);
-                msgResult.setData(workOrder);
+                msgResult.setData(dto);
             } else {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库不存在该记录!");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -96,15 +186,15 @@ public class WorkOrderController {
         return msgResult;
     }
 
-    @ApiOperation(value="更新用户")
+    @ApiOperation(value = "更新用户")
     @PostMapping("update")
-    public MessageResult<WorkOrder> update(@RequestBody WorkOrder workOrder,@RequestAttribute String subject){
+    public MessageResult<WorkOrder> update(@RequestBody WorkOrder workOrder, @RequestAttribute String subject) {
         MessageResult<WorkOrder> msgResult = new MessageResult<>();
 
         try {
-		    workOrder.setUpdateBy(subject);
+            workOrder.setUpdateBy(subject);
             workOrder.setUpdateTime(new Date());
-		
+
             int affectCount = workOrderService.update(workOrder);
 
             if (affectCount > 0) {
@@ -114,9 +204,8 @@ public class WorkOrderController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库更新失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -125,19 +214,19 @@ public class WorkOrderController {
         return msgResult;
     }
 
-    @ApiOperation(value="删除用户")
+    @ApiOperation(value = "删除用户")
     @PostMapping("delete/{id}")
-    public MessageResult<WorkOrder> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+    public MessageResult<WorkOrder> delete(@PathVariable("id") String id, @RequestAttribute String subject) {
         MessageResult<WorkOrder> msgResult = new MessageResult<>();
 
         try {
-			
-			WorkOrder workOrder = workOrderService.get(id);
+
+            WorkOrder workOrder = workOrderService.get(id);
             workOrder.setDelFlag(true);
             workOrder.setUpdateBy(subject);
             workOrder.setUpdateTime(new Date());
-			
-			int affectCount = workOrderService.update(workOrder);
+
+            int affectCount = workOrderService.update(workOrder);
 
             if (affectCount > 0) {
                 msgResult.setResult(true);
@@ -145,9 +234,8 @@ public class WorkOrderController {
                 msgResult.setResult(false);
                 msgResult.setMessage("数据库删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -157,9 +245,9 @@ public class WorkOrderController {
     }
 
 
-    @ApiOperation(value="批量删除")
+    @ApiOperation(value = "批量删除")
     @PostMapping("batchDelete")
-    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList, @RequestAttribute String subject) {
         MessageResult<Integer> msgResult = new MessageResult<>();
 
         try {
@@ -181,9 +269,8 @@ public class WorkOrderController {
                 msgResult.setResult(false);
                 msgResult.setMessage("删除失败");
             }
-        }
-        catch(Exception ex){
-            logger.error(ex.getMessage(),ex);
+        } catch (Exception ex) {
+            logger.error(ex.getMessage(), ex);
 
             msgResult.setResult(false);
             msgResult.setMessage(ex.getMessage());
@@ -192,31 +279,38 @@ public class WorkOrderController {
         return msgResult;
     }
 
-    @ApiOperation(value="列表")
-    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
     public MessageResult<Map> pageList(
             String id,
-            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
-            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
-            HttpServletRequest request){
-        String subject = (String)request.getAttribute("subject");
+            @RequestParam(value = "pageIndex", defaultValue = "1") int pageIndex,
+            @RequestParam(value = "pageSize", defaultValue = "20") int pageSize,
+            HttpServletRequest request) {
+        String subject = (String) request.getAttribute("subject");
 
         //当前用户ID
         System.out.println(subject);
 
         MessageResult<Map> msgResult = new MessageResult<>();
 
-        Map<String,Object> searchParams = new HashMap<>();
+        Map<String, Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time", "desc"));
 
         if (StringUtils.isNotEmpty(id)) {
-            searchParams.put("id","%" + id + "%");
+            searchParams.put("id", "%" + id + "%");
         }
 
 
-        Page<WorkOrder> page = workOrderService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        Page<WorkOrder> page = workOrderService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
+
+        for (WorkOrder workOrder:page) {
+            CustomerInfo customerInfo = customerInfoService.get(workOrder.getCompanyId());
+            if(customerInfo!=null){
+                workOrder.setCompanyName(customerInfo.getRealName());
+            }
+        }
 
 
         msgResult.setResult(true);

web/src/main/resources/application.yml

@@ -138,8 +138,8 @@ oss:
   endpoint: http://oss-cn-hangzhou.aliyuncs.com
   bucketName: rccs
 #  urlPrefix: http://rccs.oss-cn-hangzhou.aliyuncs.com
-  urlPrefix: http://oss.jzrccs.com
-  objectPre: enterprise
+  urlPrefix: https://oss.hbjp.com.cn
+  objectPre: water-tank