氩气合作方管理后台功能

搬运小工管理后台功能
运输方管理后台功能
移动端接口工单列表功能

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,56 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+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_argon_partner的实体类
+ */
+@Data
+@ApiModel(value = "base_argon_partner的实体类")
+public class ArgonPartner {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "合作方名称")
+	private String name;
+	
+				@ApiModelProperty(value = "所在地")
+	private String location;
+	
+				@ApiModelProperty(value = "联系人")
+	private String contact;
+	
+				@ApiModelProperty(value = "联系电话")
+	private String phone;
+	
+				@ApiModelProperty(value = "公司简介")
+	private String introduction;
+	
+					@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 String createBy;
+	
+				@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+				@ApiModelProperty(value = "删除标示")
+	private Boolean delFlag;
+	
+		}

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

@@ -70,5 +70,8 @@ public class CustomerInfo {
 
 	@ApiModelProperty(value = "企业名称")
 	private String companyName;
+
+	@ApiModelProperty(value = "审核状态（0：未审核，1：已审核）")
+	private String status;
 	
 		}

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

@@ -0,0 +1,53 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+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_laborer_info的实体类
+ */
+@Data
+@ApiModel(value = "base_laborer_info的实体类")
+public class LaborerInfo {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "搬运小工姓名")
+	private String name;
+	
+				@ApiModelProperty(value = "联系电话")
+	private String phone;
+	
+				@ApiModelProperty(value = "身份证号")
+	private String idCard;
+	
+				@ApiModelProperty(value = "年龄")
+	private Integer age;
+	
+					@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 String createBy;
+	
+				@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+				@ApiModelProperty(value = "删除标示")
+	private Boolean delFlag;
+	
+		}

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

@@ -0,0 +1,53 @@
+package com.jpsoft.employment.modules.base.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+import java.math.BigDecimal;
+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_transportation_info的实体类
+ */
+@Data
+@ApiModel(value = "base_transportation_info的实体类")
+public class TransportationInfo {
+		@ApiModelProperty(value = "ID")
+	private String id;
+	
+				@ApiModelProperty(value = "运输方名称")
+	private String name;
+	
+				@ApiModelProperty(value = "联系电话")
+	private String phone;
+	
+				@ApiModelProperty(value = "联系人")
+	private String contact;
+	
+				@ApiModelProperty(value = "公司简介")
+	private String introduction;
+	
+					@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 String createBy;
+	
+				@ApiModelProperty(value = "更新人")
+	private String updateBy;
+	
+				@ApiModelProperty(value = "删除标示")
+	private Boolean delFlag;
+	
+		}

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

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

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

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

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

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

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

@@ -2,6 +2,8 @@ package com.jpsoft.employment.modules.base.service;
 
 import java.util.List;
 import java.util.Map;
