Prechádzať zdrojové kódy

师傅端移动接口

jzkai 2 týždňov pred
rodič
commit
0d61767840

+ 14 - 38
.idea/workspace.xml

@@ -8,47 +8,15 @@
   </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_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/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/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/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/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/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/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/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/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/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/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/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/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/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/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" />
@@ -497,7 +465,15 @@
       <option name="project" value="LOCAL" />
       <updated>1760950645757</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="师傅端移动接口">
+      <option name="closed" value="true" />
+      <created>1761264395779</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1761264395779</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">

+ 28 - 1
common/src/main/java/com/jpsoft/employment/modules/base/entity/TechnicianInfo.java

@@ -39,7 +39,7 @@ public class TechnicianInfo {
 				@ApiModelProperty(value = "真实姓名")
 	private String realName;
 	
-				@ApiModelProperty(value = "所在地区")
+				@ApiModelProperty(value = "服务地区")
 	private String region;
 	
 				@ApiModelProperty(value = "头像")
@@ -92,6 +92,33 @@ public class TechnicianInfo {
 	@ApiModelProperty(value = "会员等级")
 	private Integer level;
 
+	@ApiModelProperty(value = "保证金")
+	private Integer deposit;
+
+	@ApiModelProperty(value = "资质")
+	private String qualification;
+
+	@ApiModelProperty(value = "收款户名")
+	private String receiveName;
+
+	@ApiModelProperty(value = "开户银行")
+	private String receiveBank;
+
+	@ApiModelProperty(value = "收款账号")
+	private String receiveAccount;
+
+	@ApiModelProperty(value = "收款账号")
+	private String receiptName;
+
+	@ApiModelProperty(value = "收款账号")
+	private String receiptPhone;
+
+	@ApiModelProperty(value = "收款账号")
+	private String receiptRegion;
+
+	@ApiModelProperty(value = "收款账号")
+	private String receiptAddress;
+
 
 	@Transient
 	@ApiModelProperty(value = "完成单数")

+ 69 - 30
common/src/main/resources/mapper/base/TechnicianInfo.xml

@@ -5,30 +5,38 @@
 <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>
+		<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_" />
+		<result property="deposit" column="deposit_" />
+		<result property="qualification" column="qualification_" />
+		<result property="receiveName" column="receive_name" />
+		<result property="receiveBank" column="receive_bank" />
+		<result property="receiveAccount" column="receive_account" />
+		<result property="receiptName" column="receipt_name" />
+		<result property="receiptPhone" column="receipt_phone" />
+		<result property="receiptRegion" column="receipt_region" />
+		<result property="receiptAddress" column="receipt_address" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -37,7 +45,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_)
+	    (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)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -63,8 +71,15 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{level,jdbcType= NUMERIC }
-
-
+,#{deposit,jdbcType= NUMERIC }
+,#{qualification,jdbcType= VARCHAR }
+,#{receiveName,jdbcType= VARCHAR }
+,#{receiveBank,jdbcType= VARCHAR }
+,#{receiveAccount,jdbcType= VARCHAR }
+,#{receiptName,jdbcType= VARCHAR }
+,#{receiptPhone,jdbcType= VARCHAR }
+,#{receiptRegion,jdbcType= VARCHAR }
+,#{receiptAddress,jdbcType= VARCHAR }
 		)
 	]]>
 	</insert>
@@ -133,13 +148,37 @@
 		</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>
+			<if test="deposit!=null">
+				deposit_=#{deposit,jdbcType= NUMERIC },
+			</if>
+			<if test="qualification!=null">
+				qualification_=#{qualification,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveName!=null">
+				receive_name=#{receiveName,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveBank!=null">
+				receive_bank=#{receiveBank,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveAccount!=null">
+				receive_account=#{receiveAccount,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptName!=null">
+				receipt_name=#{receiptName,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptPhone!=null">
+				receipt_phone=#{receiptPhone,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptRegion!=null">
+				receipt_region=#{receiptRegion,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptAddress!=null">
+				receipt_address=#{receiptAddress,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>

BIN
common/target/classes/com/jpsoft/employment/modules/base/entity/TechnicianInfo.class


+ 75 - 30
common/target/classes/mapper/base/TechnicianInfo.xml

@@ -5,30 +5,38 @@
 <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>
