Browse Source

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

wanghui 7 years ago
parent
commit
2fad237dc9

+ 6 - 4
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -167,14 +167,14 @@
       sign_date, sign_comment, complete_date, 
       complete_comment, deleted_sign, order_no, 
       status, contacts, contact_mobile, 
-      task_distribution,public_status)
+      task_distribution)
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
       #{type,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
       #{signDate,jdbcType=TIMESTAMP}, #{signComment,jdbcType=VARCHAR}, #{completeDate,jdbcType=TIMESTAMP}, 
       #{completeComment,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}, 
-      #{taskDistribution,jdbcType=INTEGER},#{publicStatus,jdbcType=INTEGER})
+      #{taskDistribution,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.Contract">
     <!--
@@ -746,7 +746,8 @@
 			commodity_quantity,
 			task_status,
 			task_comment,
-			create_time
+			create_time,
+			publish_status
 		)
 	values
     <foreach collection="list" index="index" item="item" separator=",">
@@ -760,7 +761,8 @@
 		#{item.commodityQuantity,jdbcType=INTEGER},
 		#{item.taskStatus,jdbcType=INTEGER},
 		#{item.taskComment,jdbcType=VARCHAR},
-		#{item.createTime,jdbcType=TIMESTAMP}
+		#{item.createTime,jdbcType=TIMESTAMP},
+		#{item.publishStatus,jdbcType=INTEGER}
 	  )
     </foreach>
    </insert>

+ 5 - 5
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -769,7 +769,7 @@ from
 			a.commodity_id as commodityId,
 			a.serial_number as taskNo,
 			a.task_status as taskStatus,
-			a.deleted_sign as deletedSign,
+			a.deleted_sign as deleteSign,
 			date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
 			a.task_comment as taskComment,
 			a.publish_status as publishStatus,
@@ -792,8 +792,8 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
-		<if test="deletedSign != null">
-			and a.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		<if test="deleteSign != null">
+			and a.deleted_sign = #{deleteSign,jdbcType=VARCHAR}
 		</if>
 		<if test="publishStatus != null">
 			and a.publish_status = #{publishStatus,jdbcType=VARCHAR}
@@ -839,8 +839,8 @@ from
 		<if test="taskReceiverId != null and taskReceiverId != ''">
 			and a.task_receiver = #{taskReceiverId,jdbcType=VARCHAR}
 		</if>
-		<if test="deletedSign != null">
-			and a.deleted_sign = #{deletedSign,jdbcType=VARCHAR}
+		<if test="deleteSign != null">
+			and a.deleted_sign = #{deleteSign,jdbcType=VARCHAR}
 		</if>
 		<if test="publishStatus != null">
 			and a.publish_status = #{publishStatus,jdbcType=VARCHAR}

+ 2 - 11
src/main/java/com/goafanti/common/model/Contract.java

@@ -100,10 +100,7 @@ public class Contract {
 	 */
 	private Integer taskDistribution;
 	
-	/**
-	 * 公示状态
-	 */
-	private Integer publicStatus;
+	
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.id
@@ -447,11 +444,5 @@ public class Contract {
 		this.taskDistribution = taskDistribution;
 	}
 
-	public Integer getPublicStatus() {
-		return publicStatus;
-	}
-
-	public void setPublicStatus(Integer publicStatus) {
-		this.publicStatus = publicStatus;
-	}
+	
 }

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

@@ -1555,7 +1555,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(tOrder.getTechnicianId()); //暂不确定
 		contract.setSignComment(signComment);
-		contract.setPublicStatus(PublicStatus.WGS.getCode());
 		contract.setTaskDistribution(TaskDistributionState.NOT_DISTRIBUTION.getCode());
 		contractMapper.insert(contract);
 		for(TOrderDetail orderDetail: detailList){

+ 2 - 2
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -799,10 +799,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/listTask",method = RequestMethod.POST)
 	public Result listTask(String projectNo,String buyerName,String taskReceiverName, String startDate,String endDate, 
-			Integer taskStatus,String categoryId,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize){
+			Integer taskStatus,String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(techProjectService.selectProjectTask(projectNo, buyerName, "", taskReceiverName, startDate, endDate, 
-				taskStatus, categoryId,deletedSign,publishStatus, pageNo, pageSize));
+				taskStatus, categoryId,deleteSign,publishStatus, pageNo, pageSize));
 		return res;
 	}
 	

+ 1 - 1
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -121,7 +121,7 @@ public interface TechProjectService {
 	 * @return
 	 */
 	Pagination<TaskListBo> selectProjectTask(String projectNo,String buyerName,String taskReceiverId, String taskReceiverName,
-			String startDate,String endDate, Integer taskStatus,String categoryId,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize);
+			String startDate,String endDate, Integer taskStatus,String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize);
 	
 	/**
 	 * 根据任务id查询任务

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

@@ -398,7 +398,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TaskListBo> selectProjectTask(String projectNo, String buyerName, String taskReceiverId, String taskReceiverName,
-			String startDate,String endDate, Integer taskStatus, String categoryId,String deletedSign,String publishStatus, Integer pageNo, Integer pageSize) {
+			String startDate,String endDate, Integer taskStatus, String categoryId,String deleteSign,String publishStatus, Integer pageNo, Integer pageSize) {
 		Map<String,Object> params = new HashMap<String,Object>();
 		if(StringUtils.isNotBlank(projectNo)) params.put("projectNo", projectNo);
 		if(StringUtils.isNotBlank(buyerName)) params.put("buyerName", buyerName);
@@ -412,7 +412,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			} catch (ParseException e) {
 		}
 		if(StringUtils.isNotBlank(categoryId)) params.put("categoryId", categoryId);
-		if(StringUtils.isNotBlank(deletedSign)) params.put("deletedSign", deletedSign);
+		if(StringUtils.isNotBlank(deleteSign)) params.put("deleteSign", deleteSign);
 		if(StringUtils.isNotBlank(publishStatus)) params.put("publishStatus", publishStatus);
 		if(taskStatus != null) params.put("taskStatus", taskStatus);
 		return (Pagination<TaskListBo>)findPage("selectProjectTaskByPage", "selectProjectTaskCount", params, pageNo, pageSize);