Merge remote-tracking branch 'origin/master'

# Conflicts:
#	common/target/classes/mapper/base/RevenueInfo.xml
#	common/target/classes/mapper/base/TechnicianInfo.xml
#	common/target/classes/mapper/base/WorkOrder.xml

.idea/shelf/_2025_10_16_8_11____1.xml

@@ -1,24 +0,0 @@
-<changelist name="在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1" date="1760573608919" recycled="true" deleted="true">
-  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/shelved.patch" />
-  <option name="DESCRIPTION" value="在进行更新之前于 2025/10/16 上午8:11 取消提交了更改 [更改]" />
-  <binary>
-    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" />
-    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/dao/MessageInfoDAO.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoDAO.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" />
-    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/entity/CustomerInfo.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/CustomerInfo.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" />
-    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/impl/MessageInfoServiceImpl.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoServiceImpl.class" />
-  </binary>
-  <binary>
-    <option name="BEFORE_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" />
-    <option name="AFTER_PATH" value="common/target/classes/com/jpsoft/employment/modules/base/service/MessageInfoService.class" />
-    <option name="SHELVED_PATH" value="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoService.class" />
-  </binary>
-</changelist>

.idea/workspace.xml

@@ -8,40 +8,47 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="26f59b4a-23ab-4f82-9dad-16520ce4a7cc" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/RevenueApiController.java" afterDir="false" />
+      <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_16_8_11____1.xml" beforeDir="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 beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/CustomerInfo.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoDAO.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoService.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/MessageInfoServiceImpl.class" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/shelf/在进行更新之前于_2025_10_16_上午8_11_取消提交了更改_[更改]1/shelved.patch" beforeDir="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/dao/ConstructionProgressDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/RevenueInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/RevenueInfoDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/InstallationRequirement.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/entity/WorkOrder.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ConstructionProgressService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/ConstructionProgressService.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/TechnicianInfoService.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/TechnicianInfoService.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.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/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.java" 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/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/src/main/resources/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/WorkOrder.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ConstructionProgress.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/resources/mapper/base/ConstructionProgress.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/ConstructionProgressDAO.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/TechnicianInfoDAO.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/RevenueInfoDAO.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/dao/RevenueInfoDAO.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/InstallationRequirement.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/InstallationRequirement.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/WorkOrder.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/entity/WorkOrder.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ConstructionProgressService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/ConstructionProgressService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/TechnicianInfoService.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/RevenueInfoService.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/RevenueInfoService.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/ConstructionProgressServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/TechnicianInfoServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/RevenueInfoServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/base/service/impl/RevenueInfoServiceImpl.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/com/jpsoft/employment/modules/common/utils/Generator/AbstractCaptchaA.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/Generator/AbstractCaptchaA.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpConnectionUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/HttpConnectionUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/OSSUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/OSSUtil.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/com/jpsoft/employment/modules/common/utils/POIUtils.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/common/target/classes/mapper/base/ConstructionProgress.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/ConstructionProgress.xml" 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$/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$/common/target/classes/mapper/base/WorkOrder.xml" beforeDir="false" afterPath="$PROJECT_DIR$/common/target/classes/mapper/base/WorkOrder.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/config/WebMvcConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/main/java/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.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/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/config/WebMvcConfig.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/config/WebMvcConfig.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/ResourceApiController.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/target/classes/com/jpsoft/employment/modules/base/controller/AboutUsController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/AboutUsController.class" 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/base/controller/FeedbackController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/FeedbackController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/MessageInfoController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/MessageInfoController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/WorkOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/base/controller/WorkOrderController.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/PartnerApiController.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/employment/modules/mobile/controller/PartnerApiController.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" />
+      <change beforePath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils.class" beforeDir="false" afterPath="$PROJECT_DIR$/web/target/classes/com/jpsoft/lotteryActivity/utils/POIUtils.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -387,6 +394,7 @@
   <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>
@@ -481,7 +489,15 @@
       <option name="project" value="LOCAL" />
       <updated>1760583032305</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="师傅端移动接口">
+      <option name="closed" value="true" />
+      <created>1760950645757</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1760950645757</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TimeTrackingManager">

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

