bug

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserDTO.java

@@ -155,5 +155,11 @@ public class UserDTO implements Serializable {
 	private String community;
 
 	private String communityId;
+	//干部下沉 0不
+	private String cadreFlag;
+	//是否通过 0不
+	private String pass;
+
+	private String tagIds;
 
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.excel.UserExcel;
 import com.elink.esua.epdc.service.UserService;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
@@ -81,6 +82,20 @@ public class UserController {
         return new Result();
     }
 
+    /**
+     * 审核
+     * @param dto
+     * @return
+     */
+    @PostMapping("audit")
+    public Result audit(@RequestBody UserDTO dto){
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        userService.audit(dto);
+
+        return new Result();
+    }
     @DeleteMapping
     public Result delete(@RequestBody String[] ids){
         //效验数据

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -44,4 +44,6 @@ public interface UserService extends BaseService<UserEntity> {
     void update(UserDTO dto);
 
     void delete(String[] ids);
+
+    void audit(UserDTO dto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -25,10 +25,16 @@ import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.dao.PartyMembersDao;
 import com.elink.esua.epdc.dao.UserDao;
+import com.elink.esua.epdc.dto.PartyMembersDTO;
+import com.elink.esua.epdc.dto.PartyTagRelationDTO;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.entity.PartyMembersEntity;
 import com.elink.esua.epdc.entity.UserEntity;
 import com.elink.esua.epdc.redis.UserRedis;
+import com.elink.esua.epdc.service.PartyMembersService;
+import com.elink.esua.epdc.service.PartyTagRelationService;
 import com.elink.esua.epdc.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -50,6 +56,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Autowired
     private UserRedis userRedis;
 
+    @Autowired
+    private PartyMembersService partyMembersService;
+
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         IPage<UserEntity> page = baseDao.selectPage(
@@ -124,4 +133,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public void audit(UserDTO dto) {
+        UserEntity entity = ConvertUtils.sourceToTarget(dto, UserEntity.class);
+        updateById(entity);
+        if("1".equals(dto.getPass())){
+            PartyMembersDTO partyMembersDTO=ConvertUtils.sourceToTarget(dto, PartyMembersDTO.class);
+            partyMembersDTO.setStreetName(dto.getStreet());
+            partyMembersDTO.setCommunityName(dto.getCommunity());
+            partyMembersDTO.setGridName(dto.getGrid());
+            partyMembersService.save(partyMembersDTO);
+        }
+    }
+
 }