Browse Source

专利提醒修改

anderx 6 years ago
parent
commit
1ecfdf98c9

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

@@ -999,7 +999,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.task_start_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and  e.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by  a.task_start_time desc
   	<if test="page_sql!=null">
@@ -1025,7 +1025,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="starTime !=null and endTime !=null">
-  	and a.task_start_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and  e.sign_time between #{starTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   </select>
   

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TTaskHoursMapper.xml

@@ -342,7 +342,7 @@
   	and a.id= #{taskId,jdbcType=VARCHAR}
   	</if>
   	<if test="startTime !=null and endTime !=null and startTime !='' and endTime !=''">
-  	and a.task_start_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  	and e.sign_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
   	</if>
   	order by  a.task_start_time desc
   </select>

+ 9 - 1
src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java

@@ -38,6 +38,10 @@ public class AdminPatentNewApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "专利", "专利"));
 			return res;
 		}
+		if (StringUtils.isBlank(p.getEmail())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "邮箱", "邮箱"));
+			return res;
+		}
 		if ( StringUtils.isBlank(p.getApplyDates())|| StringUtils.isBlank(p.getAuthorizationDates())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "时间", "时间"));
 			return res;
@@ -60,10 +64,14 @@ public class AdminPatentNewApiController extends CertifyApiController {
 	@RequestMapping(value = "/updatePatentNew", method = RequestMethod.POST)
 	public Result updatePatentNew(PatentNewBo p){
 		Result res = new Result();
-		if (StringUtils.isBlank(p.getPatentNo())|| StringUtils.isBlank(p.getName())||StringUtils.isBlank(p.getCertificateUrl())) {
+		if (StringUtils.isBlank(p.getPatentNo())|| StringUtils.isBlank(p.getName())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "专利", "专利"));
 			return res;
 		}
+		if ( StringUtils.isBlank(p.getEmail())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "邮箱", "邮箱"));
+			return res;
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat( AFTConstants.YYYYMMDD);
 		try {
 			p.setApplyDate(sdf.parse(p.getApplyDates()));