Antiloveg 8 lat temu
rodzic
commit
7658d51734

+ 2 - 0
src/main/java/com/goafanti/common/dao/AchievementMapper.java

@@ -31,4 +31,6 @@ public interface AchievementMapper {
 	void insertBatch(List<Achievement> achievementList);
 
 	AchievementDetailBo selectAchievementSearchDetail(String uid, String id);
+
+	Integer findAchievementNumByUid(String uid);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/CopyrightInfoMapper.java

@@ -38,4 +38,6 @@ public interface CopyrightInfoMapper {
 	void batchInsert(List<CopyrightInfo> ci);
 
 	int batchDeleteByContractId(List<String> id);
+
+	Integer findCopyrightInfoNumByUid(String uid);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/DemandMapper.java

@@ -32,4 +32,6 @@ public interface DemandMapper {
 	DemandSearchDetailBo selectDemandSearchDetail(String id);
 
 	DemandSearchDetailBo selectDemandSearchDetail(String uid, String id);
+
+	Integer findDemandNumByUid(String uid);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrgIntellectualPropertyMapper.java

@@ -30,4 +30,6 @@ public interface OrgIntellectualPropertyMapper {
 	List<OrgIntellectualProperty> selectIntellectualPropertyList(Integer year, String uid);
 
 	AnnualReportPropertyRightBo selectIntellectualPropertyCount(Integer year, String uid);
+
+	Integer findIntellectualPropertyNum(String uid);
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/PatentInfoMapper.java

@@ -47,5 +47,7 @@ public interface PatentInfoMapper {
 	void batchInsert(List<PatentInfo> pi);
 
 	int batchDeleteByContractId(List<String> id);
+
+	Integer findPatentInfoNumByUid(String uid);
 	
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TechProjectMapper.java

@@ -33,4 +33,6 @@ public interface TechProjectMapper {
 	List<TechProjectContractListBo> listContractTechProjectByContractId(String contractId);
 
 	void batchInsert(List<TechProject> tp);
+
+	Integer findTechProjectNumByUid(String uid);
 }

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

@@ -1088,4 +1088,15 @@
   	where a.id = #{1}
   </select>
   
+  <select id="findAchievementNumByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select
+  		count(1)
+  	from achievement
+  	where 
+  		deleted_sign = 0
+  	and release_status = 1
+  	and audit_status = 3
+  	and owner_id = #{uid,jdbcType=VARCHAR}
+  </select>
+  
 </mapper>

+ 8 - 0
src/main/java/com/goafanti/common/mapper/CopyrightInfoMapper.xml

@@ -489,4 +489,12 @@
 	</foreach>
   </update>
   
+  <select id="findCopyrightInfoNumByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from copyright_info
+  	where
+  		delete_sign = 0
+  	and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -982,6 +982,15 @@
   	where d.id = #{1}
   </select>
   
-  
+  <select id="findDemandNumByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from demand
+  	where 
+  		deleted_sign = 0
+  	and release_status = 1
+  	and audit_status = 3
+  	and employer_id = #{uid,jdbcType=VARCHAR}
+  </select>
   
 </mapper>

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

@@ -378,4 +378,14 @@
 			and deleted_sign = 0
 		) j on u.id = j.uid 
   </select>
+  
+  <select id="findIntellectualPropertyNum" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from 
+  		org_intellectual_property
+  	where 
+  		deleted_sign = 0
+  	and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/PatentInfoMapper.xml

@@ -1073,4 +1073,13 @@
 			#{item}
 		</foreach>
   </update>
+  
+  <select id="findPatentInfoNumByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(1) 
+  	from patent_info
+  	where 
+  		deleted_sign = 0
+  	and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 9 - 0
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -524,6 +524,15 @@
 		)
   </foreach>
   </insert>
+  
+  <select id="findTechProjectNumByUid" parameterType="java.lang.String" resultType="java.lang.Integer">
+  	select 
+  		count(1)
+  	from tech_project
+  	where 
+  		deleted_sign = 0
+  	and uid = #{uid,jdbcType=VARCHAR}
+  </select>
 	
 	
 </mapper>

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

@@ -16,7 +16,6 @@
   </resultMap>
   
   <resultMap type="com.goafanti.user.bo.UserPageHomeBo" id="UserPageHomeBo">
-    <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="uid" jdbcType="VARCHAR" property="uid"/>
     <result column="lvl" jdbcType="INTEGER" property="lvl"/>
     <result column="nickname" jdbcType="VARCHAR" property="nickname"/>
@@ -194,7 +193,10 @@
   </select>
   
   <select id="selectUserPageHomeBoByUserId" resultMap="UserPageHomeBo" parameterType="java.lang.String">
-   select u.lvl,u.nickname,u.email,u.number,u.type,i.person_portrait_url, o.logo_url ,i.id ,u.id as uid 
+   select 
+   		u.lvl, u.nickname, u.email,
+   		u.number, u.type, i.person_portrait_url, 
+   		o.logo_url , u.id as uid 
    from user u 
    LEFT JOIN user_info  i on u.id = i.uid 
    LEFT JOIN organization_info o on u.id = o.uid where u.id = #{uid,jdbcType = VARCHAR}

+ 132 - 46
src/main/java/com/goafanti/user/bo/UserPageHomeBo.java

@@ -1,99 +1,185 @@
 package com.goafanti.user.bo;
 
 public class UserPageHomeBo {
-     private String id;
-     private String uid;
-     /**
-      * 用户等级
-      */
-     private Integer lvl;
-     
-     /**
-      * 用户昵称
-      */
-     private String nickname;
-     
-     /**
-      * 邮箱
-      */
-     private String email;
-     
-     /**
-      * 用户编号
-      */
-     private Integer number;
-     
-     /**
-      * 帐号类型
-      */
-     private Integer type;
-     
-     /**
-      * 用户头像URL
-      */
-     private String personPortraitUrl;
-     
-     /**
-      * 公司LogoUrl
-      * @return
-      */
-     private String logoUrl;
-     
-	public String getId() {
-		return id;
-	}
-	public void setId(String id) {
-		this.id = id;
-	}
+	private String	uid;
+	/**
+	 * 用户等级
+	 */
+	private Integer	lvl;
+
+	/**
+	 * 用户昵称
+	 */
+	private String	nickname;
+
+	/**
+	 * 邮箱
+	 */
+	private String	email;
+
+	/**
+	 * 用户编号
+	 */
+	private Integer	number;
+
+	/**
+	 * 帐号类型
+	 */
+	private Integer	type;
+
+	/**
+	 * 用户头像URL
+	 */
+	private String	personPortraitUrl;
+
+	/**
+	 * 公司LogoUrl
+	 */
+	private String	logoUrl;
+	
+	/**
+	 * 专利数量
+	 */
+	private Integer	patentNum;
+	
+	/**
+	 * 软著数量
+	 */
+	private Integer	copyrightNum;
+	
+	/**
+	 * 科技成果数量
+	 */
+	private Integer	techProjectNum;
+	
+	/**
+	 * 发布需求数量
+	 */
+	private Integer	demandNum;
+	
+	/**
+	 * 发布成果数量
+	 */
+	private Integer	achievementNum;
+	
+	/**
+	 * 知识产权数量
+	 */
+	private Integer	intellectualPropertyNum;
+	
+
+
 	public String getUid() {
 		return uid;
 	}
+
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+
 	public Integer getLvl() {
 		return lvl;
 	}
+
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
 	}
+
 	public String getNickname() {
 		return nickname;
 	}
+
 	public void setNickname(String nickname) {
 		this.nickname = nickname;
 	}
+
 	public String getEmail() {
 		return email;
 	}
+
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
 	public Integer getNumber() {
 		return number;
 	}
+
 	public void setNumber(Integer number) {
 		this.number = number;
 	}
+
 	public Integer getType() {
 		return type;
 	}
+
 	public void setType(Integer type) {
 		this.type = type;
 	}
+
 	public String getPersonPortraitUrl() {
 		return personPortraitUrl;
 	}
+
 	public void setPersonPortraitUrl(String personPortraitUrl) {
 		this.personPortraitUrl = personPortraitUrl;
 	}
+
 	public String getLogoUrl() {
 		return logoUrl;
 	}
+
 	public void setLogoUrl(String logoUrl) {
 		this.logoUrl = logoUrl;
 	}
-    
+
+	public Integer getPatentNum() {
+		return patentNum;
+	}
+
+	public void setPatentNum(Integer patentNum) {
+		this.patentNum = patentNum;
+	}
+
+	public Integer getCopyrightNum() {
+		return copyrightNum;
+	}
+
+	public void setCopyrightNum(Integer copyrightNum) {
+		this.copyrightNum = copyrightNum;
+	}
+
+	public Integer getTechProjectNum() {
+		return techProjectNum;
+	}
+
+	public void setTechProjectNum(Integer techProjectNum) {
+		this.techProjectNum = techProjectNum;
+	}
+
+	public Integer getDemandNum() {
+		return demandNum;
+	}
+
+	public void setDemandNum(Integer demandNum) {
+		this.demandNum = demandNum;
+	}
+
+	public Integer getAchievementNum() {
+		return achievementNum;
+	}
+
+	public void setAchievementNum(Integer achievementNum) {
+		this.achievementNum = achievementNum;
+	}
+
+	public Integer getIntellectualPropertyNum() {
+		return intellectualPropertyNum;
+	}
+
+	public void setIntellectualPropertyNum(Integer intellectualPropertyNum) {
+		this.intellectualPropertyNum = intellectualPropertyNum;
+	}
+	
 	
-     
 }

+ 21 - 53
src/main/java/com/goafanti/user/controller/UserApiController.java

@@ -64,7 +64,6 @@ import com.goafanti.user.bo.OrgProBo;
 import com.goafanti.user.bo.UidAndTypeBo;
 import com.goafanti.user.bo.UserIdentityBo;
 import com.goafanti.user.bo.UserInfoBo;
-import com.goafanti.user.bo.UserPageHomeBo;
 import com.goafanti.user.service.OrgHumanResourceService;
 import com.goafanti.user.service.OrganizationIdentityService;
 import com.goafanti.user.service.OrganizationInfoService;
@@ -281,7 +280,7 @@ public class UserApiController extends BaseApiController {
 		if (res.getError().isEmpty()) {
 			UserIdentity ui = new UserIdentity();
 			BeanUtils.copyProperties(userIdentity, ui);
-			if (null == ui.getId()) {
+			if (StringUtils.isBlank(ui.getId())) {
 				ui.setId(UUID.randomUUID().toString());
 				ui.setUid(TokenManager.getUserId());
 				userIdentityService.insert(ui);
@@ -544,7 +543,7 @@ public class UserApiController extends BaseApiController {
 	public Result basic() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
+		if (UserType.PERSONAL.getCode().equals(ub.getType())) {
 			UserIdentityBo u = userIdentityService.selectUserIdentityBoByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -563,7 +562,7 @@ public class UserApiController extends BaseApiController {
 	public Result member() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
+		if (UserType.PERSONAL.getCode().equals(ub.getType())) {
 			UserInfoBo u = userInfoService.selectUserInfoBoByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -600,7 +599,7 @@ public class UserApiController extends BaseApiController {
 	public Result job() {
 		Result res = new Result();
 		UidAndTypeBo ub = basicInfo(userService);
-		if (null != ub && ub.getType() == UserType.PERSONAL.getCode()) {
+		if (UserType.PERSONAL.getCode().equals(ub.getType())) {
 			UserCareer u = userCareerService.selectUserCareerByUserId(ub.getUid());
 			res.setData(u);
 		} else {
@@ -698,10 +697,7 @@ public class UserApiController extends BaseApiController {
 	@RequestMapping(value = "/homePage", method = RequestMethod.GET)
 	public Result homePage() {
 		Result res = new Result();
-		if (TokenManager.isLogin()) {
-			UserPageHomeBo userPageHomeBo = userService.selectUserPageHomeBoByUserId(TokenManager.getUserId());
-			res.setData(userPageHomeBo);
-		}
+		res.setData(userService.selectUserPageHomeBoByUserId(TokenManager.getUserId()));
 		return res;
 
 	}
@@ -748,7 +744,7 @@ public class UserApiController extends BaseApiController {
 			}
 		}
 
-		if (IdentityProcess.COMMITTED.getCode() == userIdentity.getProcess()) {//3
+		if (IdentityProcess.COMMITTED.getCode() == userIdentity.getProcess()) {// 3
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			u.setProcess(IdentityProcess.COMMITTED.getCode());
 			u.setAuditStatus(IdentityAuditStatus.COMMITTED.getCode());
@@ -759,14 +755,14 @@ public class UserApiController extends BaseApiController {
 		if (IdentityProcess.RESULTS.getCode() == userIdentity.getProcess()) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			if ((System.currentTimeMillis() - u.getPaymentDate().getTime()) > 432000000) {
-				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				userIdentityService.updateByPrimaryKeySelective(u);
 				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (3 == u.getWrongCount()) {
-				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
-				u.setProcess(IdentityProcess.RESULTS.getCode());//5
+				u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
+				u.setProcess(IdentityProcess.RESULTS.getCode());// 5
 				userIdentityService.updateByPrimaryKeySelective(u);
 				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
@@ -776,8 +772,8 @@ public class UserApiController extends BaseApiController {
 				u.setWrongCount(u.getWrongCount() + 1);
 
 				if (0 == t) {
-					u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
-					u.setProcess(IdentityProcess.RESULTS.getCode());//5
+					u.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
+					u.setProcess(IdentityProcess.RESULTS.getCode());// 5
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
@@ -831,14 +827,14 @@ public class UserApiController extends BaseApiController {
 		if (5 == orgIdentity.getProcess()) {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			if (System.currentTimeMillis() - o.getPaymentDate().getTime() > 432000000) {
-				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
+				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				res.getError().add(buildError("", "1"));// 超过打款日期5日,无法提交确认
 				return res;
 			}
 			if (3 == o.getWrongCount()) {
-				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
-				o.setProcess(IdentityProcess.RESULTS.getCode());//5
+				o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
+				o.setProcess(IdentityProcess.RESULTS.getCode());// 5
 				organizationIdentityService.updateByPrimaryKeySelective(o);
 				res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				return res;
@@ -847,8 +843,8 @@ public class UserApiController extends BaseApiController {
 				int t = 3 - o.getWrongCount() - 1;
 				o.setWrongCount(o.getWrongCount() + 1);
 				if (0 == t) {
-					o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());//4
-					o.setProcess(IdentityProcess.RESULTS.getCode());//5
+					o.setAuditStatus(IdentityAuditStatus.NOTPASSED.getCode());// 4
+					o.setProcess(IdentityProcess.RESULTS.getCode());// 5
 					res.getError().add(buildError("", "2"));// 输入错误金额次数过多
 				} else {
 					res.getError().add(buildError("", "输入打款金额错误,您还有" + t + "次机会"));
@@ -872,34 +868,6 @@ public class UserApiController extends BaseApiController {
 	}
 
 	/**
-	 * 管理端确认用户认证
-	 * 
-	 * @param auditStatus
-	 * @param money
-	 * @param uid
-	 * @return
-	 */
-	@RequestMapping(value = "/adminConfirmIdent", method = RequestMethod.POST)
-	public Result adminConfirmIdent(Integer auditStatus, BigDecimal money, String uid) {
-		Result res = new Result();
-		User user = userService.selectByPrimaryKey(uid);
-		if (null != user) {
-			if (0 == user.getType()) {
-				UserIdentity u = userIdentityService.selectUserIdentityByUserId(uid);
-				u.setAuditStatus(auditStatus);
-				u.setAmountMoney(money);
-				res.setData(userIdentityService.updateByPrimaryKeySelective(u));
-			} else {
-				OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(uid);
-				o.setAuditStatus(auditStatus);
-				o.setValidationAmount(money);
-				res.setData(organizationIdentityService.updateByPrimaryKeySelective(o));
-			}
-		}
-		return res;
-	}
-
-	/**
 	 * 获取公司联系人
 	 * 
 	 * @param uid
@@ -914,24 +882,24 @@ public class UserApiController extends BaseApiController {
 
 	// 认证失败清除相关认证信息
 	private Result dealFaild(Result res) {
-		if (0 == userService.selectByPrimaryKey(TokenManager.getUserId()).getType()) {
+		if (UserType.PERSONAL.getCode().equals(userService.selectByPrimaryKey(TokenManager.getUserId()).getType())) {
 			UserIdentity u = userIdentityService.selectUserIdentityByUserId(TokenManager.getUserId());
 			UserIdentity user = new UserIdentity();
 			user.setId(u.getId());
 			user.setUid(u.getUid());
-			user.setProcess(0);
+			user.setProcess(IdentityProcess.UNCOMMITTED.getCode());
 			user.setWrongCount(0);
 			user.setAmountMoney(new BigDecimal(0));
-			user.setAuditStatus(0);
+			user.setAuditStatus(IdentityAuditStatus.UNCOMMITTED.getCode());
 			res.setData(userIdentityService.updateByPrimaryKey(user));
 		} else {
 			OrganizationIdentity o = organizationIdentityService.selectOrgIdentityByUserId(TokenManager.getUserId());
 			OrganizationIdentity org = new OrganizationIdentity();
 			org.setId(o.getId());
 			org.setUid(o.getUid());
-			org.setProcess(0);
+			org.setProcess(IdentityProcess.UNCOMMITTED.getCode());
 			org.setWrongCount(0);
-			org.setAuditStatus(0);
+			org.setAuditStatus(IdentityAuditStatus.UNCOMMITTED.getCode());
 			org.setValidationAmount(new BigDecimal(0));
 			res.setData(organizationIdentityService.updateByPrimaryKey(org));
 		}

+ 26 - 1
src/main/java/com/goafanti/user/service/impl/UserServiceImpl.java

@@ -12,8 +12,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.AchievementMapper;
 import com.goafanti.common.dao.AdminLocationMapper;
+import com.goafanti.common.dao.CopyrightInfoMapper;
+import com.goafanti.common.dao.DemandMapper;
+import com.goafanti.common.dao.OrgIntellectualPropertyMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
+import com.goafanti.common.dao.PatentInfoMapper;
+import com.goafanti.common.dao.TechProjectMapper;
 import com.goafanti.common.dao.UserIdentityMapper;
 import com.goafanti.common.dao.UserMapper;
 import com.goafanti.common.enums.UserType;
@@ -41,6 +47,18 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 	private UserIdentityMapper			userIdentityMapper;
 	@Autowired
 	private AdminLocationMapper			adminLocationMapper;
+	@Autowired
+	private PatentInfoMapper patentInfoMapper;
+	@Autowired
+	private CopyrightInfoMapper copyrightInfoMapper;
+	@Autowired
+	private TechProjectMapper techProjectMapper;
+	@Autowired
+	private DemandMapper demandMapper;
+	@Autowired
+	private AchievementMapper achievementMapper;
+	@Autowired
+	private OrgIntellectualPropertyMapper orgIntellectualPropertyMapper;
 
 	@Override
 	public User insertRegister(User user, String contacts, String unitName) {
@@ -92,7 +110,14 @@ public class UserServiceImpl extends BaseMybatisDao<UserMapper> implements UserS
 
 	@Override
 	public UserPageHomeBo selectUserPageHomeBoByUserId(String uid) {
-		return userMapper.selectUserPageHomeBoByUserId(uid);
+		UserPageHomeBo bo = userMapper.selectUserPageHomeBoByUserId(uid);
+		bo.setPatentNum(patentInfoMapper.findPatentInfoNumByUid(uid));
+		bo.setCopyrightNum(copyrightInfoMapper.findCopyrightInfoNumByUid(uid));
+		bo.setTechProjectNum(techProjectMapper.findTechProjectNumByUid(uid));
+		bo.setDemandNum(demandMapper.findDemandNumByUid(uid));
+		bo.setAchievementNum(achievementMapper.findAchievementNumByUid(uid));
+		bo.setIntellectualPropertyNum(orgIntellectualPropertyMapper.findIntellectualPropertyNum(uid));
+		return bo;
 	}
 
 	@Override