+
+import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
 import com.jpsoft.employment.modules.base.entity.WorkOrder;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -13,5 +15,7 @@ public interface WorkOrderService {
 	int update(WorkOrder model);
 	int delete(String id);
 	List<WorkOrder> list();
+	WorkOrderAllDataDTO getDtoList(WorkOrder workOrder);
+	Page<WorkOrder> pageSearchMobile(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
 	Page<WorkOrder> 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/ArgonPartnerServiceImpl.java

@@ -0,0 +1,70 @@
+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.ArgonPartnerDAO;
+import com.jpsoft.employment.modules.base.entity.ArgonPartner;
+import com.jpsoft.employment.modules.base.service.ArgonPartnerService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="argonPartnerService")
+public class ArgonPartnerServiceImpl implements ArgonPartnerService {
+	@Resource(name="argonPartnerDAO")
+	private ArgonPartnerDAO argonPartnerDAO;
+
+	@Override
+	public ArgonPartner get(String id) {
+		// TODO Auto-generated method stub
+		return argonPartnerDAO.get(id);
+	}
+
+	@Override
+	public int insert(ArgonPartner model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return argonPartnerDAO.insert(model);
+	}
+
+	@Override
+	public int update(ArgonPartner model) {
+		// TODO Auto-generated method stub
+		return argonPartnerDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return argonPartnerDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = argonPartnerDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<ArgonPartner> list() {
+		// TODO Auto-generated method stub
+		return argonPartnerDAO.list();
+	}
+		
+	@Override
+	public Page<ArgonPartner> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<ArgonPartner> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            argonPartnerDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -0,0 +1,70 @@
+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.LaborerInfoDAO;
+import com.jpsoft.employment.modules.base.entity.LaborerInfo;
+import com.jpsoft.employment.modules.base.service.LaborerInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="laborerInfoService")
+public class LaborerInfoServiceImpl implements LaborerInfoService {
+	@Resource(name="laborerInfoDAO")
+	private LaborerInfoDAO laborerInfoDAO;
+
+	@Override
+	public LaborerInfo get(String id) {
+		// TODO Auto-generated method stub
+		return laborerInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(LaborerInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return laborerInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(LaborerInfo model) {
+		// TODO Auto-generated method stub
+		return laborerInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return laborerInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = laborerInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<LaborerInfo> list() {
+		// TODO Auto-generated method stub
+		return laborerInfoDAO.list();
+	}
+		
+	@Override
+	public Page<LaborerInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<LaborerInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            laborerInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -0,0 +1,70 @@
+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.TransportationInfoDAO;
+import com.jpsoft.employment.modules.base.entity.TransportationInfo;
+import com.jpsoft.employment.modules.base.service.TransportationInfoService;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.github.pagehelper.PageHelper;
+
+@Transactional
+@Component(value="transportationInfoService")
+public class TransportationInfoServiceImpl implements TransportationInfoService {
+	@Resource(name="transportationInfoDAO")
+	private TransportationInfoDAO transportationInfoDAO;
+
+	@Override
+	public TransportationInfo get(String id) {
+		// TODO Auto-generated method stub
+		return transportationInfoDAO.get(id);
+	}
+
+	@Override
+	public int insert(TransportationInfo model) {
+		// TODO Auto-generated method stub
+		//model.setId(UUID.randomUUID().toString());
+		
+		return transportationInfoDAO.insert(model);
+	}
+
+	@Override
+	public int update(TransportationInfo model) {
+		// TODO Auto-generated method stub
+		return transportationInfoDAO.update(model);		
+	}
+
+	@Override
+	public int delete(String id) {
+		// TODO Auto-generated method stub
+		return transportationInfoDAO.delete(id);
+	}
+
+	@Override
+	public boolean exist(String id) {
+		// TODO Auto-generated method stub
+		int count = transportationInfoDAO.exist(id);
+		
+		return count > 0 ? true : false;
+	}
+	
+	@Override
+	public List<TransportationInfo> list() {
+		// TODO Auto-generated method stub
+		return transportationInfoDAO.list();
+	}
+		
+	@Override
+	public Page<TransportationInfo> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
+        Page<TransportationInfo> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
+            transportationInfoDAO.search(searchParams,sortList);
+        });
+        
+        return page;
+	}
+}

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

@@ -1,70 +1,181 @@
 package com.jpsoft.employment.modules.base.service.impl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import javax.annotation.Resource;
+
+import com.jpsoft.employment.modules.base.dao.*;
+import com.jpsoft.employment.modules.base.dto.WorkOrderAllDataDTO;
+import com.jpsoft.employment.modules.base.entity.*;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import com.jpsoft.employment.modules.base.dao.WorkOrderDAO;
-import com.jpsoft.employment.modules.base.entity.WorkOrder;
 import com.jpsoft.employment.modules.base.service.WorkOrderService;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
 @Transactional
-@Component(value="workOrderService")
+@Component(value = "workOrderService")
 public class WorkOrderServiceImpl implements WorkOrderService {
-	@Resource(name="workOrderDAO")
-	private WorkOrderDAO workOrderDAO;
-
-	@Override
-	public WorkOrder get(String id) {
-		// TODO Auto-generated method stub
-		return workOrderDAO.get(id);
-	}
-
-	@Override
-	public int insert(WorkOrder model) {
-		// TODO Auto-generated method stub
-		//model.setId(UUID.randomUUID().toString());
-		
-		return workOrderDAO.insert(model);
-	}
-
-	@Override
-	public int update(WorkOrder model) {
-		// TODO Auto-generated method stub
-		return workOrderDAO.update(model);		
-	}
-
-	@Override
-	public int delete(String id) {
-		// TODO Auto-generated method stub
-		return workOrderDAO.delete(id);
-	}
-
-	@Override
-	public boolean exist(String id) {
-		// TODO Auto-generated method stub
-		int count = workOrderDAO.exist(id);
-		
-		return count > 0 ? true : false;
-	}
-	
-	@Override
-	public List<WorkOrder> list() {
-		// TODO Auto-generated method stub
-		return workOrderDAO.list();
-	}
-		
-	@Override
-	public Page<WorkOrder> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize,boolean count,List<Sort> sortList) {
-        Page<WorkOrder> page = PageHelper.startPage(pageNumber,pageSize,count).doSelectPage(()->{
-            workOrderDAO.search(searchParams,sortList);
+    @Resource(name = "workOrderDAO")
+    private WorkOrderDAO workOrderDAO;
+
+    @Resource(name = "installationRequirementDAO")
+    private InstallationRequirementDAO installationRequirementDAO;
+
+    @Resource(name = "receiveRequireDAO")
+    private ReceiveRequireDAO receiveRequireDAO;
+
+    @Resource(name = "technicianInfoDAO")
+    private TechnicianInfoDAO technicianInfoDAO;
+
+    @Resource(name = "commentInfoDAO")
+    private CommentInfoDAO commentInfoDAO;
+
+    @Resource(name = "customerInfoDAO")
+    private CustomerInfoDAO customerInfoDAO;
+
+    @Resource(name = "constructionProgressDAO")
+    private ConstructionProgressDAO constructionProgressDAO;
+
+    @Override
+    public WorkOrder get(String id) {
+        // TODO Auto-generated method stub
+        return workOrderDAO.get(id);
+    }
+
+    @Override
+    public int insert(WorkOrder model) {
+        // TODO Auto-generated method stub
+        //model.setId(UUID.randomUUID().toString());
+
+        return workOrderDAO.insert(model);
+    }
+
+    @Override
+    public int update(WorkOrder model) {
+        // TODO Auto-generated method stub
+        return workOrderDAO.update(model);
+    }
+
+    @Override
+    public int delete(String id) {
+        // TODO Auto-generated method stub
+        return workOrderDAO.delete(id);
+    }
+
+    @Override
+    public boolean exist(String id) {
+        // TODO Auto-generated method stub
+        int count = workOrderDAO.exist(id);
+
+        return count > 0 ? true : false;
+    }
+
+    @Override
+    public List<WorkOrder> list() {
+        // TODO Auto-generated method stub
+        return workOrderDAO.list();
+    }
+
+    @Override
+    public WorkOrderAllDataDTO getDtoList(WorkOrder workOrder) {
+
+        String id = workOrder.getId();
+
+        SimpleDateFormat sdf=new SimpleDateFormat("yyyy/MM/dd");
+
+        WorkOrderAllDataDTO dto = new WorkOrderAllDataDTO();
+
+        InstallationRequirement installationRequirement = installationRequirementDAO.findByWorkOrderId(workOrder.getId());
+        dto.setInstallationRequirement(installationRequirement);
+
+        ReceiveRequire receiveRequire = receiveRequireDAO.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 = technicianInfoDAO.get(workOrder.getTechnicianId());
+
+        if (technicianInfo != null) {
+            dto.setTechnicianInfo(technicianInfo);
+        }
+
+        List<CommentInfo> commentInfoList = commentInfoDAO.findByWorkOrderId(id);
+
+        for (CommentInfo commentInfo : commentInfoList) {
+            //获取评论人
+            CustomerInfo customerInfo = customerInfoDAO.get(commentInfo.getCompanyId());
+            if (customerInfo != null) {
+                commentInfo.setCompanyName(customerInfo.getRealName());
+            }
+        }
+
+        dto.setCommentInfoList(commentInfoList);
+
+        List<ConstructionProgress> ConstructionProgressList = constructionProgressDAO.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 = customerInfoDAO.get(constructionProgress.getSubmitBy());
+                if (customerInfo != null) {
+                    constructionProgress.setSubmitByN(customerInfo.getRealName());
+                }
+            } else if ("2".equals(constructionProgress.getSubmitType())) {
+                TechnicianInfo technicianInfo1 = technicianInfoDAO.get(constructionProgress.getSubmitBy());
+                if (technicianInfo1 != null) {
+                    constructionProgress.setSubmitByN(technicianInfo1.getRealName());
+                }
+            }
+
+            constructionProgress.setSubmitDate(sdf.format(constructionProgress.getSubmitTime()));
+        }
+
+        dto.setConstructionProgressList(ConstructionProgressList);
+
+        return dto;
+    }
+
+
+    @Override
+    public Page<WorkOrder> pageSearch(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
+        Page<WorkOrder> page = PageHelper.startPage(pageNumber, pageSize, count).doSelectPage(() -> {
+            workOrderDAO.search(searchParams, sortList);
+        });
+
+        return page;
+    }
+
+
+    @Override
+    public Page<WorkOrder> pageSearchMobile(Map<String, Object> searchParams, int pageNumber, int pageSize, boolean count, List<Sort> sortList) {
+        Page<WorkOrder> page = PageHelper.startPage(pageNumber, pageSize, count).doSelectPage(() -> {
+            workOrderDAO.searchMobile(searchParams, sortList);
         });
-        
+
         return page;
-	}
+    }
+
+
 }

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

@@ -0,0 +1,107 @@
+<?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.ArgonPartnerDAO">
+	<resultMap id="ArgonPartnerMap" type="com.jpsoft.employment.modules.base.entity.ArgonPartner">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="location" column="location_" />
+			<result property="contact" column="contact_" />
+			<result property="phone" column="phone_" />
+			<result property="introduction" column="introduction_" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="ArgonPartner">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_argon_partner
+	    (id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{location,jdbcType=VARCHAR}
+,#{contact,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{introduction,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_argon_partner where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.ArgonPartner">
+		update base_argon_partner
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="location!=null">
+		location_=#{location,jdbcType=VARCHAR},
+		</if>
+				<if test="contact!=null">
+		contact_=#{contact,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="introduction!=null">
+		introduction_=#{introduction,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="ArgonPartnerMap">
+		select 
+id_,name_,location_,contact_,phone_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_argon_partner where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_argon_partner where id_=#{0}
+	</select>
+	<select id="list" resultMap="ArgonPartnerMap">
+		select * from base_argon_partner
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="ArgonPartnerMap">
+		<![CDATA[
+			select * from base_argon_partner
+		]]>
+		<where>
+			del_flag=false
+			<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/CustomerInfo.xml

@@ -21,6 +21,8 @@
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
 			<result property="companyName" column="company_name" />
+			<result property="status" column="status_" />
+
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.CustomerInfo">
 	<!--
@@ -30,7 +32,7 @@
 	-->
 	<![CDATA[
 		insert into base_customer_info
-	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name)
+	    (id_,user_name,password_,open_id,phone_,id_card,id_card_image,real_name,gender_,region_,image_,create_time,update_time,del_flag,create_by,update_by,company_name,status_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -50,6 +52,7 @@
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{companyName,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -107,6 +110,9 @@
 			<if test="companyName!=null">
 				company_name=#{companyName,jdbcType=VARCHAR},
 			</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

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

@@ -0,0 +1,101 @@
+<?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.LaborerInfoDAO">
+	<resultMap id="LaborerInfoMap" type="com.jpsoft.employment.modules.base.entity.LaborerInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="phone" column="phone_" />
+			<result property="idCard" column="id_card" />
+			<result property="age" column="age_" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="LaborerInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_laborer_info
+	    (id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{idCard,jdbcType=VARCHAR}
+,#{age,jdbcType= NUMERIC }
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_laborer_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.LaborerInfo">
+		update base_laborer_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="idCard!=null">
+		id_card=#{idCard,jdbcType=VARCHAR},
+		</if>
+				<if test="age!=null">
+		age_=#{age,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="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="LaborerInfoMap">
+		select 
+id_,name_,phone_,id_card,age_,create_time,update_time,create_by,update_by,del_flag		from base_laborer_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_laborer_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="LaborerInfoMap">
+		select * from base_laborer_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="LaborerInfoMap">
+		<![CDATA[
+			select * from base_laborer_info
+		]]>
+		<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/TransportationInfo.xml

@@ -0,0 +1,101 @@
+<?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.TransportationInfoDAO">
+	<resultMap id="TransportationInfoMap" type="com.jpsoft.employment.modules.base.entity.TransportationInfo">
+		<id property="id" column="id_" />
+			<result property="name" column="name_" />
+			<result property="phone" column="phone_" />
+			<result property="contact" column="contact_" />
+			<result property="introduction" column="introduction_" />
+			<result property="createTime" column="create_time" />
+			<result property="updateTime" column="update_time" />
+			<result property="createBy" column="create_by" />
+			<result property="updateBy" column="update_by" />
+			<result property="delFlag" column="del_flag" />
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TransportationInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_transportation_info
+	    (id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{name,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{contact,jdbcType=VARCHAR}
+,#{introduction,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{delFlag,jdbcType= NUMERIC }
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_transportation_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.TransportationInfo">
+		update base_transportation_info
+		<set>
+				<if test="name!=null">
+		name_=#{name,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="contact!=null">
+		contact_=#{contact,jdbcType=VARCHAR},
+		</if>
+				<if test="introduction!=null">
+		introduction_=#{introduction,jdbcType=VARCHAR},
+		</if>
+				<if test="createTime!=null">
+		create_time=#{createTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="updateTime!=null">
+		update_time=#{updateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="createBy!=null">
+		create_by=#{createBy,jdbcType=VARCHAR},
+		</if>
+				<if test="updateBy!=null">
+		update_by=#{updateBy,jdbcType=VARCHAR},
+		</if>
+				<if test="delFlag!=null">
+		del_flag=#{delFlag,jdbcType= NUMERIC },
+		</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="TransportationInfoMap">
+		select 
+id_,name_,phone_,contact_,introduction_,create_time,update_time,create_by,update_by,del_flag		from base_transportation_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_transportation_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="TransportationInfoMap">
+		select * from base_transportation_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="TransportationInfoMap">
+		<![CDATA[
+			select * from base_transportation_info
+		]]>
+		<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/WorkOrder.xml

@@ -175,4 +175,19 @@
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+
+	<select id="searchMobile" parameterType="hashmap" resultMap="WorkOrderMap">
+		<![CDATA[
+			select * from base_work_order
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
 </mapper>

web/src/main/java/com/jpsoft/employment/modules/base/controller/ArgonPartnerController.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.ArgonPartner;
+import com.jpsoft.employment.modules.base.service.ArgonPartnerService;
+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("/base/argonPartner")
+public class ArgonPartnerController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private ArgonPartnerService argonPartnerService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<ArgonPartner> create(){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        ArgonPartner argonPartner = new ArgonPartner();
+
+        msgResult.setData(argonPartner);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<ArgonPartner> add(@RequestBody ArgonPartner argonPartner,@RequestAttribute String subject){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        try {
+            argonPartner.setId(UUID.randomUUID().toString());
+			argonPartner.setDelFlag(false);
+            argonPartner.setCreateBy(subject);
+            argonPartner.setCreateTime(new Date());
+
+            int affectCount = argonPartnerService.insert(argonPartner);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(argonPartner);
+            } 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<ArgonPartner> edit(@PathVariable("id") String id){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        try {
+            ArgonPartner argonPartner = argonPartnerService.get(id);
+
+            if (argonPartner != null) {
+                msgResult.setResult(true);
+                msgResult.setData(argonPartner);
+            } 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<ArgonPartner> update(@RequestBody ArgonPartner argonPartner,@RequestAttribute String subject){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        try {
+		    argonPartner.setUpdateBy(subject);
+            argonPartner.setUpdateTime(new Date());
+		
+            int affectCount = argonPartnerService.update(argonPartner);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(argonPartner);
+            } 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<ArgonPartner> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<ArgonPartner> msgResult = new MessageResult<>();
+
+        try {
+			
+			ArgonPartner argonPartner = argonPartnerService.get(id);
+            argonPartner.setDelFlag(true);
+            argonPartner.setUpdateBy(subject);
+            argonPartner.setUpdateTime(new Date());
+			
+			int affectCount = argonPartnerService.update(argonPartner);
+
+            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) {
+                ArgonPartner argonPartner = argonPartnerService.get(id);
+                argonPartner.setDelFlag(true);
+                argonPartner.setUpdateBy(subject);
+                argonPartner.setUpdateTime(new Date());
+
+                affectCount += argonPartnerService.update(argonPartner);
+            }
+
+            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<ArgonPartner> page = argonPartnerService.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/LaborerInfoController.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.LaborerInfo;
+import com.jpsoft.employment.modules.base.service.LaborerInfoService;
+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("/base/laborerInfo")
+public class LaborerInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private LaborerInfoService laborerInfoService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<LaborerInfo> create(){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        LaborerInfo laborerInfo = new LaborerInfo();
+
+        msgResult.setData(laborerInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<LaborerInfo> add(@RequestBody LaborerInfo laborerInfo,@RequestAttribute String subject){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        try {
+            laborerInfo.setId(UUID.randomUUID().toString());
+			laborerInfo.setDelFlag(false);
+            laborerInfo.setCreateBy(subject);
+            laborerInfo.setCreateTime(new Date());
+
+            int affectCount = laborerInfoService.insert(laborerInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(laborerInfo);
+            } 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<LaborerInfo> edit(@PathVariable("id") String id){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        try {
+            LaborerInfo laborerInfo = laborerInfoService.get(id);
+
+            if (laborerInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(laborerInfo);
+            } 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<LaborerInfo> update(@RequestBody LaborerInfo laborerInfo,@RequestAttribute String subject){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        try {
+		    laborerInfo.setUpdateBy(subject);
+            laborerInfo.setUpdateTime(new Date());
+		
+            int affectCount = laborerInfoService.update(laborerInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(laborerInfo);
+            } 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<LaborerInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<LaborerInfo> msgResult = new MessageResult<>();
+
+        try {
+			
+			LaborerInfo laborerInfo = laborerInfoService.get(id);
+            laborerInfo.setDelFlag(true);
+            laborerInfo.setUpdateBy(subject);
+            laborerInfo.setUpdateTime(new Date());
+			
+			int affectCount = laborerInfoService.update(laborerInfo);
+
+            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) {
+                LaborerInfo laborerInfo = laborerInfoService.get(id);
+                laborerInfo.setDelFlag(true);
+                laborerInfo.setUpdateBy(subject);
+                laborerInfo.setUpdateTime(new Date());
+
+                affectCount += laborerInfoService.update(laborerInfo);
+            }
+
+            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<LaborerInfo> page = laborerInfoService.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/TransportationInfoController.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.TransportationInfo;
+import com.jpsoft.employment.modules.base.service.TransportationInfoService;
+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("/base/transportationInfo")
+public class TransportationInfoController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private TransportationInfoService transportationInfoService;
+	
+	
+	@ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<TransportationInfo> create(){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        TransportationInfo transportationInfo = new TransportationInfo();
+
+        msgResult.setData(transportationInfo);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<TransportationInfo> add(@RequestBody TransportationInfo transportationInfo,@RequestAttribute String subject){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        try {
+            transportationInfo.setId(UUID.randomUUID().toString());
+			transportationInfo.setDelFlag(false);
+            transportationInfo.setCreateBy(subject);
+            transportationInfo.setCreateTime(new Date());
+
+            int affectCount = transportationInfoService.insert(transportationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(transportationInfo);
+            } 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<TransportationInfo> edit(@PathVariable("id") String id){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        try {
+            TransportationInfo transportationInfo = transportationInfoService.get(id);
+
+            if (transportationInfo != null) {
+                msgResult.setResult(true);
+                msgResult.setData(transportationInfo);
+            } 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<TransportationInfo> update(@RequestBody TransportationInfo transportationInfo,@RequestAttribute String subject){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        try {
+		    transportationInfo.setUpdateBy(subject);
+            transportationInfo.setUpdateTime(new Date());
+		
+            int affectCount = transportationInfoService.update(transportationInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(transportationInfo);
+            } 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<TransportationInfo> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<TransportationInfo> msgResult = new MessageResult<>();
+
+        try {
+			
+			TransportationInfo transportationInfo = transportationInfoService.get(id);
+            transportationInfo.setDelFlag(true);
+            transportationInfo.setUpdateBy(subject);
+            transportationInfo.setUpdateTime(new Date());
+			
+			int affectCount = transportationInfoService.update(transportationInfo);
+
+            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) {
+                TransportationInfo transportationInfo = transportationInfoService.get(id);
+                transportationInfo.setDelFlag(true);
+                transportationInfo.setUpdateBy(subject);
+                transportationInfo.setUpdateTime(new Date());
+
+                affectCount += transportationInfoService.update(transportationInfo);
+            }
+
+            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<TransportationInfo> page = transportationInfoService.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

@@ -97,78 +97,10 @@ public class WorkOrderController {
         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);
+                WorkOrderAllDataDTO dto = workOrderService.getDtoList(workOrder);
 
                 msgResult.setResult(true);
                 msgResult.setData(dto);
@@ -305,9 +237,9 @@ public class WorkOrderController {
 
         Page<WorkOrder> page = workOrderService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
 
-        for (WorkOrder workOrder:page) {
+        for (WorkOrder workOrder : page) {
             CustomerInfo customerInfo = customerInfoService.get(workOrder.getCompanyId());
-            if(customerInfo!=null){
+            if (customerInfo != null) {
                 workOrder.setCompanyName(customerInfo.getRealName());
             }
         }

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java

@@ -1,12 +1,29 @@
 package com.jpsoft.employment.modules.mobile.controller;
 
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.base.entity.CustomerInfo;
+import com.jpsoft.employment.modules.base.entity.WorkOrder;
+import com.jpsoft.employment.modules.base.service.CustomerInfoService;
 import com.jpsoft.employment.modules.base.service.WorkOrderService;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.utils.PojoUtils;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/mobile/workOrder")
 public class WorkOrderApiController {
@@ -14,4 +31,51 @@ public class WorkOrderApiController {
 
     @Autowired
     private WorkOrderService workOrderService;
+
+    @Autowired
+    private CustomerInfoService customerInfoService;
+
+
+
+    @ApiOperation(value = "列表")
+    @RequestMapping(value = "pageList", method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String status,
+            @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("create_time", "desc"));
+
+        if (StringUtils.isNotEmpty(status)) {
+            searchParams.put("status", status);
+        }
+
+
+        Page<WorkOrder> page = workOrderService.pageSearchMobile(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);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
 }