师傅端移动接口

.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

@@ -98,4 +98,15 @@ id_,amount_,work_order_id,date_time,status_,create_time,update_time,del_flag,cre
 	        ${sort.name} ${sort.order}
 	 	</foreach>
 	</select>
+	<select id="getRevenueAmount" resultType="integer">
+		SELECT SUM(amount_) FROM base_revenue_info a
+		LEFT JOIN base_work_order b ON a.work_order_id = b.id_
+		WHERE a.del_flag = FALSE
+		<if test="paid = true">
+		AND a.status_ = '2'
+		</if>
+		<if test="technicianId != null">
+		AND b.technician_id = #{technicianId}
+		</if>
+	</select>
 </mapper>

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

@@ -191,4 +191,10 @@
 		and phone_ = #{0}
 		limit 1
 	</select>
+	<select id="findByOpenid" parameterType="string" resultMap="TechnicianInfoMap">
+		select * from base_technician_info
+		where del_flag = 0
+		and open_id = #{0}
+		limit 1
+	</select>
 </mapper>

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

@@ -36,7 +36,7 @@
 		<result property="peopleSeenNum" column="people_seen_num" />
 		<result property="bak" column="bak_" />
 		<result property="payCertificate" column="pay_certificate" />
-
+		<result property="finishTime" column="finish_time" />
 	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.WorkOrder">
 		<!--
@@ -47,7 +47,7 @@
 		<![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)
+	    customer_name,customer_phone,view_num,certificate_,cancel_causes,cancel_reasons,cancel_images,people_seen_num,bak_,pay_certificate,finish_time)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -82,6 +82,7 @@
 ,#{peopleSeenNum,jdbcType= NUMERIC }
 ,#{bak,jdbcType=VARCHAR}
 ,#{payCertificate,jdbcType=VARCHAR}
+,#{finishTime,jdbcType= TIMESTAMP }
 		)
 	]]>
 	</insert>
@@ -184,6 +185,9 @@
 			<if test="payCertificate!=null">
 				pay_certificate=#{payCertificate,jdbcType=VARCHAR},
 			</if>
+			<if test="finishTime!=null">
+				finish_time=#{finishTime,jdbcType= TIMESTAMP },
+			</if>
 		</set>
 		where id_=#{id}
 	</update>

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);