Browse Source

年报列表更改为年份倒序

anderx 7 years ago
parent
commit
914fcf36a6

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

@@ -358,6 +358,7 @@
   <include refid="Base_Column_List" />
   from organization_annual_report
   where uid= #{uid,jdbcType=VARCHAR}
+  order by `year`desc
   <if test="page_sql != null">
     		${page_sql}
    		</if>
@@ -374,6 +375,7 @@
   <include refid="Year_Project_List" />
   from organization_year_project
   where uid= #{uid,jdbcType=VARCHAR}
+  order by `year`desc
   <if test="page_sql != null">
     		${page_sql}
    		</if>

+ 2 - 2
src/main/java/com/goafanti/customer/service/impl/AdminOrgAnnualReportServiceImpl.java

@@ -34,7 +34,7 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 		o.setAid(TokenManager.getAdminId());
 //		o.setAid("1");
 		countIntegrity(o.getUid());
-		return organizationAnnualReportMapper.insert(o);
+		return organizationAnnualReportMapper.insertSelective(o);
 	}
 
 	private void countIntegrity(String uid) {
@@ -93,7 +93,7 @@ public class AdminOrgAnnualReportServiceImpl  extends BaseMybatisDao<Organizatio
 		o.setId(UUID.randomUUID().toString());
 		o.setAid(TokenManager.getAdminId());
 //		o.setAid("1");
-		int i=organizationYearProjectMapper.insert(o);
+		int i=organizationYearProjectMapper.insertSelective(o);
 		countIntegrity(o.getUid());
 		return i; 
 	}