Antiloveg 8 years ago
parent
commit
fb42e78905

+ 1 - 1
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1791,7 +1791,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgActivityCost.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		if (StringUtils.isBlank(signDateFormattedDate)) {
+		if (!StringUtils.isBlank(signDateFormattedDate)) {
 			try {
 				orgActivityCost.setSignDate(DateUtils.parseDate(signDateFormattedDate, AFTConstants.YYYYMMDD));
 			} catch (ParseException e) {

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

@@ -384,7 +384,7 @@
 		 >= (select  str_to_date(CONCAT(#{0}-2,'-01-01'), '%Y-%m-%d %H'))
 				and  end_date   <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
 	)
-	and deleted_sign = 0
+	and deleted_sign = 0 order by start_date 
   </select>
  <!--  <select id="selectDetailById" parameterType="java.lang.String" resultMap="BaseResultMap">
   	

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

@@ -278,6 +278,6 @@
     where uid = #{1} and authorization_date 
 		 >= (select  str_to_date(CONCAT(#{0},'-01-01'), '%Y-%m-%d %H'))
 				and authorization_date  <![CDATA[ < ]]> (select  str_to_date(CONCAT(#{0}+1,'-01-01'), '%Y-%m-%d %H'))
-	and deleted_sign = 0
+	and deleted_sign = 0 order by authorization_date
   </select>
 </mapper>