Sfoglia il codice sorgente

Merge branch 'test' of ssh://git@git.jishutao.com:55555/jishutao/aft.git into test

wanghui 7 anni fa
parent
commit
c15da9dc6b

+ 2 - 2
src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml

@@ -202,13 +202,13 @@
       commodity_mode, create_time, task_comment, 
       task_status, task_distribution_time, task_allocator, 
       task_receiver, deleted_sign, serial_number, 
-      attachment_url)
+      attachment_url,publish_status)
     values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, 
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityType,jdbcType=INTEGER}, 
       #{commodityMode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{taskComment,jdbcType=VARCHAR}, 
       #{taskStatus,jdbcType=INTEGER}, #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
       #{taskReceiver,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{serialNumber,jdbcType=INTEGER}, 
-      #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{attachmentUrl,jdbcType=LONGVARCHAR},#{publishStatus,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.ContractTask">
     <!--

+ 3 - 7
src/main/java/com/goafanti/common/model/Demand.java

@@ -208,7 +208,7 @@ public class Demand {
 	/**
 	 * 加急报酬
 	 */
-    private Integer urgentMoney;
+    private BigDecimal urgentMoney;
 	
     private String orderCount;
 	private String orderIntentionCount; 
@@ -607,16 +607,12 @@ public class Demand {
 		this.urgentDays = Integer.valueOf(urgentDays);
 	}
 
-	public Integer getUrgentMoney() {
+	public BigDecimal getUrgentMoney() {
 		return urgentMoney;
 	}
 
-	public void setUrgentMoney(Integer urgentMoney) {
-		this.urgentMoney = urgentMoney;
-	} 
-	
 	public void setUrgentMoney(String urgentMoney) {
-		this.urgentMoney =  Integer.valueOf(urgentMoney);
+		this.urgentMoney = new BigDecimal(urgentMoney);
 	}
 
 	public String getContactMobile() {

+ 3 - 3
src/main/java/com/goafanti/demand/bo/DemandListBo.java

@@ -98,7 +98,7 @@ public class DemandListBo {
 	 *  
 	 */
 	private Integer  urgentDays;
-	private Integer urgentMoney;
+	private BigDecimal urgentMoney;
 
 	
 	private Date createTime;
@@ -336,11 +336,11 @@ public class DemandListBo {
 		this.urgentDays = urgentDays;
 	}
 
-	public Integer getUrgentMoney() {
+	public BigDecimal getUrgentMoney() {
 		return urgentMoney;
 	}
 
-	public void setUrgentMoney(Integer urgentMoney) {
+	public void setUrgentMoney(BigDecimal urgentMoney) {
 		this.urgentMoney = urgentMoney;
 	}
 

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -1570,6 +1570,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				task.setCommodityQuantity(1);
 				task.setCreateTime(createTime);
 				task.setContractId(contractId);
+				task.setPublishStatus(PublicStatus.WGS.getCode());
 				task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
 				task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				taskList.add(task);

+ 2 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -40,6 +40,7 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.enums.CommodityType;
 import com.goafanti.order.enums.ProjectStage;
+import com.goafanti.order.enums.PublicStatus;
 import com.goafanti.order.enums.TaskDistributionState;
 import com.goafanti.techproject.bo.ProjectDetailBo;
 import com.goafanti.techproject.bo.ProjectListBo;
@@ -375,6 +376,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			task.setCreateTime(new Date());
 			task.setContractId(contractId);
 			task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
+			task.setPublishStatus(PublicStatus.WGS.getCode());
 			task.setTaskComment(taskComment);
 			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			contractTaskMapper.insert(task);