+		<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_" />
+		<result property="deposit" column="deposit_" />
+		<result property="qualification" column="qualification_" />
+		<result property="receiveName" column="receive_name" />
+		<result property="receiveBank" column="receive_bank" />
+		<result property="receiveAccount" column="receive_account" />
+		<result property="receiptName" column="receipt_name" />
+		<result property="receiptPhone" column="receipt_phone" />
+		<result property="receiptRegion" column="receipt_region" />
+		<result property="receiptAddress" column="receipt_address" />
+	</resultMap>
 	<insert id="insert" parameterType="com.jpsoft.employment.modules.base.entity.TechnicianInfo">
 	<!--
 	<selectKey resultType="java.lang.String" order="BEFORE" keyProperty="id">
@@ -37,7 +45,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_)
+	    (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)
 		values
 		(
 #{id,jdbcType=VARCHAR}
@@ -63,8 +71,15 @@
 ,#{updateBy,jdbcType=VARCHAR}
 ,#{status,jdbcType=VARCHAR}
 ,#{level,jdbcType= NUMERIC }
-
-
+,#{deposit,jdbcType= NUMERIC }
+,#{qualification,jdbcType= VARCHAR }
+,#{receiveName,jdbcType= VARCHAR }
+,#{receiveBank,jdbcType= VARCHAR }
+,#{receiveAccount,jdbcType= VARCHAR }
+,#{receiptName,jdbcType= VARCHAR }
+,#{receiptPhone,jdbcType= VARCHAR }
+,#{receiptRegion,jdbcType= VARCHAR }
+,#{receiptAddress,jdbcType= VARCHAR }
 		)
 	]]>
 	</insert>
@@ -133,13 +148,37 @@
 		</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>
+			<if test="deposit!=null">
+				deposit_=#{deposit,jdbcType= NUMERIC },
+			</if>
+			<if test="qualification!=null">
+				qualification_=#{qualification,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveName!=null">
+				receive_name=#{receiveName,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveBank!=null">
+				receive_bank=#{receiveBank,jdbcType=VARCHAR},
+			</if>
+			<if test="receiveAccount!=null">
+				receive_account=#{receiveAccount,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptName!=null">
+				receipt_name=#{receiptName,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptPhone!=null">
+				receipt_phone=#{receiptPhone,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptRegion!=null">
+				receipt_region=#{receiptRegion,jdbcType=VARCHAR},
+			</if>
+			<if test="receiptAddress!=null">
+				receipt_address=#{receiptAddress,jdbcType=VARCHAR},
+			</if>
 		</set>
 	where id_=#{id}
 	</update>
@@ -191,4 +230,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>

+ 237 - 1
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.java

@@ -1,6 +1,8 @@
 package com.jpsoft.employment.modules.mobile.controller;
 
+import com.jpsoft.employment.modules.base.entity.Feedback;
 import com.jpsoft.employment.modules.base.entity.TechnicianInfo;
+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.utils.DES3;
@@ -33,6 +35,8 @@ public class TechnicianApiController {
     private String jwtSecret;
     @Autowired
     private TechnicianInfoService technicianInfoService;
+    @Autowired
+    private FeedbackService feedbackService;
 
     @ApiOperation(value="注册")
     @PostMapping("register")
@@ -180,7 +184,7 @@ public class TechnicianApiController {
         return msgResult;
     }
 
-    @ApiOperation(value="修改用户信息")
+    @ApiOperation(value="修改个人信息")
     @PostMapping("changeDetail")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "image", paramType = "query", required = false, value = "头像"),