@@ -1,5 +1,6 @@
 package com.jpsoft.employment.modules.base.dao;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
@@ -18,4 +19,5 @@ public interface ConstructionProgressDAO {
 	ConstructionProgress findLastByWorkOrderId(String workOrderId);
 	List<ConstructionProgress> search(Map<String, Object> searchParams, List<Sort> sortList);
 	Integer getIndex(String workOrderId);
+	Date getSubmitTime(String workOrderId, String code);
 }

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

@@ -1,5 +1,6 @@
 package com.jpsoft.employment.modules.base.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import com.jpsoft.employment.modules.base.entity.ConstructionProgress;
@@ -16,4 +17,5 @@ public interface ConstructionProgressService {
 	List<ConstructionProgress> findByWorkOrderId(String workOrderId);
 	Page<ConstructionProgress> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize, boolean count, List<Sort> sortList);
 	Integer getIndex(String workOrderId);
+	Date getSubmitTime(String workOrderId, String code);
 }

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

@@ -1,5 +1,6 @@
 package com.jpsoft.employment.modules.base.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -77,4 +78,9 @@ public class ConstructionProgressServiceImpl implements ConstructionProgressServ
 	public Integer getIndex(String workOrderId){
 		return constructionProgressDAO.getIndex(workOrderId);
 	}
+
+	@Override
+	public Date getSubmitTime(String workOrderId, String code){
+		return constructionProgressDAO.getSubmitTime(workOrderId, code);
+	}
 }

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

@@ -135,4 +135,10 @@ id_,title_,image_,submit_by,submit_type,submit_time,work_order_id,index_,create_
 		order by index_ desc
 		limit 1
 	</select>
+	<select id="getSubmitTime" resultType="date">
+		select submit_time from base_construction_progress
+		where del_flag = false
+		and code_ = #{code}
+		and work_order_id = #{workOrderId}
+	</select>
 </mapper>

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

@@ -135,4 +135,10 @@ id_,title_,image_,submit_by,submit_type,submit_time,work_order_id,index_,create_
 		order by index_ desc
 		limit 1
 	</select>
+	<select id="getSubmitTime" resultType="date">
+		select submit_time from base_construction_progress
+		where del_flag = false
+		and code_ = #{code}
+		and work_order_id = #{workOrderId}
+	</select>
 </mapper>

