更新属性

diagbotman-service/src/main/java/com/diagbot/web/ProductOrderController.java

@@ -24,6 +24,7 @@ import com.diagbot.entity.OpenedProducts;
 import com.diagbot.facade.OpenedProductsFacade;
 import com.diagbot.facade.ProductOrderFacade;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.StartAndendByUserIdVO;
@@ -106,7 +107,7 @@ public class ProductOrderController {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(startAndendByUserIdVO.getUserId());
 		openedProducts.setProductId(startAndendByUserIdVO.getProductId());
-		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+		openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
 		openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
 		boolean res =openedProductsFacade.startAndendByuserId(openedProducts);
@@ -123,7 +124,7 @@ public class ProductOrderController {
 		OpenedProducts openedProducts = new OpenedProducts();
 		openedProducts.setUserId(userId);
 		openedProducts.setProductId(productId);
-		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+		openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
 		boolean res =openedProductsFacade.delInformationAvailable(openedProducts);
 		if(res !=true  ){
@@ -141,7 +142,7 @@ public class ProductOrderController {
 		openedProducts.setProductId(modifyOpeningTimeVO.getProductId());
 		openedProducts.setStartTime(DateUtil.parseDate(modifyOpeningTimeVO.getStartTime()));
 		openedProducts.setEndTime(DateUtil.parseDate(modifyOpeningTimeVO.getEndTime()));
-		//TODO wangfeng openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+		openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
 		openedProducts.setGmtCreate(DateUtil.now());
 		boolean res = openedProductsFacade.modifyOpeningTime(openedProducts);
 		if(res !=true  ){

user-service/src/main/java/com/diagbot/dto/UserInfoDTO.java

@@ -16,6 +16,8 @@ import lombok.Setter;
  * @Description: 用户信息类表
  * @date 2018年9月17日 下午4:35:35
  */
+@Setter
+@Getter
 public class UserInfoDTO implements Serializable{
 	
 	 private static final long serialVersionUID = 1L;
@@ -30,125 +32,13 @@ public class UserInfoDTO implements Serializable{
 	    private Long orgId;//机构ID
 	    private Date orgGmtCreate;//记录创建时间
 	    private String orgName;//机构名称
-	    private String orgType;//机构属性
+	    private Integer orgType;//机构属性
 	    private String orgPrincipal;//负责人
 	    private String orgAddress;//机构地址
 	    private Long orgParentId;//上级机构id
 	    private Integer orgSubNum;//下属机构数量
 	    private String autPosition;//岗位信息
-	    private String autIsReject;//是否通过认证 N:未通过，Y:已通过
-	    private String autStatus;//认证状态
-		public Long getUserId() {
-			return userId;
-		}
-		public void setUserId(Long userId) {
-			this.userId = userId;
-		}
-		public Date getUserGmtCreate() {
-			return userGmtCreate;
-		}
-		public void setUserGmtCreate(Date userGmtCreate) {
-			this.userGmtCreate = userGmtCreate;
-		}
-		public String getUserName() {
-			return userName;
-		}
-		public void setUserName(String userName) {
-			this.userName = userName;
-		}
-		public String getLinKman() {
-			return linKman;
-		}
-		public void setLinKman(String linKman) {
-			this.linKman = linKman;
-		}
-		public String getEmail() {
-			return email;
-		}
-		public void setEmail(String email) {
-			this.email = email;
-		}
-		public Long getOrgId() {
-			return orgId;
-		}
-		public void setOrgId(Long orgId) {
-			this.orgId = orgId;
-		}
-		public Date getOrgGmtCreate() {
-			return orgGmtCreate;
-		}
-		public void setOrgGmtCreate(Date orgGmtCreate) {
-			this.orgGmtCreate = orgGmtCreate;
-		}
-		public String getOrgName() {
-			return orgName;
-		}
-		public void setOrgName(String orgName) {
-			this.orgName = orgName;
-		}
-		public String getOrgType() {
-			return orgType;
-		}
-		public void setOrgType(String orgType) {
-			this.orgType = orgType;
-		}
-		public String getOrgPrincipal() {
-			return orgPrincipal;
-		}
-		public void setOrgPrincipal(String orgPrincipal) {
-			this.orgPrincipal = orgPrincipal;
-		}
-		public String getOrgAddress() {
-			return orgAddress;
-		}
-		public void setOrgAddress(String orgAddress) {
-			this.orgAddress = orgAddress;
-		}
-		public Long getOrgParentId() {
-			return orgParentId;
-		}
-		public void setOrgParentId(Long orgParentId) {
-			this.orgParentId = orgParentId;
-		}
-		public Integer getOrgSubNum() {
-			return orgSubNum;
-		}
-		public void setOrgSubNum(Integer orgSubNum) {
-			this.orgSubNum = orgSubNum;
-		}
-		public String getAutPosition() {
-			return autPosition;
-		}
-		public void setAutPosition(String autPosition) {
-			this.autPosition = autPosition;
-		}
-		public String getAutIsReject() {
-			return autIsReject;
-		}
-		public void setAutIsReject(String autIsReject) {
-			this.autIsReject = autIsReject;
-		}
-		public String getAutStatus() {
-			return autStatus;
-		}
-		public void setAutStatus(String autStatus) {
-			this.autStatus = autStatus;
-		}
-		public static long getSerialversionuid() {
-			return serialVersionUID;
-		}
-		@Override
-		public String toString() {
-			return "UserInfo [userId=" + userId + ", userGmtCreate=" + userGmtCreate + ", userName=" + userName
-					+ ", linKman=" + linKman + ", email=" + email + ", orgId=" + orgId + ", orgGmtCreate="
-					+ orgGmtCreate + ", orgName=" + orgName + ", orgType=" + orgType + ", orgPrincipal=" + orgPrincipal
-					+ ", orgAddress=" + orgAddress + ", orgParentId=" + orgParentId + ", orgSubNum=" + orgSubNum
-					+ ", autPosition=" + autPosition + ", autIsReject=" + autIsReject + ", autStatus=" + autStatus
-					+ "]";
-		}
-
-
-		
-	    
+	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
+	    private Integer autStatus;//认证状态
 
 }

user-service/src/main/java/com/diagbot/vo/UserInfoAuditVO.java

@@ -18,11 +18,11 @@ import lombok.Setter;
 @Getter
 @Setter
 public class UserInfoAuditVO {
-	  @Pattern(regexp = "[YN]",message = "参数类型 错误")
-	  private Integer isReject;//是否通过认证 N:未通过，Y:已通过
+	  
+	  private Integer isReject;//是否通过认证 0:未通过，1:已通过
 	  private Integer rejectType;//未通过类型
 	  private String rejectComment;//认证被拒理由
-	  private String status;//认证状态（0：未认证，1：已认证，2：认证中）
+	  private Integer status;//认证状态（0：未认证，1：已认证，2：认证中）
 	  @NotNull(message = "请输入用户id!")
 	  private Long userId;//用户id
 

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -62,7 +62,7 @@ public class UserInfoController {
 	@PostMapping("/getUserInfoPag")
 	@SysLogger("getUserInfoPag")
 	// @ApiIgnore
-	public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, String autStatus) {
+	public RespDTO<UserInfoDTO> getUserInfoPag(Page page, String orgName, Integer autStatus) {
 		UserInfoDTO userInfo = new UserInfoDTO();
 		userInfo.setOrgName(orgName);
 		userInfo.setAutStatus(autStatus);
@@ -76,8 +76,7 @@ public class UserInfoController {
 	public RespDTO<UserInfoOrganizationsVO> updateUserInfoAll(
 			@Valid @RequestBody UserInfoOrganizationsVO userInfoOrganizationsVO) {
 		Map<String, Object> userMap = new HashMap<String, Object>();
-		// TODO wangfeng userMap.put("modifier",
-		// UserUtils.getCurrentPrincipleID());
+		userMap.put("modifier",UserUtils.getCurrentPrincipleID());
 		userMap.put("gmtModified", DateUtil.now());
 		userMap.put("email", userInfoOrganizationsVO.getEmail());
 		userMap.put("principal", userInfoOrganizationsVO.getPrincipal());
@@ -99,8 +98,7 @@ public class UserInfoController {
 	public RespDTO<UserInfoAuditVO> auditUserInfoAll(@Valid @RequestBody UserInfoAuditVO userInfoAuditVO) {
 		Map<String, Object> auditMap = new HashMap<String, Object>();
 		auditMap.put("userId", userInfoAuditVO.getUserId());
-		// TODO wangfeng auditMap.put("modifier",
-		// UserUtils.getCurrentPrincipleID());
+		auditMap.put("modifier",UserUtils.getCurrentPrincipleID());
 		auditMap.put("gmtModified", DateUtil.now());
 		auditMap.put("isReject", userInfoAuditVO.getIsReject());
 		auditMap.put("rejectComment", userInfoAuditVO.getRejectComment());
@@ -120,7 +118,7 @@ public class UserInfoController {
 	public RespDTO updateDeleted(@RequestParam String userId) {
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("userId", userId);
-		// TODO wangfeng map.put("modifier",UserUtils.getCurrentPrincipleID());
+		map.put("modifier",UserUtils.getCurrentPrincipleID());
 		map.put("gmtModified", DateUtil.now());
 		int res = userFacade.updateDeleted(map);
 		return RespDTO.onSuc("刪除成功" + res);
@@ -153,8 +151,7 @@ public class UserInfoController {
 		organization.setSubNum(organizationVO.getSubNum());
 		organization.setAddress(organizationVO.getAddress());
 		organization.setGmtCreate(DateUtil.now());
-		// TODO wangfeng
-		// organization.setModifier(UserUtils.getCurrentPrincipleID());
+		organization.setModifier(UserUtils.getCurrentPrincipleID());
 		// organization.setCreator("5");
 
 		boolean res = organizationFacade.save(organization);
@@ -189,7 +186,7 @@ public class UserInfoController {
 		}
 
 		User user = new User();
-		// TODO wangfeng user.setCreator("5");
+		user.setCreator(UserUtils.getCurrentPrincipleID());
 		user.setUsername(userAndOrganizationVO.getUserName());
 		PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
 		String entryPassword = passwordEncoder.encode(userAndOrganizationVO.getPassWord());
@@ -202,8 +199,7 @@ public class UserInfoController {
 			Long userId = user.getId();
 			// 用户信息的认证
 			UserAuthentication userAuthentication = new UserAuthentication();
-			// TODO wangfeng
-			// userAuthentication.setCreator(UserUtils.getCurrentPrincipleID());//
+			userAuthentication.setCreator(UserUtils.getCurrentPrincipleID());//
 			// 创建人Id
 			userAuthentication.setGmtCreate(DateUtil.now());// 记录创建时间
 			userAuthentication.setPosition(userAndOrganizationVO.getPosition());// 岗位信息
@@ -214,8 +210,7 @@ public class UserInfoController {
 
 			// 用户信息和机构信息的绑定
 			UserOrganization userOrganization = new UserOrganization();
-			// TODO wangfeng
-			// userOrganization.setCreator(UserUtils.getCurrentPrincipleID());//
+			userOrganization.setCreator(UserUtils.getCurrentPrincipleID());//
 			// 创建人Id
 			userOrganization.setGmtCreate(DateUtil.now());
 			userOrganization.setOrganizationId(userAndOrganizationVO.getOrganizationid());// 机构id