Browse Source

Merge branch 'master' of https://git.coding.net/aft/AFT

wubb 8 years ago
parent
commit
9026664e14

+ 3 - 3
src/main/java/com/goafanti/activity/bo/ActivityListBo.java

@@ -117,7 +117,7 @@ public class ActivityListBo {
 		if (this.startTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -129,7 +129,7 @@ public class ActivityListBo {
 		if (this.endTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -141,7 +141,7 @@ public class ActivityListBo {
 		if (this.enrollDeadline == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 

+ 5 - 5
src/main/java/com/goafanti/activity/service/impl/ActivityServiceImpl.java

@@ -42,9 +42,9 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 		Map<String, Object> params = new HashMap<>();
 
 		try {
-			params.put("sTime", StringUtils.isBlank(sTime) ? null : DateUtils.parseDate(sTime, AFTConstants.YYYYMMDD));
+			params.put("sTime", StringUtils.isBlank(sTime) ? null : DateUtils.parseDate(sTime, AFTConstants.YYYYMMDDHHMMSS));
 			params.put("eTime", StringUtils.isBlank(eTime) ? null
-					: DateUtils.addDays(DateUtils.parseDate(eTime, AFTConstants.YYYYMMDD), 1));
+					: DateUtils.addDays(DateUtils.parseDate(eTime, AFTConstants.YYYYMMDDHHMMSS), 1));
 		} catch (ParseException e) {
 		}
 
@@ -97,13 +97,13 @@ public class ActivityServiceImpl extends BaseMybatisDao<ActivityMapper> implemen
 			String enrollDeadlineFormattedDate) {
 		try {
 			if (StringUtils.isNotBlank(startTimeFormattedDate)) {
-				a.setStartTime(DateUtils.parseDate(startTimeFormattedDate, AFTConstants.YYYYMMDD));
+				a.setStartTime(DateUtils.parseDate(startTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (StringUtils.isNotBlank(endTimeFormattedDate)) {
-				a.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDD));
+				a.setEndTime(DateUtils.parseDate(endTimeFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 			if (StringUtils.isNotBlank(enrollDeadlineFormattedDate)) {
-				a.setEnrollDeadline(DateUtils.parseDate(enrollDeadlineFormattedDate, AFTConstants.YYYYMMDD));
+				a.setEnrollDeadline(DateUtils.parseDate(enrollDeadlineFormattedDate, AFTConstants.YYYYMMDDHHMMSS));
 			}
 		} catch (ParseException e) {
 		}

+ 3 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -928,10 +928,10 @@ public class CognizanceApiController extends CertifyApiController {
 	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
 
-		User curUser = TokenManager.getUserToken();
+		/*User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
-		}
+		}*/
 
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
@@ -939,7 +939,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 
 		OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(id);
-		if (ratepay == null || !curUser.getId().equals(ratepay.getUid())) {
+		if (ratepay == null || !TokenManager.getUserId().equals(ratepay.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
 		}

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

@@ -671,7 +671,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -721,7 +721,7 @@
 		and  audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  name = #{name,jdbcType=VARCHAR}
+		and  name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -774,7 +774,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -824,7 +824,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"

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

@@ -504,7 +504,7 @@
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -574,7 +574,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -646,7 +646,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -716,7 +716,7 @@
 		and  oi.licence_province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -825,7 +825,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -869,7 +869,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"

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

@@ -235,7 +235,7 @@ public class Activity {
 		if (this.startTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.startTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -247,7 +247,7 @@ public class Activity {
 		if (this.endTime == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.endTime, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}
 
@@ -259,7 +259,7 @@ public class Activity {
 		if (this.enrollDeadline == null) {
 			return null;
 		} else {
-			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDD);
+			return DateFormatUtils.format(this.enrollDeadline, AFTConstants.YYYYMMDDHHMMSS);
 		}
 	}