@@ -255,4 +259,236 @@ public class TechnicianApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="入驻登记")
+    @PostMapping("checkedRegister")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "region", paramType = "query", required = true, value = "服务地区"),
+            @ApiImplicitParam(name = "businessScope", paramType = "query", required = true, value = "业务范围"),
+    })
+    public MessageResult<Integer> checkedRegister(String region, String businessScope, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TechnicianInfo technicianInfo = technicianInfoService.get(subject);
+            technicianInfo.setRegion(region);
+            technicianInfo.setBusinessScope(businessScope);
+            technicianInfo.setUpdateBy(subject);
+            technicianInfo.setUpdateTime(new Date());
+
+            int affectCount = technicianInfoService.update(technicianInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("修改成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("修改失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="实名认证")
+    @PostMapping("checkedRealName")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "name", paramType = "query", required = true, value = "姓名"),
+            @ApiImplicitParam(name = "idcard", paramType = "query", required = true, value = "身份证"),
+            @ApiImplicitParam(name = "url", paramType = "query", required = true, value = "图片"),
+            @ApiImplicitParam(name = "subject", value = "令牌", required = false, paramType = "query")
+    })
+    public MessageResult<Integer> checkedRealName(String name, String idcard, String url, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TechnicianInfo technicianInfo = technicianInfoService.get(subject);
+            technicianInfo.setRealName(name);
+            technicianInfo.setIdCard(idcard);
+            technicianInfo.setIdCardImage(url);
+            technicianInfo.setIsVerified(false);
+            technicianInfo.setUpdateBy(subject);
+            technicianInfo.setUpdateTime(new Date());
+
+            int affectCount = technicianInfoService.update(technicianInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("修改成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("修改失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="资质认证")
+    @PostMapping("checkedQualification")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "url", paramType = "query", required = true, value = "图片"),
+            @ApiImplicitParam(name = "subject", value = "令牌", required = false, paramType = "query")
+    })
+    public MessageResult<Integer> checkedQualification(String url, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TechnicianInfo technicianInfo = technicianInfoService.get(subject);
+            technicianInfo.setQualification(url);
+            technicianInfo.setUpdateBy(subject);
+            technicianInfo.setUpdateTime(new Date());
+
+            int affectCount = technicianInfoService.update(technicianInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("修改成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("修改失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="银行账户")
+    @PostMapping("bankAccount")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "receiveName", paramType = "query", required = true, value = "户名"),
+            @ApiImplicitParam(name = "receiveBank", paramType = "query", required = true, value = "开户行"),
+            @ApiImplicitParam(name = "receiveAccount", paramType = "query", required = true, value = "账号"),
+    })
+    public MessageResult<Integer> bankAccount(String receiveName, String receiveBank, String receiveAccount, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TechnicianInfo technicianInfo = technicianInfoService.get(subject);
+            technicianInfo.setReceiveName(receiveName);
+            technicianInfo.setReceiveBank(receiveBank);
+            technicianInfo.setReceiveAccount(receiveAccount);
+            technicianInfo.setUpdateBy(subject);
+            technicianInfo.setUpdateTime(new Date());
+
+            int affectCount = technicianInfoService.update(technicianInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("修改成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("修改失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="收货地址")
+    @PostMapping("consignee")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "receiptName", paramType = "query", required = true, value = "收货人"),
+            @ApiImplicitParam(name = "receiptPhone", paramType = "query", required = true, value = "收货电话"),
+            @ApiImplicitParam(name = "receiptRegion", paramType = "query", required = true, value = "收货地区"),
+            @ApiImplicitParam(name = "receiptAddress", paramType = "query", required = true, value = "收货地址"),
+    })
+    public MessageResult<Integer> consignee(String receiptName, String receiptPhone, String receiptRegion, String receiptAddress, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            TechnicianInfo technicianInfo = technicianInfoService.get(subject);
+            technicianInfo.setReceiptName(receiptName);
+            technicianInfo.setReceiptPhone(receiptPhone);
+            technicianInfo.setReceiptRegion(receiptRegion);
+            technicianInfo.setReceiptAddress(receiptAddress);
+            technicianInfo.setUpdateBy(subject);
+            technicianInfo.setUpdateTime(new Date());
+
+            int affectCount = technicianInfoService.update(technicianInfo);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("修改成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("修改失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="反馈建议")
+    @PostMapping("advise")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", paramType = "query", required = true, value = "收货人"),
+            @ApiImplicitParam(name = "title", paramType = "query", required = true, value = "收货电话"),
+            @ApiImplicitParam(name = "content", paramType = "query", required = true, value = "收货地区"),
+            @ApiImplicitParam(name = "image", paramType = "query", required = true, value = "收货地址"),
+    })
+    public MessageResult<Integer> advise(String type, String title, String content, String image, @RequestAttribute String subject) {
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Feedback feedback = new Feedback();
+            feedback.setId(UUID.randomUUID().toString());
+            feedback.setType(type);
+            feedback.setTitle(title);
+            feedback.setContent(content);
+            feedback.setTechnicianId(subject);
+            feedback.setImage(image);
+            feedback.setDelFlag(false);
+            feedback.setCreateBy(subject);
+            feedback.setCreateTime(new Date());
+
+            int affectCount = feedbackService.insert(feedback);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setMessage("提交成功!");
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("提交失败!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

+ 17 - 13
web/src/main/java/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.java

@@ -194,20 +194,24 @@ public class WorkOrderApiController {
                     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));
+                    try {
+                        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));
+                        }
                     }
-                    else {
-                        workOrder.setBak(String.format("距离出保%d天",days5));
+                    catch (Exception ex){
+                        workOrder.setBak("数据异常");
                     }
                     break;
             }

BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/TechnicianApiController.class


BIN
web/target/classes/com/jpsoft/employment/modules/mobile/controller/WorkOrderApiController.class