Browse Source

Accept Merge Request #195 mg : (test -> master)

Merge Request: mg
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/195
Antiloveg 8 years ago
parent
commit
8318f55246
21 changed files with 226 additions and 92 deletions
  1. 2 4
      src/main/java/com/goafanti/achievement/bo/InputAchievement.java
  2. 2 2
      src/main/java/com/goafanti/achievement/service/AchievementService.java
  3. 27 13
      src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java
  4. 10 10
      src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java
  5. 1 1
      src/main/java/com/goafanti/admin/controller/AdminApiController.java
  6. 6 6
      src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java
  7. 4 1
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  8. 6 10
      src/main/java/com/goafanti/common/dao/OrganizationPropertiesMapper.java
  9. 32 4
      src/main/java/com/goafanti/common/mapper/AchievementMapper.xml
  10. 18 6
      src/main/java/com/goafanti/common/mapper/DemandMapper.xml
  11. 6 3
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  12. 3 3
      src/main/java/com/goafanti/demand/service/DemandService.java
  13. 12 4
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  14. 12 0
      src/main/java/com/goafanti/user/bo/AuditorOrgIdentityDetailBo.java
  15. 13 1
      src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java
  16. 17 0
      src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java
  17. 7 1
      src/main/java/com/goafanti/user/controller/UserApiController.java
  18. 3 0
      src/main/java/com/goafanti/user/service/OrganizationIdentityService.java
  19. 35 22
      src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java
  20. 10 0
      src/main/java/com/goafanti/user/service/impl/OrganizationInfoServiceImpl.java
  21. 0 1
      src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html

+ 2 - 4
src/main/java/com/goafanti/achievement/bo/InputAchievement.java