common/target/classes/mapper/base/RevenueInfo.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.RevenueInfoDAO">
+	<resultMap id="RevenueInfoMap" type="com.jpsoft.employment.modules.base.entity.RevenueInfo">
+		<id property="id" column="id_" />
+			<result property="amount" column="amount_" />
+			<result property="workOrderId" column="work_order_id" />
+			<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.RevenueInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![CDATA[
+		insert into base_revenue_info
+	    (id_,amount_,work_order_id,date_time,status_,create_time,update_time,del_flag,create_by,update_by)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{amount,jdbcType= NUMERIC }
+,#{workOrderId,jdbcType=VARCHAR}
+,#{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_revenue_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.RevenueInfo">
+		update base_revenue_info
+		<set>
+				<if test="amount!=null">
+		amount_=#{amount,jdbcType= NUMERIC },
+		</if>
+				<if test="workOrderId!=null">
+		work_order_id=#{workOrderId,jdbcType=VARCHAR},
+		</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="RevenueInfoMap">
+		select 
+id_,amount_,work_order_id,date_time,status_,create_time,update_time,del_flag,create_by,update_by		from base_revenue_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_revenue_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="RevenueInfoMap">
+		select * from base_revenue_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="RevenueInfoMap">
+		<![CDATA[
+			select * from base_revenue_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/target/classes/mapper/base/TechnicianInfo.xml

@@ -0,0 +1,194 @@
+<?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.TechnicianInfoDAO">
+	<resultMap id="TechnicianInfoMap" type="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
+		<id property="id" column="id_" />
+			<result property="userName" column="user_name" />
+			<result property="password" column="password_" />
+			<result property="openId" column="open_id" />
+			<result property="phone" column="phone_" />
+			<result property="idCard" column="id_card" />
+			<result property="realName" column="real_name" />
+			<result property="region" column="region_" />
+			<result property="image" column="image_" />
+			<result property="gender" column="gender_" />
+			<result property="introduction" column="introduction_" />
+			<result property="serviceInfo" column="service_info" />
+			<result property="businessScope" column="business_scope" />
+			<result property="idCardImage" column="id_card_image" />
+			<result property="isVerified" column="is_verified" />
+			<result property="promoCode" column="promo_code" />
+			<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" />
+			<result property="status" column="status_" />
+			<result property="level" column="level_" />
+
+			</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
+	<!--
+	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+		select sys_guid() from dual
+	</selectKey>
+	-->
+	<![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_)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{userName,jdbcType=VARCHAR}
+,#{password,jdbcType=VARCHAR}
+,#{openId,jdbcType=VARCHAR}
+,#{phone,jdbcType=VARCHAR}
+,#{idCard,jdbcType=VARCHAR}
+,#{realName,jdbcType=VARCHAR}
+,#{region,jdbcType=VARCHAR}
+,#{image,jdbcType=VARCHAR}
+,#{gender,jdbcType=VARCHAR}
+,#{introduction,jdbcType=VARCHAR}
+,#{serviceInfo,jdbcType=VARCHAR}
+,#{businessScope,jdbcType=VARCHAR}
+,#{idCardImage,jdbcType=VARCHAR}
+,#{isVerified,jdbcType= NUMERIC }
+,#{promoCode,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{level,jdbcType= NUMERIC }
+
+
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_technician_info where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
+		update base_technician_info
+		<set>
+				<if test="userName!=null">
+		user_name=#{userName,jdbcType=VARCHAR},
+		</if>
+				<if test="password!=null">
+		password_=#{password,jdbcType=VARCHAR},
+		</if>
+				<if test="openId!=null">
+		open_id=#{openId,jdbcType=VARCHAR},
+		</if>
+				<if test="phone!=null">
+		phone_=#{phone,jdbcType=VARCHAR},
+		</if>
+				<if test="idCard!=null">
+		id_card=#{idCard,jdbcType=VARCHAR},
+		</if>
+				<if test="realName!=null">
+		real_name=#{realName,jdbcType=VARCHAR},
+		</if>
+				<if test="region!=null">
+		region_=#{region,jdbcType=VARCHAR},
+		</if>
+				<if test="image!=null">
+		image_=#{image,jdbcType=VARCHAR},
+		</if>
+				<if test="gender!=null">
+		gender_=#{gender,jdbcType=VARCHAR},
+		</if>
+				<if test="introduction!=null">
+		introduction_=#{introduction,jdbcType=VARCHAR},
+		</if>
+				<if test="serviceInfo!=null">
+		service_info=#{serviceInfo,jdbcType=VARCHAR},
+		</if>
+				<if test="businessScope!=null">
+		business_scope=#{businessScope,jdbcType=VARCHAR},
+		</if>
+				<if test="idCardImage!=null">
+		id_card_image=#{idCardImage,jdbcType=VARCHAR},
+		</if>
+				<if test="isVerified!=null">
+		is_verified=#{isVerified,jdbcType= NUMERIC },
+		</if>
+				<if test="promoCode!=null">
+		promo_code=#{promoCode,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>
+				<if test="status!=null">
+		status_=#{status,jdbcType=VARCHAR},
+		</if>
+			<if test="level!=null">
+				level_=#{level,jdbcType= NUMERIC },
+			</if>
+		</set>
+	where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="TechnicianInfoMap">
+		select * from base_technician_info where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_technician_info where id_=#{0}
+	</select>
+	<select id="list" resultMap="TechnicianInfoMap">
+		select * from base_technician_info
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="TechnicianInfoMap">
+		<![CDATA[
+			select * from base_technician_info
+		]]>
+		<where>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.id != null">
+				and real_name like #{searchParams.id}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+	        ${sort.name} ${sort.order}
+	 	</foreach>
+	</select>
+	<select id="searchMobile" parameterType="hashmap" resultMap="TechnicianInfoMap">
+		<![CDATA[
+			select * from base_technician_info
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.id != null">
+				and ID_ like #{searchParams.id}
+			</if>
+			<if test="searchParams.name != null">
+				and ID_ like #{searchParams.name}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${sort.name} ${sort.order}
+		</foreach>
+	</select>
+	<select id="findByPhone" parameterType="string" resultMap="TechnicianInfoMap">
+		select * from base_technician_info
+		where del_flag = 0
+		and phone_ = #{0}
+		limit 1
+	</select>
+</mapper>

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

@@ -0,0 +1,285 @@
+<?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.WorkOrderDAO">
+	<resultMap id="WorkOrderMap" type="com.jpsoft.employment.modules.base.entity.WorkOrder">
+		<id property="id" column="id_" />
+		<result property="number" column="number_" />
+		<result property="title" column="title_" />
+		<result property="address" column="address_" />
+		<result property="date" column="date_" />
+		<result property="tag" column="tag_" />
+		<result property="image" column="image_" />
+		<result property="status" column="status_" />
+		<result property="price" column="price_" />
+		<result property="location" column="location_" />
+		<result property="companyId" column="company_id" />
+		<result property="map" column="map_" />
+		<result property="constructionLocation" column="construction_location" />
+		<result property="environment" column="environment" />
+		<result property="volume" column="volume_" />
+		<result property="technicianId" column="technician_id" />
+		<result property="payStatus" column="pay_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" />
+		<result property="customerName" column="customer_name" />
+		<result property="customerPhone" column="customer_phone" />
+		<result property="viewNum" column="view_num" />
+		<result property="certificate" column="certificate_" />
+		<result property="cancelCauses" column="cancel_causes" />
+		<result property="cancelReasons" column="cancel_reasons" />
+		<result property="cancelImages" column="cancel_images" />
+		<result property="peopleSeenNum" column="people_seen_num" />
+		<result property="bak" column="bak_" />
+		<result property="payCertificate" column="pay_certificate" />
+
+	</resultMap>
+	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
+		<!--
+        <selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
+            select sys_guid() from dual
+        </selectKey>
+        -->
+		<![CDATA[
+		insert into base_work_order
+	    (id_,number_,title_,address_,date_,tag_,image_,status_,price_,location_,company_id,map_,construction_location,environment,volume_,technician_id,pay_status,create_time,update_time,del_flag,create_by,update_by,
+	    customer_name,customer_phone,view_num,certificate_,cancel_causes,cancel_reasons,cancel_images,people_seen_num,bak_,pay_certificate)
+		values
+		(
+#{id,jdbcType=VARCHAR}
+,#{number,jdbcType=VARCHAR}
+,#{title,jdbcType=VARCHAR}
+,#{address,jdbcType=VARCHAR}
+,#{date,jdbcType= TIMESTAMP }
+,#{tag,jdbcType=VARCHAR}
+,#{image,jdbcType=VARCHAR}
+,#{status,jdbcType=VARCHAR}
+,#{price,jdbcType= NUMERIC }
+,#{location,jdbcType=VARCHAR}
+,#{companyId,jdbcType=VARCHAR}
+,#{map,jdbcType=VARCHAR}
+,#{constructionLocation,jdbcType=VARCHAR}
+,#{environment,jdbcType=VARCHAR}
+,#{volume,jdbcType= NUMERIC }
+,#{technicianId,jdbcType=VARCHAR}
+,#{payStatus,jdbcType=VARCHAR}
+,#{createTime,jdbcType= TIMESTAMP }
+,#{updateTime,jdbcType= TIMESTAMP }
+,#{delFlag,jdbcType= NUMERIC }
+,#{createBy,jdbcType=VARCHAR}
+,#{updateBy,jdbcType=VARCHAR}
+,#{customerName,jdbcType=VARCHAR}
+,#{customerPhone,jdbcType=VARCHAR}
+,#{viewNum,jdbcType= NUMERIC }
+,#{certificate,jdbcType=VARCHAR}
+,#{cancelCauses,jdbcType=VARCHAR}
+,#{cancelReasons,jdbcType=VARCHAR}
+,#{cancelImages,jdbcType=VARCHAR}
+,#{peopleSeenNum,jdbcType= NUMERIC }
+,#{bak,jdbcType=VARCHAR}
+,#{payCertificate,jdbcType=VARCHAR}
+		)
+	]]>
+	</insert>
+	<delete id="delete" parameterType="string">
+		delete from base_work_order where id_=#{id,jdbcType=VARCHAR}
+	</delete>
+	<update id="update" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
+		update base_work_order
+		<set>
+			<if test="number!=null">
+				number_=#{number,jdbcType=VARCHAR},
+			</if>
+			<if test="title!=null">
+				title_=#{title,jdbcType=VARCHAR},
+			</if>
+			<if test="address!=null">
+				address_=#{address,jdbcType=VARCHAR},
+			</if>
+			<if test="date!=null">
+				date_=#{date,jdbcType= TIMESTAMP },
+			</if>
+			<if test="tag!=null">
+				tag_=#{tag,jdbcType=VARCHAR},
+			</if>
+			<if test="image!=null">
+				image_=#{image,jdbcType=VARCHAR},
+			</if>
+			<if test="status!=null">
+				status_=#{status,jdbcType=VARCHAR},
+			</if>
+			<if test="price!=null">
+				price_=#{price,jdbcType= NUMERIC },
+			</if>
+			<if test="location!=null">
+				location_=#{location,jdbcType=VARCHAR},
+			</if>
+			<if test="companyId!=null">
+				company_id=#{companyId,jdbcType=VARCHAR},
+			</if>
+			<if test="map!=null">
+				map_=#{map,jdbcType=VARCHAR},
+			</if>
+			<if test="constructionLocation!=null">
+				construction_location=#{constructionLocation,jdbcType=VARCHAR},
+			</if>
+			<if test="environment!=null">
+				environment=#{environment,jdbcType=VARCHAR},
+			</if>
+			<if test="volume!=null">
+				volume_=#{volume,jdbcType= NUMERIC },
+			</if>
+			<if test="technicianId!=null">
+				technician_id=#{technicianId,jdbcType=VARCHAR},
+			</if>
+			<if test="payStatus!=null">
+				pay_status=#{payStatus,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>
+			<if test="customerName!=null">
+				customer_name=#{customerName,jdbcType=VARCHAR},
+			</if>
+			<if test="customerPhone!=null">
+				customer_phone=#{customerPhone,jdbcType=VARCHAR},
+			</if>
+			<if test="viewNum!=null">
+				view_num=#{viewNum,jdbcType=NUMERIC},
+			</if>
+			<if test="certificate!=null">
+				certificate_=#{certificate,jdbcType=VARCHAR},
+			</if>
+			<if test="cancelCauses!=null">
+				cancel_causes=#{cancelCauses,jdbcType=VARCHAR},
+			</if>
+			<if test="cancelReasons!=null">
+				cancel_reasons=#{cancelReasons,jdbcType=VARCHAR},
+			</if>
+			<if test="cancelImages!=null">
+				cancel_images=#{cancelImages,jdbcType=VARCHAR},
+			</if>
+			<if test="peopleSeenNum!=null">
+				people_seen_num=#{peopleSeenNum,jdbcType= NUMERIC },
+			</if>
+			<if test="bak!=null">
+				bak_=#{bak,jdbcType=VARCHAR},
+			</if>
+			<if test="payCertificate!=null">
+				pay_certificate=#{payCertificate,jdbcType=VARCHAR},
+			</if>
+		</set>
+		where id_=#{id}
+	</update>
+	<select id="get" parameterType="string" resultMap="WorkOrderMap">
+		select * from base_work_order where id_=#{0}
+	</select>
+	<select id="exist" parameterType="string" resultType="int">
+		select count(*) from base_work_order where id_=#{0}
+	</select>
+	<select id="list" resultMap="WorkOrderMap">
+		select * from base_work_order
+	</select>
+	<select id="findLastByCompanyId" resultMap="WorkOrderMap">
+		select * from base_work_order where del_flag=false and company_id=#{0}
+		order by create_time desc limit 1
+	</select>
+	<select id="countByCustomerId" resultType="java.util.Map">
+		select count(id_) as 'count_',sum(price_) as 'price_' from base_work_order
+		<where>
+			del_flag = false
+			<if test="searchParams.companyId != null">
+				and company_id = #{searchParams.companyId}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+	</select>
+	<select id="countByTechnicianId" resultType="java.lang.Integer">
+		select count(id_) from base_work_order
+		<where>
+			del_flag = false
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+		</where>
+	</select>
+	<select id="findTopByCustomerId" resultType="java.lang.String">
+		select technician_id from base_work_order where del_flag = false and company_id = #{0}
+		order by create_time desc limit 3
+	</select>
+	<select id="search" parameterType="hashmap" resultMap="WorkOrderMap">
+		<![CDATA[
+			select * from base_work_order
+		]]>
+		<where>
+			del_flag = false
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.key != null">
+				and (title_ like #{searchParams.key} or address_ like #{searchParams.key})
+			</if>
+			<if test="searchParams.technicianId != null">
+				and technician_id = #{searchParams.technicianId}
+			</if>
+			<if test="searchParams.date != null">
+				and create_time like #{searchParams.date}
+			</if>
+		</where>
+		<foreach item="sort" collection="sortList"  open="order by" separator=",">
+			${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.title != null">
+				and title_ like #{searchParams.title}
+			</if>
+			<if test="searchParams.companyId != null">
+				and company_id = #{searchParams.companyId}
+			</if>
+			<if test="searchParams.status != null">
+				and status_ = #{searchParams.status}
+			</if>
+			<if test="searchParams.startDate != null">
+				<![CDATA[
+					and date_ >= #{searchParams.startDate}
+				]]>
+			</if>
+			<if test="searchParams.endDate != null">
+				<![CDATA[
+					and date_ < #{searchParams.endDate}
+				]]>
+			</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/mobile/controller/WorkOrderApiController.java

@@ -1,5 +1,7 @@
 package com.jpsoft.employment.modules.mobile.controller;
 
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.*;
 import com.jpsoft.employment.modules.base.service.*;
@@ -164,6 +166,51 @@ public class WorkOrderApiController {
         for(WorkOrder workOrder : page.getResult()) {
             String statusName = dataDictionaryService.findNameByCatalogNameAndValue("工单状态",workOrder.getStatus());
             workOrder.setStatusName(statusName);
+
+            Date submitTime = null;
+            Calendar calendar = Calendar.getInstance();
+            InstallationRequirement installationRequirement = installationRequirementService.findByWorkOrderId(workOrder.getId());
+            switch (workOrder.getStatus()) {
+                case "1":
+                    workOrder.setBak(String.format("报价：%s元",workOrder.getPrice().toString()));
+                    break;
+                case "2":
+                    Date startDate2 = new Date();
+                    Date endDate2 = workOrder.getDate();
+                    long days2 = DateUtil.betweenDay(startDate2, endDate2, true);
+                    workOrder.setBak(String.format("入场期限：剩%d天",days2));
+                    break;
+                case "3":
+                    int period = Convert.toInt(installationRequirement.getPeriod());
+                    submitTime = constructionProgressService.getSubmitTime(workOrder.getId(), "P3");
+                    calendar.setTime(submitTime);
+                    calendar.add(Calendar.MONTH, period);
+                    Date startDate3 = new Date();
+                    Date endDate3 = workOrder.getDate();
+                    long days3 = DateUtil.betweenDay(startDate3, endDate3, true);
+                    workOrder.setBak(String.format("施工期限：剩%d天",days3));
+                    break;
+                case "4":
+                    workOrder.setBak(String.format("待打款：%s元",workOrder.getPrice().toString()));
+                    break;
+                case "5":
+                    int terminationPeriod = installationRequirement.getTerminationPeriod();
+                    submitTime = constructionProgressService.getSubmitTime(workOrder.getId(), "P5");
+                    calendar.setTime(submitTime);
+                    calendar.add(Calendar.MONTH, terminationPeriod);
+
+                    Date startDate5 = new Date();
+                    Date endDate5 = calendar.getTime();
+                    long months5 = DateUtil.betweenMonth(startDate5, endDate5, true);
+                    long days5 = DateUtil.betweenDay(startDate5, endDate5, true);
+                    if(months5 > 0) {
+                        workOrder.setBak(String.format("距离出保%d个月",months5));
+                    }
+                    else {
+                        workOrder.setBak(String.format("距离出保%d天",days5));
+                    }
+                    break;
+            }
         }
 
         msgResult.setResult(true);