师傅端移动接口

.idea/workspace.xml

@@ -8,28 +8,27 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_16_8_11____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_16_8_11____.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/shelf/_2025_10_9_9_16____.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/PrizeDAO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Prize.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/PrizeService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/PrizeServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Prize.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/base/controller/PrizeController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dto/TechnicianDTO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Deposit.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/Deposit.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Deposit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/Deposit.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/RevenueInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/RevenueInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/AboutUsDAO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dto/TechnicianDTO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/AboutUs.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/ReceiveRequire.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/AboutUsService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/AboutUsServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/WorkOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/RevenueInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/RevenueInfo.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/RevenueInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/RevenueInfoService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/RevenueInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/RevenueInfoServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/TechnicianInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Deposit.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/Deposit.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TechnicianInfo.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/TechnicianInfo.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/Deposit.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/Deposit.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/TechnicianInfo.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/MessageApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CustomerInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/CustomerInfoController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/CustomerInfoApiController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/MessageApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/MessageApiController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -372,20 +371,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
-    &quot;应用程序.EmploymentApplication.executor&quot;: &quot;Debug&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ASKED_ADD_EXTERNAL_FILES": "true",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "D:/Projects Files/水箱定制项目/water-tank-installation-server/web/src/main/java/com/jpsoft/employment/modules/base/controller",
+    "settings.editor.selected.configurable": "MavenSettings",
+    "应用程序.EmploymentApplication.executor": "Debug"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\Projects Files\水箱定制项目\water-tank-installation-server\web\src\main\java\com\jpsoft\employment\modules\base\controller" />
+      <recent name="D:\Projects Files\水箱定制项目\water-tank-installation-server\common\src\main\resources\mapper\base" />
       <recent name="D:\java\idea-workspace\water-tank-installation-server\web\src\main\java\com\jpsoft\employment\modules\base\controller" />
       <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\service\impl" />
       <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\service" />
-      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\java\com\jpsoft\employment\modules\base\dao" />
-      <recent name="D:\java\idea-workspace\water-tank-installation-server\common\src\main\resources\mapper\base" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.jpsoft.employment.modules.mobile.controller" />
@@ -494,7 +495,15 @@
       <option name="project" value="LOCAL" />
       <updated>1761698117022</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="师傅端移动接口">
+      <option name="closed" value="true" />
+      <created>1762134335301</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1762134335301</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
@@ -597,6 +606,7 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
+    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
     <MESSAGE value="1.氩气合作方功能，搬运小工管理功能，运输方功能，&#10;2.客户中心手机端接口&#10;3.客户首页数据接口" />
     <MESSAGE value="客户端移动端接口&#10;1.客户主页&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
     <MESSAGE value="客户端移动端接口&#10;1.客户主页后台接口新增&#10;2.客户发布工单详情&#10;3.客户合作方列表" />
@@ -604,17 +614,6 @@
     <MESSAGE value="师傅端移动接口" />
     <option name="LAST_COMMIT_MESSAGE" value="师傅端移动接口" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-line">
-          <url>file://$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java</url>
-          <line>512</line>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />

common/src/main/java/com/jpsoft/employment/modules/base/dao/PrizeDAO.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.Prize;
+import java.util.Map;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+@Repository
+public interface PrizeDAO {
+	int insert(Prize entity);
+	int update(Prize entity);
+	int exist(String id);
+	Prize get(String id);
+	int delete(String id);
+	List<Prize> list();
+	List<Prize> search(Map<String,Object> searchParams,List<Sort> sortList);
+	Integer getRevenueAmount(String promoterId);
+}

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