@@ -158,10 +158,10 @@ public class InputAchievement {
 
 	@Size(min = 0, max = 36, message = "{" + ErrorConstants.PARAM_SIZE_ERROR + "}")
 	private String		techBrokerId;
-	
+
 	@Max(value = 3, message = "{" + ErrorConstants.PARAM_ERROR + "}")
 	@Min(value = 0, message = "{" + ErrorConstants.PARAM_ERROR + "}")
-	private Integer contacts;
+	private Integer		contacts;
 
 	public String getId() {
 		return id;
@@ -530,7 +530,5 @@ public class InputAchievement {
 	public void setContacts(Integer contacts) {
 		this.contacts = contacts;
 	}
-	
-	
 
 }

+ 2 - 2
src/main/java/com/goafanti/achievement/service/AchievementService.java

@@ -18,7 +18,7 @@ import com.goafanti.portal.bo.AchievementSearchListBo;
 
 public interface AchievementService {
 
-	Pagination<AchievementListBo> listUserOwnerAchievement(String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 
@@ -38,7 +38,7 @@ public interface AchievementService {
 
 	int updateReleaseStatus(Achievement a);
 
-	Pagination<AchievementListBo> listOrgOwnerAchievement(String ownerId, Integer auditStatus, Integer serialNumber,
+	Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber,
 			String name, String keyword, Integer category, Integer status, String releaseDateStartDate,
 			String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize);
 

+ 27 - 13
src/main/java/com/goafanti/achievement/service/impl/AchievementServiceImpl.java

@@ -82,8 +82,8 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listUserOwnerAchievement(String ownerId, Integer auditStatus,
-			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+	public Pagination<AchievementListBo> listUserOwnerAchievement(String username, String ownerName, String ownerId,
+			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -93,15 +93,16 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findUserOwnerAchievementListByPage",
-				"findUserOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
-						category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findUserOwnerAchievementCount",
+				disposeParams(username, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.PERSONAL.getCode()),
 				pNo, pSize);
 	}
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<AchievementListBo> listOrgOwnerAchievement(String ownerId, Integer auditStatus,
-			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+	public Pagination<AchievementListBo> listOrgOwnerAchievement(String unitName, String ownerName, String ownerId,
+			Integer auditStatus, Integer serialNumber, String name, String keyword, Integer category, Integer status,
 			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer pNo, Integer pSize) {
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
@@ -111,8 +112,9 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findOrgOwnerAchievementListByPage",
-				"findOrgOwnerAchievementCount", disposeParams(ownerId, auditStatus, serialNumber, name, keyword,
-						category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findOrgOwnerAchievementCount",
+				disposeParams(unitName, ownerName, ownerId, auditStatus, serialNumber, name, keyword, category, status,
+						releaseDateStartDate, releaseDateEndDate, releaseStatus, UserType.ORGANIZATION.getCode()),
 				pNo, pSize);
 	}
 
@@ -193,14 +195,14 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			pSize = 10;
 		}
 		return (Pagination<AchievementListBo>) findPage("findAchievementListByPage",
-				"findAchievementCount", disposeParams(TokenManager.getUserId(), auditStatus, serialNumber, name,
-						keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus),
+				"findAchievementCount", disposeParams(null, null, TokenManager.getUserId(), auditStatus, serialNumber,
+						name, keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, null),
 				pNo, pSize);
 	}
 
-	private Map<String, Object> disposeParams(String ownerId, Integer auditStatus, Integer serialNumber, String name,
-			String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-			Integer releaseStatus) {
+	private Map<String, Object> disposeParams(String username, String ownerName, String ownerId, Integer auditStatus,
+			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, Integer type) {
 		Map<String, Object> params = new HashMap<>();
 
 		Date rStart = null;
@@ -220,6 +222,18 @@ public class AchievementServiceImpl extends BaseMybatisDao<AchievementMapper> im
 			}
 		}
 
+		if (StringUtils.isNotBlank(ownerName)) {
+			params.put("ownerName", ownerName);
+		}
+
+		if (null != type && StringUtils.isNotBlank(username)) {
+			if (UserType.PERSONAL.getCode().equals(type) ) {
+				params.put("username", username);
+			} else {
+				params.put("unitName", username);
+			}
+		}
+
 		if (null != rStart) {
 			params.put("rStart", rStart);
 		}

+ 10 - 10
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -62,9 +62,10 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 * 个人成果列表
 	 */
 	@RequestMapping(value = "/userList", method = RequestMethod.GET)
-	private Result userList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
-			Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
-			Integer releaseStatus, String pageNo, String pageSize) {
+	private Result userList(String username, String ownerName, String ownerId, Integer auditStatus,
+			Integer serialNumber, String name, String keyword, Integer category, Integer status,
+			String releaseDateStartDate, String releaseDateEndDate, Integer releaseStatus, String pageNo,
+			String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
 		Integer pSize = 10;
@@ -74,8 +75,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(achievementService.listUserOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
-				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+		res.setData(achievementService.listUserOwnerAchievement(username, ownerName, ownerId, auditStatus, serialNumber, name,
+				keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
 
@@ -83,8 +84,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 	 * 组织用户成果列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	private Result orgList(String ownerId, Integer auditStatus, Integer serialNumber, String name, String keyword,
-			Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
+	private Result orgList(String unitName, String ownerName, String ownerId, Integer auditStatus, Integer serialNumber, String name,
+			String keyword, Integer category, Integer status, String releaseDateStartDate, String releaseDateEndDate,
 			Integer releaseStatus, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -96,8 +97,8 @@ public class AdminAchievementApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(achievementService.listOrgOwnerAchievement(ownerId, auditStatus, serialNumber, name, keyword,
-				category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
+		res.setData(achievementService.listOrgOwnerAchievement(unitName, ownerName, ownerId, auditStatus, serialNumber, name,
+				keyword, category, status, releaseDateStartDate, releaseDateEndDate, releaseStatus, pNo, pSize));
 		return res;
 	}
 
@@ -638,6 +639,5 @@ public class AdminAchievementApiController extends CertifyApiController {
 		res.setData(data);
 		return res;
 	}
-	
 
 }

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

@@ -1827,7 +1827,7 @@ public class AdminApiController extends CertifyApiController {
 	@RequestMapping(value = "/downloadRatepay", method = RequestMethod.GET)
 	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
-		if (StringUtils.isEmpty(id)) {
+		if (StringUtils.isBlank(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
 		}

+ 6 - 6
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -189,7 +189,7 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 个人用户--需求列表
 	 */
 	@RequestMapping(value = "/userList", method = RequestMethod.GET)
-	public Result userList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
+	public Result userList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
 			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {
@@ -203,7 +203,7 @@ public class AdminDemandApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.selectUserDemandManageList(auditStatus, province, serialNumber, name, keyword,
+		res.setData(demandService.selectUserDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
 				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
 				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
 		return res;
@@ -213,9 +213,9 @@ public class AdminDemandApiController extends CertifyApiController {
 	 * 组织用户--需求列表
 	 */
 	@RequestMapping(value = "/orgList", method = RequestMethod.GET)
-	public Result orgList(Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
+	public Result orgList(String employerName, Integer auditStatus, Integer province, Integer serialNumber, String name, String keyword,
 			Integer infoSources, Integer demandType, String validityPeriodStartDate, String validityPeriodEndDate,
-			String username, Integer status, Integer releaseStatus, String releaseDateStartDate,
+			String unitName, Integer status, Integer releaseStatus, String releaseDateStartDate,
 			String releaseDateEndDate, String pageNo, String pageSize) {
 		Result res = new Result();
 		Integer pNo = 1;
@@ -227,8 +227,8 @@ public class AdminDemandApiController extends CertifyApiController {
 		if (StringUtils.isNumeric(pageNo)) {
 			pNo = Integer.parseInt(pageNo);
 		}
-		res.setData(demandService.selectOrgDemandManageList(auditStatus, province, serialNumber, name, keyword,
-				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, username, status,
+		res.setData(demandService.selectOrgDemandManageList(employerName, auditStatus, province, serialNumber, name, keyword,
+				infoSources, demandType, validityPeriodStartDate, validityPeriodEndDate, unitName, status,
 				releaseStatus, releaseDateStartDate, releaseDateEndDate, pNo, pSize));
 		return res;
 	}

+ 4 - 1
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -10,6 +10,7 @@ import com.goafanti.user.bo.OrgBasicInfoBo;
 import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 
 public interface OrganizationIdentityMapper {
     int deleteByPrimaryKey(String id);
@@ -34,7 +35,7 @@ public interface OrganizationIdentityMapper {
 
 	OrgIdentityDetailBo selectOrgIdentityDetailByUserId(String uid);
 
-	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid);
+	AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(@Param("uid")String uid, @Param("year")Integer year);
 
 	List<OrgUnitNames> selectManagerUnitNames(String aid);
 
@@ -42,4 +43,6 @@ public interface OrganizationIdentityMapper {
 
 	List<OrgUnitNames> selectAchievementOrgOwner(@Param("aid")String aid, @Param("name")String name);
 
+	OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(@Param("uid")String uid, @Param("year")Integer year);
+
 }

+ 6 - 10
src/main/java/com/goafanti/common/dao/OrganizationPropertiesMapper.java

@@ -3,21 +3,17 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.OrganizationProperties;
 
 public interface OrganizationPropertiesMapper {
-    int deleteByPrimaryKey(String id);
+	int deleteByPrimaryKey(String id);
 
-    int insert(OrganizationProperties record);
+	int insert(OrganizationProperties record);
 
-    int insertSelective(OrganizationProperties record);
+	int insertSelective(OrganizationProperties record);
 
-    OrganizationProperties selectByPrimaryKey(String id);
+	OrganizationProperties selectByPrimaryKey(String id);
 
-    int updateByPrimaryKeySelective(OrganizationProperties record);
+	int updateByPrimaryKeySelective(OrganizationProperties record);
 
-    int updateByPrimaryKey(OrganizationProperties record);
-    
-    
-    //根据组织id查询
-   // OrganizationProperties selectByOid(String oid);
+	int updateByPrimaryKey(OrganizationProperties record);
 
 	OrganizationProperties selectOrgProByUserId(String uid);
 

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

@@ -655,6 +655,12 @@
   	LEFT JOIN admin ad on a.id = a.tech_broker_id
   	LEFT JOIN user_identity ui on a.owner_id = ui.uid
   	where a.deleted_sign = 0 and a.owner_type = 0
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -699,6 +705,12 @@
   		count(1)
   	from achievement
   	where deleted_sign = 0 and owner_type = 0
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="username != null">
+  		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -746,6 +758,12 @@
   	LEFT JOIN admin ad on ad.id = a.tech_broker_id
   	LEFT JOIN organization_identity oi on a.owner_id = oi.uid
   	where a.deleted_sign = 0 and a.owner_type = 1
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -790,6 +808,12 @@
   		count(1)
   	from achievement a
   	where a.deleted_sign = 0 and a.owner_type = 1
+  	<if test="ownerName != null">
+  		and  a.owner_name like CONCAT('%',#{ownerName,jdbcType=VARCHAR},'%')
+  	</if>
+  	<if test="unitName != null">
+  		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+  	</if>
   	<if test="ownerId != null">
 		and  a.owner_id = #{ownerId,jdbcType=VARCHAR}
 	</if>
@@ -1218,13 +1242,15 @@
 		a.id,
 		a.name,
 		a.maturity,
-		ui.province,
-		ui.city,
+		dg.name as province,
+		dgg.name as city,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN user_identity ui ON ui.uid = a.owner_id
+	LEFT JOIN district_glossory dg on dg.id = ui.province
+	LEFT JOIN district_glossory dgg on dgg.id = ui.city
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0
@@ -1240,13 +1266,15 @@
 		a.id,
 		a.name,
 		a.maturity,
-		oi.licence_province as province,
-		oi.licence_city as city,
+		dg.name as province,
+		dgg.name as city,
 		a.transfer_price as transferPrice,
 		a.bargaining_mode as bargainingMode
 	FROM
 		achievement a
 	LEFT JOIN organization_identity oi ON oi.uid = a.owner_id
+	LEFT JOIN district_glossory dg on dg.id = oi.licence_province
+	LEFT JOIN district_glossory dgg on dgg.id = oi.licence_city 
 	WHERE
 		a.audit_status = 3
 	AND a.deleted_sign = 0

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

@@ -510,7 +510,10 @@
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	<if test="username != null">
-		and  ui.username = #{username,jdbcType=VARCHAR}
+		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -577,7 +580,10 @@
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
 	<if test="username != null">
-		and  ui.username = #{username,jdbcType=VARCHAR}
+		and  ui.username like CONCAT('%',#{username,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -645,8 +651,11 @@
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
-	<if test="username != null">
-		and  oi.unit_name = #{username,jdbcType=VARCHAR}
+	<if test="unitName != null">
+		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}
@@ -712,8 +721,11 @@
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
 	</if>
-	<if test="username != null">
-		and  oi.unit_name = #{username,jdbcType=VARCHAR}
+	<if test="unitName != null">
+		and  oi.unit_name like CONCAT('%',#{unitName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="employerName != null">
+		and  d.employer_name like CONCAT('%',#{employerName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="infoSources != null">
 		and  d.info_sources = #{infoSources,jdbcType=INTEGER}

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

@@ -946,8 +946,9 @@
 
 	<select id="selectOrgIdentityBoByUserId" parameterType="java.lang.String"
 		resultType="com.goafanti.user.bo.OrgIdentityBo">
-		select t.id,t.uid,t.contacts,t.fixed_tel as fixedTel
-		,t.qq,t.postal_address
+		select 
+		t.id,t.uid,t.contacts,t.fixed_tel as fixedTel,
+		t.qq,t.postal_address
 		as postalAddress ,t.postcode,
 		t.first_contacts as
 		firstContacts, t.first_mobile as firstMobile,
@@ -1050,9 +1051,11 @@
 			 oi.org_code_url as orgCodeUrl,  oi.banks, bank_branch as bankBranch,  oi.bank_card_number as bankCardNumber,
 			 oi.location_province as locationProvince,  oi.location_city as locationCity,  oi.location_area as locationArea,
 			 oi.validation_amount as validationAmount,  oi.payment_date as paymentDate,  oi.audit_status as auditStatus,
-			 oi.last_year_tax_report_url as lastYearTaxReportUrl, oi.field, oi.registered_capital as registeredCapital
+			 oi.last_year_tax_report_url as lastYearTaxReportUrl, oi.field, oi.registered_capital as registeredCapital,
+			 ratepay.id as ratepayId
 		from user u 
 		LEFT JOIN organization_identity oi on oi.uid = u.id
+		LEFT JOIN org_ratepay ratepay on ratepay.uid = u.id and ratepay.year = #{year,jdbcType=INTEGER} and deleted_sign = 0
 		where uid = #{uid,jdbcType=VARCHAR}
 	</select>
 	

+ 3 - 3
src/main/java/com/goafanti/demand/service/DemandService.java

@@ -18,12 +18,12 @@ import com.goafanti.portal.bo.DemandSearchListBo;
 
 public interface DemandService {
 
-	Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
+	Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
-			String validityPeriodStartDate, String validityPeriodEndDate, String employerName, Integer status,
+			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);
 
-	Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province, Integer serialNumber,
+	Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province, Integer serialNumber,
 			String name, String keyword, Integer infoSources, Integer demandType, String validityPeriodStartDate,
 			String validityPeriodEndDate, String username, Integer status, Integer releaseStatus,
 			String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize);

+ 12 - 4
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -85,7 +85,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectUserDemandManageList(Integer auditStatus, Integer province,
+	public Pagination<DemandManageListBo> selectUserDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -113,6 +113,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}
+		
+		if (StringUtils.isNotBlank(employerName)){
+			params.put("employerName", employerName);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageUserDemandListByPage", "findManageUserDemandCount",
 				params, pNo, pSize);
@@ -121,7 +125,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<DemandManageListBo> selectOrgDemandManageList(Integer auditStatus, Integer province,
+	public Pagination<DemandManageListBo> selectOrgDemandManageList(String employerName, Integer auditStatus, Integer province,
 			Integer serialNumber, String name, String keyword, Integer infoSources, Integer demandType,
 			String validityPeriodStartDate, String validityPeriodEndDate, String username, Integer status,
 			Integer releaseStatus, String releaseDateStartDate, String releaseDateEndDate, Integer pNo, Integer pSize) {
@@ -148,6 +152,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}
+		
+		if (StringUtils.isNotBlank(employerName)){
+			params.put("employerName", employerName);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
 				params, pNo, pSize);
@@ -537,9 +545,9 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			params.put("keyword", keyword);
 		}
 
-		if (!StringUtils.isBlank(username)) {
+		/*if (!StringUtils.isBlank(username)) {
 			params.put("username", username);
-		}
+		}*/
 
 		if (null != infoSources) {
 			params.put("infoSources", infoSources);

+ 12 - 0
src/main/java/com/goafanti/user/bo/AuditorOrgIdentityDetailBo.java

@@ -4,6 +4,8 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 	private String	aid;
 
 	private String	mid;
+	
+	private String ratepayId;
 
 	public String getAid() {
 		return aid;
@@ -21,4 +23,14 @@ public class AuditorOrgIdentityDetailBo extends OrgIdentityDetailBo {
 		this.mid = mid;
 	}
 
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+
 }

+ 13 - 1
src/main/java/com/goafanti/user/bo/OrgIdentityDetailAdmin.java

@@ -4,7 +4,9 @@ import com.goafanti.common.model.OrganizationIdentity;
 
 public class OrgIdentityDetailAdmin extends OrganizationIdentity {
 	private String level;
-
+	
+	private String ratepayId;
+	
 	public String getLevel() {
 		return level;
 	}
@@ -13,4 +15,14 @@ public class OrgIdentityDetailAdmin extends OrganizationIdentity {
 		this.level = level;
 	}
 
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+
 }

+ 17 - 0
src/main/java/com/goafanti/user/bo/OrganizationIndentityUserBo.java

@@ -0,0 +1,17 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.OrganizationIdentity;
+
+public class OrganizationIndentityUserBo extends OrganizationIdentity{
+	private String ratepayId;
+
+	public String getRatepayId() {
+		return ratepayId;
+	}
+
+	public void setRatepayId(String ratepayId) {
+		this.ratepayId = ratepayId;
+	}
+	
+	
+}

+ 7 - 1
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -425,6 +425,12 @@ public class UserApiController extends BaseApiController {
 					OrgProFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		
+		if (StringUtils.isBlank(pro.getCompanyName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到单位名称", "单位名称"));
+			return res;
+		}
 
 		OrganizationInfo oi = new OrganizationInfo();
 		OrganizationProperties op = new OrganizationProperties();
@@ -735,7 +741,7 @@ public class UserApiController extends BaseApiController {
 	public Result orgProcess() {
 		Result res = new Result();
 		if (TokenManager.isLogin()) {
-			res.setData(organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId()));
+			res.setData(organizationIdentityService.selectOrgIdentityUserBoByUserId(TokenManager.getUserId()));
 		}
 		return res;
 	}

+ 3 - 0
src/main/java/com/goafanti/user/service/OrganizationIdentityService.java

@@ -14,6 +14,7 @@ import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 
 public interface OrganizationIdentityService {
 
@@ -51,5 +52,7 @@ public interface OrganizationIdentityService {
 	OrgIdentityDetailAdmin selectOrgIdentityDetailByUserIdAdmin(String uid);
 
 	void save(OrgIdentityBo orgIdentityBo);
+	
+	OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(String userId);
 
 }

+ 35 - 22
src/main/java/com/goafanti/user/service/impl/OrganizationIdentityServiceImpl.java

@@ -42,6 +42,7 @@ import com.goafanti.user.bo.OrgIdentityBo;
 import com.goafanti.user.bo.OrgIdentityDetailAdmin;
 import com.goafanti.user.bo.OrgIdentityDetailBo;
 import com.goafanti.user.bo.OrgUnitNames;
+import com.goafanti.user.bo.OrganizationIndentityUserBo;
 import com.goafanti.user.service.OrganizationIdentityService;
 
 @Service
@@ -71,6 +72,18 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		return organizationIdentityMapper.selectOrgIdentityByUserId(userId);
 	}
 
+	public OrganizationIndentityUserBo selectOrgIdentityUserBoByUserId(String userId) {
+		OrganizationIdentity oi = organizationIdentityMapper.selectOrgIdentityByUserId(userId);
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(userId,
+				Calendar.getInstance().get(Calendar.YEAR - 1));
+		OrganizationIndentityUserBo bo = new OrganizationIndentityUserBo();
+		BeanUtils.copyProperties(oi, bo);
+		if (null != ratepay) {
+			bo.setRatepayId(ratepay.getId());
+		}
+		return null;
+	}
+
 	@Override
 	public int updateByPrimaryKeySelective(OrganizationIdentity organizationIdentity) {
 		return organizationIdentityMapper.updateByPrimaryKeySelective(organizationIdentity);
@@ -118,6 +131,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 	@Override
 	public int saveOrgIndentityProcess(Result res, OrganizationIdentity o, String uid) {
 		OrganizationIdentity org = organizationIdentityMapper.selectOrgIdentityByUserId(uid);
+		if (StringUtils.isNotBlank(o.getLastYearTaxReportUrl())) {
+			disposeRatePay(o, uid);
+		}
 		if (null == org) {
 			o.setId(UUID.randomUUID().toString());
 			o.setUid(uid);
@@ -127,7 +143,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			if (null != o.getAuditStatus() && 5 == o.getAuditStatus()) {
 				User u = new User();
 				u.setId(uid);
-				u.setLvl(1);
+				u.setLvl(UserLevel.CERTIFIED.getCode());
 				userMapper.updateByPrimaryKeySelective(u);
 			}
 			return organizationIdentityMapper.updateByPrimaryKeySelective(o);
@@ -136,21 +152,8 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public int updateOrgDetail(OrganizationIdentity orgIdentity, String saveSign, Integer level) {
-		if (null != orgIdentity.getLastYearTaxReportUrl()) {
-			Calendar cal = Calendar.getInstance();
-			OrgRatepay rate = orgRatepayMapper.selectRatepayByUidAndYear(orgIdentity.getUid(), Calendar.YEAR - 1);
-			if (null == rate) {
-				OrgRatepay r = new OrgRatepay();
-				r.setId(UUID.randomUUID().toString());
-				r.setUid(orgIdentity.getUid());
-				r.setYear(cal.get(Calendar.YEAR) - 1);
-				r.setDeletedSign(DeleteStatus.UNDELETE.getCode());
-				r.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-				orgRatepayMapper.insert(r);
-			} else {
-				rate.setTaxReturnUrl(orgIdentity.getLastYearTaxReportUrl());
-				orgRatepayMapper.updateByPrimaryKeySelective(rate);
-			}
+		if (StringUtils.isNotBlank(orgIdentity.getLastYearTaxReportUrl())) {
+			disposeRatePay(orgIdentity, orgIdentity.getUid());
 		}
 		User user = userMapper.selectByPrimaryKey(orgIdentity.getUid());
 		user.setLvl(level);
@@ -178,7 +181,7 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			user.setAid(aid);
 			user.setMid(mid);
 			userMapper.updateByPrimaryKeySelective(user);
-			disposeRatePay(oi, oi.getUid());
+			// disposeRatePay(oi, oi.getUid());
 			createNotice(user, oi.getAuditStatus());
 		}
 		return organizationIdentityMapper.updateByPrimaryKeySelective(oi);
@@ -217,7 +220,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 
 	@Override
 	public AuditorOrgIdentityDetailBo selectAuditorOrgIdentityDetailByUserId(String uid) {
-		return organizationIdentityMapper.selectAuditorOrgIdentityDetailByUserId(uid);
+
+		return organizationIdentityMapper.selectAuditorOrgIdentityDetailByUserId(uid,
+				Calendar.getInstance().get(Calendar.YEAR - 1));
 	}
 
 	@SuppressWarnings("unchecked")
@@ -342,13 +347,18 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 		OrgIdentityDetailAdmin bo = new OrgIdentityDetailAdmin();
 		BeanUtils.copyProperties(o, bo);
 		bo.setLevel(u.getLvl().toString());
+		Calendar now = Calendar.getInstance();
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1);
+		if (null != ratepay) {
+			bo.setRatepayId(ratepay.getId());
+		}
 		return bo;
 	}
 
 	private void disposeRatePay(OrganizationIdentity o, String uid) {
 		Calendar now = Calendar.getInstance();
-		if (null != o.getLastYearTaxReportUrl()
-				&& null == orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1)) {
+		OrgRatepay ratepay = orgRatepayMapper.selectRatepayByUidAndYear(uid, now.get(Calendar.YEAR) - 1);
+		if (null == ratepay) {
 			OrgRatepay r = new OrgRatepay();
 			r.setId(UUID.randomUUID().toString());
 			r.setUid(uid);
@@ -356,6 +366,9 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			r.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			r.setTaxReturnUrl(o.getLastYearTaxReportUrl());
 			orgRatepayMapper.insert(r);
+		} else {
+			ratepay.setTaxReturnUrl(o.getLastYearTaxReportUrl());
+			orgRatepayMapper.updateByPrimaryKeySelective(ratepay);
 		}
 	}
 
@@ -371,10 +384,10 @@ public class OrganizationIdentityServiceImpl extends BaseMybatisDao<Organization
 			oi.setId(UUID.randomUUID().toString());
 			oi.setUid(TokenManager.getUserId());
 			organizationIdentityMapper.insert(oi);
-		} else if (null != o && StringUtils.isNotBlank(oi.getId())){
+		} else if (null != o && StringUtils.isNotBlank(oi.getId())) {
 			organizationIdentityMapper.updateByPrimaryKeySelective(oi);
 		}
-		
+
 	}
 
 }

+ 10 - 0
src/main/java/com/goafanti/user/service/impl/OrganizationInfoServiceImpl.java

@@ -8,8 +8,10 @@ import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OrganizationInfoMapper;
 import com.goafanti.common.dao.OrganizationPropertiesMapper;
+import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.model.OrganizationInfo;
 import com.goafanti.common.model.OrganizationProperties;
+import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.user.service.OrganizationInfoService;
 
@@ -19,6 +21,8 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService {
 	OrganizationInfoMapper			organizationInfoMapper;
 	@Autowired
 	OrganizationPropertiesMapper	organizationPropertiesMapper;
+	@Autowired
+	UserMapper						userMapper;
 
 	@Override
 	public OrganizationInfo selectOrgInfoByUserId(String uid) {
@@ -55,6 +59,12 @@ public class OrganizationInfoServiceImpl implements OrganizationInfoService {
 		} else if (null != oo && StringUtils.isNotBlank(op.getId())) {
 			organizationPropertiesMapper.updateByPrimaryKeySelective(op);
 		}
+		
+		if (StringUtils.isNotBlank(oi.getCompanyName())){
+			User u = userMapper.selectByPrimaryKey(oi.getUid());
+			u.setNickname(oi.getCompanyName());
+			userMapper.updateByPrimaryKeySelective(u);
+		}
 		return 1;
 	}
 

File diff suppressed because it is too large
+ 0 - 1
src/main/webapp/WEB-INF/views/portal/detail/demandDetail.html