Antiloveg 8 éve%!(EXTRA string=óta)
szülő
commit
7e1077c056

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

@@ -838,7 +838,7 @@ public class AdminApiController extends CertifyApiController {
 	 * 企业参与国家标准或行业标准制定情况明细列表
 	 */
 	@RequestMapping(value = "/standard", method = RequestMethod.POST)
-	public Result standard(String uid, String standardName, String standardNumber, Integer standardLevel,
+	public Result standard(Integer year, String uid, String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, String pageNo, String pageSize) {
 		Result res = new Result();
 		if (StringUtils.isBlank(uid)) {
@@ -857,7 +857,7 @@ public class AdminApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+		res.setData(orgStandardService.listOrgStandard(year, standardName, standardNumber, standardLevel, participateWay, pNo,
 				pSize, uid));
 		return res;
 	}

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

@@ -1485,7 +1485,7 @@ public class CognizanceApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/standard", method = RequestMethod.POST)
-	public Result standard(String standardName, String standardNumber, Integer standardLevel, Integer participateWay,
+	public Result standard(Integer year, String standardName, String standardNumber, Integer standardLevel, Integer participateWay,
 			String pageNo, String pageSize) {
 		Result res = new Result();
 
@@ -1501,7 +1501,7 @@ public class CognizanceApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(orgStandardService.listOrgStandard(standardName, standardNumber, standardLevel, participateWay, pNo,
+		res.setData(orgStandardService.listOrgStandard(year, standardName, standardNumber, standardLevel, participateWay, pNo,
 				pSize, TokenManager.getUserId()));
 		return res;
 	}

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/OrgStandardService.java

@@ -11,7 +11,7 @@ public interface OrgStandardService {
 
 	int updateByPrimaryKeySelective(OrgStandard orgStandard);
 
-	Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+	Pagination<OrgStandard> listOrgStandard(Integer year, String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, Integer pNo, Integer pSize, String userId);
 
 	int delete(String id);

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgAnnualReportServiceImpl.java

@@ -122,7 +122,7 @@ public class OrgAnnualReportServiceImpl extends BaseMybatisDao<OrgAnnualReportMa
 			report.setLocationArea(m.getLocationArea());
 			report.setListed(m.getListed().toString());
 			if (null != m.getListedDate()) {
-				report.setListedDate(DateFormatUtils.format(m.getListedDate(), AFTConstants.YYYYMMDDHHMMSS));
+				report.setListedDate(DateFormatUtils.format(m.getListedDate(), AFTConstants.YYYYMMDD));
 			}
 			report.setListedType(m.getListedType().toString());
 			report.setStockCode(m.getStockCode());

+ 5 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgStandardServiceImpl.java

@@ -32,10 +32,14 @@ public class OrgStandardServiceImpl extends BaseMybatisDao<OrgStandardMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<OrgStandard> listOrgStandard(String standardName, String standardNumber, Integer standardLevel,
+	public Pagination<OrgStandard> listOrgStandard(Integer year, String standardName, String standardNumber, Integer standardLevel,
 			Integer participateWay, Integer pageNo, Integer pageSize, String uid) {
 		Map<String, Object> params = new HashMap<>();
 		
+		if (null == year){
+			params.put("year", year);
+		}
+		
 		if (!StringUtils.isBlank(uid)){
 			params.put("uid", uid);
 		}

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

@@ -166,6 +166,9 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
+	<if test="year != null">
+	 	and  year = #{year,jdbcType=INTEGER}
+	</if>
     <if test="standardName != null">
     	and  standard_name = #{standardName,jdbcType=VARCHAR}
     </if>
@@ -192,6 +195,9 @@
     <if test="uid != null">
 	    and  uid = #{uid,jdbcType=VARCHAR}
 	</if>
+	<if test="year != null">
+	 	and  year = #{year,jdbcType=INTEGER}
+	</if>
     <if test="standardName != null">
     	and  standard_name = #{standardName,jdbcType=VARCHAR}
     </if>