@@ -0,0 +1,175 @@
+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;
+
+/**
+  描述:base_prize的实体类
+ */
+public class Prize {
+	private String id;
+	private String promoterId;
+	private String customerId;
+	private BigDecimal amount;
+	private Date dateTime;
+	private String status;
+	private Date createTime;
+	private Date updateTime;
+	private Boolean delFlag;
+	private String createBy;
+	private String updateBy;
+	
+		/**
+	 *获取ID
+	 */
+	public String getId(){
+		return id;
+	}
+	
+	/**
+	 *设置ID
+	 */
+	public void setId(String id){
+		this.id = id;
+	}
+		/**
+	 *获取推广人ID
+	 */
+	public String getPromoterId(){
+		return promoterId;
+	}
+	
+	/**
+	 *设置推广人ID
+	 */
+	public void setPromoterId(String promoterId){
+		this.promoterId = promoterId;
+	}
+		/**
+	 *获取被推广人ID
+	 */
+	public String getCustomerId(){
+		return customerId;
+	}
+	
+	/**
+	 *设置被推广人ID
+	 */
+	public void setCustomerId(String customerId){
+		this.customerId = customerId;
+	}
+		/**
+	 *获取收益金额
+	 */
+	public BigDecimal getAmount(){
+		return amount;
+	}
+	
+	/**
+	 *设置收益金额
+	 */
+	public void setAmount(BigDecimal amount){
+		this.amount = amount;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+		/**
+	 *获取收益时间
+	 */
+	public Date getDateTime(){
+		return dateTime;
+	}
+	
+	/**
+	 *设置收益时间
+	 */
+	public void setDateTime(Date dateTime){
+		this.dateTime = dateTime;
+	}
+		/**
+	 *获取状态（1：未到账，2：已到账）
+	 */
+	public String getStatus(){
+		return status;
+	}
+	
+	/**
+	 *设置状态（1：未到账，2：已到账）
+	 */
+	public void setStatus(String status){
+		this.status = status;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+		/**
+	 *获取创建时间
+	 */
+	public Date getCreateTime(){
+		return createTime;
+	}
+	
+	/**
+	 *设置创建时间
+	 */
+	public void setCreateTime(Date createTime){
+		this.createTime = createTime;
+	}
+		@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+		/**
+	 *获取更新时间
+	 */
+	public Date getUpdateTime(){
+		return updateTime;
+	}
+	
+	/**
+	 *设置更新时间
+	 */
+	public void setUpdateTime(Date updateTime){
+		this.updateTime = updateTime;
+	}
+		/**
+	 *获取删除标示
+	 */
+	public Boolean getDelFlag(){
+		return delFlag;
+	}
+	
+	/**
+	 *设置删除标示
+	 */
+	public void setDelFlag(Boolean delFlag){
+		this.delFlag = delFlag;
+	}
+		/**
+	 *获取创建人
+	 */
+	public String getCreateBy(){
+		return createBy;
+	}
+	
+	/**
+	 *设置创建人
+	 */
+	public void setCreateBy(String createBy){
+		this.createBy = createBy;
+	}
+		/**
+	 *获取更新人
+	 */
+	public String getUpdateBy(){
+		return updateBy;
+	}
+	
+	/**
+	 *设置更新人
+	 */
+	public void setUpdateBy(String updateBy){
+		this.updateBy = updateBy;
+	}
+}

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

@@ -119,6 +119,12 @@ public class TechnicianInfo {
 	@ApiModelProperty(value = "收款账号")
 	private String receiptAddress;
 
+	@ApiModelProperty(value = "推广人")
+	private String promoter;
+
+	@ApiModelProperty(value = "奖金发放（0：未发放，1：已发放）")
+	private Boolean issue;
+
 
 	@Transient
 	@ApiModelProperty(value = "完成单数")

common/src/main/java/com/jpsoft/employment/modules/base/service/PrizeService.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.Prize;
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+
+public interface PrizeService {
+	Prize get(String id);
+	boolean exist(String id);
+	int insert(Prize model);
+	int update(Prize model);
+	int delete(String id);
+	List<Prize> list();
+	Page<Prize> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,List<Sort> sortList);
+	int getRevenueAmount(String promoterId);
+}

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

@@ -14,5 +14,5 @@ public interface RevenueInfoService {
 	int delete(String id);
 	List<RevenueInfo> list();
 	Page<RevenueInfo> pageSearch(Map<String, Object> searchParams,int pageNum,int pageSize,boolean count,List<Sort> sortList);
-	Integer getRevenueAmount(Boolean paid, String technicianId);
+	int getRevenueAmount(Boolean paid, String technicianId);
 }

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

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

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

@@ -69,8 +69,10 @@ public class RevenueInfoServiceImpl implements RevenueInfoService {
 	}
 
 	@Override
-	public Integer getRevenueAmount(Boolean paid, String technicianId) {
-		// TODO Auto-generated method stub
-		return revenueInfoDAO.getRevenueAmount(paid, technicianId);
+	public int getRevenueAmount(Boolean paid, String technicianId) {
+		Integer amount = revenueInfoDAO.getRevenueAmount(paid, technicianId);
+		if(amount == null)
+			amount = 0;
+		return amount;
 	}
 }

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

@@ -0,0 +1,111 @@
+<?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.PrizeDAO">
+	<resultMap id="PrizeMap" type="com.jpsoft.employment.modules.base.entity.Prize">
+		<id property="id" column="id_" />
+			<result property="promoterId" column="promoter_id" />
+			<result property="customerId" column="customer_id" />
+			<result property="amount" column="amount_" />
+			<result property="dateTime" column="date_time" />
+			<result property="status" column="status_" />
+			<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.Prize">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_prize
+	    (id_,promoter_id,customer_id,amount_,date_time,status_,create_time,update_time,del_flag,create_by,update_by)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{promoterId,jdbcType=VARCHAR}
+,#{customerId,jdbcType=VARCHAR}
+,#{amount,jdbcType= NUMERIC }
+,#{dateTime,jdbcType= TIMESTAMP }
+,#{status,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_prize where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.Prize">
+		update base_prize
+		<set>
+				<if test="promoterId!=null">
+		promoter_id=#{promoterId,jdbcType=VARCHAR},
+		</if>
+				<if test="customerId!=null">
+		customer_id=#{customerId,jdbcType=VARCHAR},
+		</if>
+				<if test="amount!=null">
+		amount_=#{amount,jdbcType= NUMERIC },
+		</if>
+				<if test="dateTime!=null">
+		date_time=#{dateTime,jdbcType= TIMESTAMP },
+		</if>
+				<if test="status!=null">
+		status_=#{status,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="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="PrizeMap">
+		select 
+id_,promoter_id,customer_id,amount_,date_time,status_,create_time,update_time,del_flag,create_by,update_by		from base_prize where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_prize where id_=#{0}
+	</select>
+	<select id="list" resultMap="PrizeMap">
+		select * from base_prize
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="PrizeMap">
+		<![CDATA[
+			select * from base_prize
+		]]>
+		<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>
+	<select id="getRevenueAmount" resultType="int">
+		SELECT SUM(amount_) FROM base_prize
+		WHERE del_flag = FALSE
+		AND promoter_id = #{0}
+	</select>
+</mapper>

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

@@ -36,6 +36,8 @@
 		<result property="receiptPhone" column="receipt_phone" />
 		<result property="receiptRegion" column="receipt_region" />
 		<result property="receiptAddress" column="receipt_address" />
+		<result property="promoter" column="promoter_" />
+		<result property="issue" column="issue_" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
 	<!--
@@ -45,7 +47,7 @@
 	-->
 	<![CDATA[
 		insert into base_technician_info
-	    (id_,user_name,password_,open_id,phone_,id_card,real_name,region_,image_,gender_,introduction_,service_info,business_scope,id_card_image,is_verified,promo_code,create_time,update_time,del_flag,create_by,update_by,status_,level_,deposit_,qualification_,receive_name,receive_bank,receive_account,receipt_name,receipt_phone,receipt_region,receipt_address)
+	    (id_,user_name,password_,open_id,phone_,id_card,real_name,region_,image_,gender_,introduction_,service_info,business_scope,id_card_image,is_verified,promo_code,create_time,update_time,del_flag,create_by,update_by,status_,level_,deposit_,qualification_,receive_name,receive_bank,receive_account,receipt_name,receipt_phone,receipt_region,receipt_address,promoter_,issue_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -80,6 +82,8 @@
 ,#{receiptPhone,jdbcType= VARCHAR }
 ,#{receiptRegion,jdbcType= VARCHAR }
 ,#{receiptAddress,jdbcType= VARCHAR }
+,#{promoter,jdbcType= VARCHAR }
+,#{issue,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -179,6 +183,12 @@
 			<if test="receiptAddress!=null">
 				receipt_address=#{receiptAddress,jdbcType=VARCHAR},
 			</if>
+			<if test="promoter!=null">
+				promoter_=#{promoter,jdbcType=VARCHAR},
+			</if>
+			<if test="issue!=null">
+				issue_=#{issue,jdbcType=NUMERIC},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -202,6 +212,12 @@
 			<if test="searchParams.id != null">
 				and real_name like #{searchParams.id}
 			</if>
+			<if test="searchParams.promoter != null">
+				and promoter_ = #{searchParams.promoter}
+			</if>
+			<if test="searchParams.issue != null">
+				and issue_ = #{searchParams.issue}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

common/target/classes/mapper/base/Deposit.xml

@@ -15,6 +15,7 @@
 			<result property="delFlag" column="del_flag" />
 			<result property="createBy" column="create_by" />
 			<result property="updateBy" column="update_by" />
+		<result property="payImages" column="pay_images" />
 			</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.Deposit">
 	<!--
@@ -24,7 +25,7 @@
 	-->
 	<![CDATA[
 		insert into base_deposit
-	    (id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by)
+	    (id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by,pay_images)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -38,6 +39,7 @@
 ,#{delFlag,jdbcType= NUMERIC }
 ,#{createBy,jdbcType=VARCHAR}
 ,#{updateBy,jdbcType=VARCHAR}
+,#{payImages,jdbcType=VARCHAR}
 		)
 	]]>
 	</insert>
@@ -77,12 +79,14 @@
 				<if test="updateBy!=null">
 		update_by=#{updateBy,jdbcType=VARCHAR},
 		</if>
+			<if test="payImages!=null">
+				pay_images=#{payImages,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="DepositMap">
-		select 
-id_,amount_,technician_id,pay_type,pay_status_,pay_time,create_time,update_time,del_flag,create_by,update_by		from base_deposit where id_=#{0}
+		select * from base_deposit where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_deposit where id_=#{0}

common/target/classes/mapper/base/TechnicianInfo.xml

@@ -36,6 +36,8 @@
 		<result property="receiptPhone" column="receipt_phone" />
 		<result property="receiptRegion" column="receipt_region" />
 		<result property="receiptAddress" column="receipt_address" />
+		<result property="promoter" column="promoter_" />
+		<result property="issue" column="issue_" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
 	<!--
@@ -45,7 +47,7 @@
 	-->
 	<![CDATA[
 		insert into base_technician_info
-	    (id_,user_name,password_,open_id,phone_,id_card,real_name,region_,image_,gender_,introduction_,service_info,business_scope,id_card_image,is_verified,promo_code,create_time,update_time,del_flag,create_by,update_by,status_,level_,deposit_,qualification_,receive_name,receive_bank,receive_account,receipt_name,receipt_phone,receipt_region,receipt_address)
+	    (id_,user_name,password_,open_id,phone_,id_card,real_name,region_,image_,gender_,introduction_,service_info,business_scope,id_card_image,is_verified,promo_code,create_time,update_time,del_flag,create_by,update_by,status_,level_,deposit_,qualification_,receive_name,receive_bank,receive_account,receipt_name,receipt_phone,receipt_region,receipt_address,promoter_,issue_)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -80,6 +82,8 @@
 ,#{receiptPhone,jdbcType= VARCHAR }
 ,#{receiptRegion,jdbcType= VARCHAR }
 ,#{receiptAddress,jdbcType= VARCHAR }
+,#{promoter,jdbcType= VARCHAR }
+,#{issue,jdbcType= NUMERIC }
 		)
 	]]>
 	</insert>
@@ -179,6 +183,12 @@
 			<if test="receiptAddress!=null">
 				receipt_address=#{receiptAddress,jdbcType=VARCHAR},
 			</if>
+			<if test="promoter!=null">
+				promoter_=#{promoter,jdbcType=VARCHAR},
+			</if>
+			<if test="issue!=null">
+				issue_=#{issue,jdbcType=NUMERIC},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -202,6 +212,12 @@
 			<if test="searchParams.id != null">
 				and real_name like #{searchParams.id}
 			</if>
+			<if test="searchParams.promoter != null">
+				and promoter_ = #{searchParams.promoter}
+			</if>
+			<if test="searchParams.issue != null">
+				and issue_ = #{searchParams.issue}
+			</if>
 		</where>
 		<foreach item="sort" collection="sortList"  open="order by" separator=",">
 	        ${sort.name} ${sort.order}

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

@@ -0,0 +1,190 @@
+package com.jpsoft.employment.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.employment.modules.common.dto.Sort;
+import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.base.entity.Prize;
+import com.jpsoft.employment.modules.base.service.PrizeService;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.mapping.ResultMap;
+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/prize")
+public class PrizeController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private PrizeService prizeService;
+
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<Prize> add(@ModelAttribute Prize prize){
+        MessageResult<Prize> msgResult = new MessageResult<>();
+
+        try {
+            prize.setId(UUID.randomUUID().toString());
+
+            int affectCount = prizeService.insert(prize);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(prize);
+            } 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("detail/{id}")
+    public MessageResult<Prize> detail(@PathVariable("id") String id){
+        MessageResult<Prize> msgResult = new MessageResult<>();
+
+        try {
+            Prize prize = prizeService.get(id);
+
+            if (prize != null) {
+                msgResult.setResult(true);
+                msgResult.setData(prize);
+            } 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<Prize> update(@ModelAttribute Prize prize){
+        MessageResult<Prize> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = prizeService.update(prize);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(prize);
+            } 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<Prize> delete(@PathVariable("id") String id){
+        MessageResult<Prize> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = prizeService.delete(id);
+
+            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/{id}")
+    public MessageResult<Prize> batchDelete(@PathVariable("id") String id){
+        MessageResult<Prize> msgResult = new MessageResult<>();
+
+        msgResult.setResult(false);
+        msgResult.setMessage("未实现");
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "list",method = RequestMethod.POST)
+    public MessageResult<Map> list(
+            String id,
+            @RequestParam(value="draw",defaultValue="1") int draw,
+            @RequestParam(value="start",defaultValue="1") int start,
+            @RequestParam(value="length",defaultValue="20") int length,
+            HttpServletRequest request){
+        String subject = (String)request.getAttribute("subject");
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParms = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(id)) {
+            searchParms.put("id","%" + id + "%");
+        }
+
+        int pageNum = start / length;
+
+        if (start % length != 0) {
+            pageNum++;
+        }
+
+        int pageSize = length;
+
+        Page<Prize> page = prizeService.pageSearch(searchParms,pageNum,pageSize,sortList);
+
+        HashMap<String, Object> wrapper = new HashMap<String, Object>();
+        wrapper.put("draw",draw);
+        wrapper.put("recordsTotal", page.getTotal());
+        wrapper.put("recordsFiltered", page.getTotal());
+        wrapper.put("data", page.getResult());
+
+        msgResult.setResult(true);
+        msgResult.setData(wrapper);
+
+        return msgResult;
+    }
+}

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

@@ -58,7 +58,7 @@ public class MessageApiController {
                 }
             }
 
-            msgResult.setResult(false);
+            msgResult.setResult(true);
             msgResult.setData(list);
         }
         catch(Exception ex) {
@@ -90,7 +90,7 @@ public class MessageApiController {
 
         Page<MessageInfo> page = messageInfoService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
 
-        msgResult.setResult(false);
+        msgResult.setResult(true);
         msgResult.setData(PojoUtils.pageWrapper(page));
 
         return msgResult;

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

@@ -4,10 +4,7 @@ import com.jpsoft.employment.modules.base.entity.ArgonPartner;
 import com.jpsoft.employment.modules.base.entity.LaborerInfo;
 import com.jpsoft.employment.modules.base.entity.RevenueInfo;
 import com.jpsoft.employment.modules.base.entity.TransportationInfo;
-import com.jpsoft.employment.modules.base.service.ArgonPartnerService;
-import com.jpsoft.employment.modules.base.service.LaborerInfoService;
-import com.jpsoft.employment.modules.base.service.RevenueInfoService;
-import com.jpsoft.employment.modules.base.service.TransportationInfoService;
+import com.jpsoft.employment.modules.base.service.*;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -27,6 +24,8 @@ public class RevenueApiController {
 
     @Autowired
     private RevenueInfoService revenueInfoService;
+    @Autowired
+    private PrizeService prizeService;
 
     @ApiOperation(value="我的-我的收益")
     @PostMapping("myRevenue")
@@ -36,16 +35,9 @@ public class RevenueApiController {
         Map<String,Object> map = new HashMap<>();
 
         try {
-            Integer allAmount = revenueInfoService.getRevenueAmount(false, subject);
-            if(allAmount == null)
-                allAmount = 0;
-            Integer paidAmount = revenueInfoService.getRevenueAmount(true, subject);
-            if(paidAmount == null)
-                paidAmount = 0;
-
-            map.put("allAmount", allAmount);
-            map.put("paidAmount", paidAmount);
-            map.put("rewardAmount", 0);
+            map.put("allAmount", revenueInfoService.getRevenueAmount(false, subject));
+            map.put("paidAmount", revenueInfoService.getRevenueAmount(true, subject));
+            map.put("rewardAmount", prizeService.getRevenueAmount(subject));
 
             msgResult.setResult(true);
             msgResult.setData(map);

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

@@ -1,5 +1,6 @@
 package com.jpsoft.employment.modules.mobile.controller;
 
+import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.Deposit;
 import com.jpsoft.employment.modules.base.entity.Feedback;
 import com.jpsoft.employment.modules.base.entity.TechnicianInfo;
@@ -7,12 +8,14 @@ import com.jpsoft.employment.modules.base.service.DepositService;
 import com.jpsoft.employment.modules.base.service.FeedbackService;
 import com.jpsoft.employment.modules.base.service.TechnicianInfoService;
 import com.jpsoft.employment.modules.common.dto.MessageResult;
+import com.jpsoft.employment.modules.common.dto.Sort;
 import com.jpsoft.employment.modules.common.utils.DES3;
 import com.jpsoft.employment.modules.common.utils.JwtUtil;
 import com.jpsoft.employment.modules.sys.entity.User;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,10 +26,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpSession;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 @RestController
 @RequestMapping("/mobile/technician")
@@ -49,9 +49,10 @@ public class TechnicianApiController {
             @ApiImplicitParam(name = "name", paramType = "query", required = true, value = "用户名"),
             @ApiImplicitParam(name = "phone", paramType = "query", required = true, value = "手机号码"),
             @ApiImplicitParam(name = "idCard", paramType = "query", required = true, value = "身份证号"),
+            @ApiImplicitParam(name = "promoter", paramType = "query", required = true, value = "推广人"),
             @ApiImplicitParam(name = "openId", paramType = "query", required = true, value = "openId")
     })
-    public MessageResult<TechnicianInfo> register(String name, String idCard, String phone, String openId) {
+    public MessageResult<TechnicianInfo> register(String name, String idCard, String phone, String promoter, String openId) {
         MessageResult<TechnicianInfo> msgResult = new MessageResult<>();
 
         try {
@@ -63,6 +64,8 @@ public class TechnicianApiController {
             technicianInfo.setRealName(name);
             technicianInfo.setIdCard(idCard);
             technicianInfo.setPhone(phone);
+            technicianInfo.setPromoter(promoter);
+            technicianInfo.setIssue(false);
             technicianInfo.setIsVerified(false);
             technicianInfo.setDelFlag(false);
             technicianInfo.setCreateBy(technicianInfo.getId());
@@ -541,4 +544,36 @@ public class TechnicianApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="推广记录")
+    @PostMapping("promotionList")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "issue", paramType = "query", required = false, value = "奖金发放（0：未发放，1：已发放）"),
+    })
+    public MessageResult<List> promotionList(Boolean issue, @RequestAttribute String subject) {
+        MessageResult<List> msgResult = new MessageResult<>();
+
+        try {
+            Map<String,Object> searchParams = new HashMap<>();
+            searchParams.put("promoter", subject);
+            if (issue != null) {
+                searchParams.put("issue", issue);
+            }
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("create_time","desc"));
+
+            Page<TechnicianInfo> page = technicianInfoService.pageSearch(searchParams,1,1000,false,sortList);
+
+            msgResult.setResult(true);
+            msgResult.setData(page.getResult());
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

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

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -438,4 +439,34 @@ public class WorkOrderApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="我的工单-统计")
+    @PostMapping("statistics")
+    public MessageResult<Map> statistics(HttpServletRequest request) {
+        String subject = (String)request.getAttribute("subject");
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("technicianId",subject);
+
+        searchParams.put("status","3");
+        Integer build = workOrderService.countByTechnicianId(searchParams);
+        searchParams.put("status","4");
+        Integer check = workOrderService.countByTechnicianId(searchParams);
+        searchParams.put("status","5");
+        Integer keep = workOrderService.countByTechnicianId(searchParams);
+        searchParams.put("status","6");
+        Integer expired = workOrderService.countByTechnicianId(searchParams);
+
+        Map<String,Object> map = new HashMap<>();
+        map.put("build",build);
+        map.put("check",check);
+        map.put("keep",keep);
+        map.put("expired",expired);
+
+        msgResult.setResult(true);
+        msgResult.setData(map);
+
+        return msgResult;
+    }
 }

web/target/classes/application-production.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/water-tank-installation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://39.97.193.160:3306/water-tank-installation?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: 123456
+    password: MySql@123456
   devtools:
     restart:
       enabled: true