工单添加完成工单时间

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

@@ -125,6 +125,11 @@ public class WorkOrder {
 	@ApiModelProperty(value = "支付状态")
 	private String payStatusN;
 
+	@ApiModelProperty(value = "验收完工时间")
+	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
+	private Date finishTime;
+
 	@Transient
 	@ApiModelProperty(value = "发起客户")
 	private String companyName;

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

@@ -166,6 +166,8 @@ public class WorkOrderServiceImpl implements WorkOrderService {
             constructionProgress.setSubmitType("1");
             constructionProgress.setSubmitBy(createBy);
             constructionProgress.setTitle("发布了工单");
+            constructionProgress.setCode("P1");
+            constructionProgress.setSubmitTime(now);
             constructionProgress.setWorkOrderId(workOrder.getId());
             constructionProgressDAO.insert(constructionProgress);
 
@@ -290,6 +292,7 @@ public class WorkOrderServiceImpl implements WorkOrderService {
     public int updateAndProgress(WorkOrder model) {
         // TODO Auto-generated method stub
         int affectCount = workOrderDAO.update(model);
+        Date now = new Date();
         if (affectCount > 0) {
             ConstructionProgress constructionProgress = new ConstructionProgress();
             constructionProgress.setId(UUID.randomUUID().toString());
@@ -297,7 +300,10 @@ public class WorkOrderServiceImpl implements WorkOrderService {
             constructionProgress.setTitle("确认了工单");
             constructionProgress.setDelFlag(false);
             constructionProgress.setCreateBy(model.getUpdateBy());
-            constructionProgress.setCreateTime(new Date());
+            constructionProgress.setCreateTime(now);
+            constructionProgress.setSubmitTime(now);
+            constructionProgress.setIndex(2);
+            constructionProgress.setCode("P2");
 
             ConstructionProgress lastItem = constructionProgressDAO.findLastByWorkOrderId(model.getId());
             if (lastItem != null) {
@@ -328,7 +334,17 @@ public class WorkOrderServiceImpl implements WorkOrderService {
             item.setSubmitType("1");
             item.setSubmitBy(subject);
             item.setSubmitTime(now);
-            item.setCode("FINISH");
+
+            if("5".equals(status)){
+                item.setCode("P5");
+                item.setTitle("验收工单");
+                model.setFinishTime(now);
+            }
+            else if("7".equals(status)){
+                item.setCode("P7");
+                item.setTitle("取消工单");
+            }
+
             ConstructionProgress constructionProgress = constructionProgressDAO.findLastByWorkOrderId(model.getId());
             if (constructionProgress != null) {
                 item.setIndex(constructionProgress.getIndex() + 1);

common/src/main/resources/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>