Antiloveg 8 years ago
parent
commit
1acf7580cd

+ 2 - 0
src/main/java/com/goafanti/common/dao/DemandMapper.java

@@ -23,4 +23,6 @@ public interface DemandMapper {
 	int batchDeleteByPrimaryKey(List<String> id);
 
 	DemandManageDetailBo selectOrgDemandDetail(String id);
+
+	int updateValidityPeriod(String id);
 }

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

@@ -740,4 +740,9 @@
 	</foreach>
   </update>
   
+  <update id="updateValidityPeriod" parameterType="java.lang.String">
+  	update demand set validity_period = null
+  	where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
 </mapper>

+ 4 - 0
src/main/java/com/goafanti/demand/bo/InputDemand.java

@@ -18,6 +18,10 @@ public class InputDemand {
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	private Integer		dataCategory;
 	
+	@Max(value = 99999999, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
+	private Integer serialNumber;
+	
 	@Size(min = 0, max = 32, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		name;
 	

+ 2 - 5
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -309,12 +308,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (DemandReleaseStatus.UNRELEASE.getCode().equals(d.getReleaseStatus())
 				&& DemandReleaseStatus.RELEASED.getCode().equals(demand.getReleaseStatus())) {
 			d.setStatus(DemandStatus.CREATE.getCode());
-			d.setValidityPeriod(null);
+			demandMapper.updateValidityPeriod(demand.getId());
 		}
 		
-		BeanUtils.copyProperties(d, demand);
-		
-		return demandMapper.updateByPrimaryKey(demand);
+		return demandMapper.updateByPrimaryKeySelective(d);
 	}
 
 	@Override