1.选泽人员优化

2.督办优化

assistMg/src/main/java/com/hotent/baseInfo/vo/TaskTreeVo.java

@@ -88,7 +88,7 @@ public class TaskTreeVo  extends SumTree {
 
     @ApiModelProperty(value = "要求时间")
     @JsonProperty("requireTime")
-    private LocalDateTime requireTime;
+    private String requireTime;
 
     @ApiModelProperty(value = "督促要求内容")
     @JsonProperty("requireContent")

assistMg/src/main/java/com/hotent/project/controller/CostProjectApprovalController.java

@@ -51,6 +51,7 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 
 	@Autowired
 	private CostProjectApprovalManager costProjectApprovalManager;
+
 	/**
 	 * 根据id获取成本监审立项主表数据详情
 	 * @param id
@@ -73,9 +74,32 @@ public class CostProjectApprovalController extends BaseController<CostProjectApp
 
 	@RequestMapping(value="/getUserList",method= RequestMethod.GET)
 	@ApiOperation(value = "获取系统中所有用户", httpMethod = "GET", notes = "获取系统中所有用户")
-	public CommonResult<List<User>> getUserListByRoleCodes() throws Exception{
-		List<String> list1 = Arrays.asList("dbfzr", "jsztry");
-		List<User> userList = userService.getUserListByRoleCodes(list1);
+	public CommonResult<List<User>> getUserListByRoleCodes(
+			@ApiParam(name="projectId",value="项目id", required = false) @RequestParam(required=false) String projectId
+	,@ApiParam(name="code",value="角色code", required = false) @RequestParam(required=false) String code) throws Exception{
+		List<String> list = new ArrayList<>();
+		if (StringUtil.isNotEmpty(code)){
+			if (StringUtil.isNotEmpty(code)) {
+				String[] split = code.split(",");
+				for (int i = 0; i < split.length; i++) {
+					list.add(split[i]);
+				}
+			}
+		}else {
+			list.add("jsztry");
+		}
+		List<String> auditGroups = new ArrayList<>();
+		if (StringUtil.isNotEmpty(projectId)) {
+			CostProjectApproval costProjectApproval = costProjectApprovalManager.get(projectId);
+			if (costProjectApproval!=null) {
+				String auditGroup = costProjectApproval.getAuditGroup();
+				String[] split = auditGroup.split(",");
+				for (int i = 0; i < split.length; i++) {
+					auditGroups.add(split[i]);
+				}
+			}
+		}
+		List<User> userList = userService.getUserListByRoleCodes(list,auditGroups);
 		IUser iUser = ContextUtil.getCurrentUser();
 		User user = userService.getByAccount(iUser.getAccount());
 		List<User> userArrayList = new ArrayList<>();

assistMg/src/main/java/com/hotent/project/controller/CostProjectSuperviseController.java

@@ -97,6 +97,7 @@ public class CostProjectSuperviseController {
         if (StringUtil.isNotEmpty(req.getSupervisor())) {
             wrapper.like("supervisor_name",req.getSupervisor());
         }
+        wrapper.orderByDesc("create_time");
         List<CostProjectSupervise> supervises = costProjectSuperviseManager.list(wrapper);
         List<String> list = supervises.stream().map(CostProjectSupervise::getProjectId).distinct().collect(Collectors.toList());
         req.setProjectIds(list);

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectSuperviseManagerImpl.java

@@ -65,8 +65,8 @@ public class CostProjectSuperviseManagerImpl extends BaseManagerImpl<CostProject
         param.setCreateTime(LocalDateTime.now());
         param.setId(String.valueOf(UniqueIdUtil.getUId()));
         param.setReportTime(LocalDateTime.now());
-        param.setRequireTime(param.getReportTime());
-        param.setRequireContent(param.getReportContent());
+        param.setRequireTime(param.getRequireTime());
+        param.setRequireContent(param.getRequireContent());
         param.setStatus(0);
         String account = ContextUtil.getCurrentUser().getAccount();
         User user = userService.getByAccount(account);

assistMg/src/main/java/com/hotent/project/manager/impl/CostProjectTaskManagerImpl.java

@@ -989,6 +989,18 @@ public class CostProjectTaskManagerImpl extends BaseManagerImpl<CostProjectTaskD
             content += "，备注：" + req.getContent();
         }
         costNoticeManager.sendNotice(task.getProjectId(), task.getId(), "1", title, content, enterpriseId, noticeSource, sendTarget);
+        CostProjectApproval costProjectApproval = costProjectApprovalManager.getById(nTask.getProjectId());
+        if (StringUtil.isNotEmpty(req.getUserIds())) {
+            String[] split = req.getUserIds().split(",");
+            for (int i = 0; i < split.length; i++) {
+                String auditGroup = costProjectApproval.getAuditGroup();
+                boolean contains = auditGroup.contains(split[i]);
+                if (!contains) {
+                    costProjectApproval.setAuditGroup(auditGroup+","+split[i]);
+                }
+            }
+            costProjectApprovalManager.updateById(costProjectApproval);
+        }
         return title;
     }
 

assistMg/src/main/java/com/hotent/project/model/CostProjectSupervise.java

@@ -42,7 +42,7 @@ public class CostProjectSupervise extends BaseModel<CostProjectSupervise> implem
     private String supervisorName;
     @ApiModelProperty(value = "要求时间")
     @TableField(value = "require_time")
-    private LocalDateTime requireTime;
+    private String requireTime;
     @ApiModelProperty(value = "督促要求内容")
     @TableField(value = "require_content")
     private String requireContent;

uc/src/main/java/com/hotent/uc/dao/UserDao.java

@@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.hotent.base.constants.SQLConst;
 import com.hotent.uc.model.User;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 
@@ -407,5 +408,29 @@ public interface UserDao extends BaseMapper<User>{
 	 */
 	String getAccountByUserId(@Param("userId") String userId);
 
-	List<User> getUserListByRoleCodes(@Param("roleCodes") List<String> list);
+	@Select({
+			"<script>",
+			"SELECT DISTINCT u.* FROM uc_user u",
+			"INNER JOIN uc_user_role ur ON u.ID_ = ur.USER_ID_",
+			"INNER JOIN UC_ROLE r ON ur.ROLE_ID_ = r.ID_",
+			"WHERE u.IS_DELE_ != '1'",
+			"AND ur.IS_DELE_ != '1'",
+			"AND r.IS_DELE_ != '1'",
+			"AND u.STATUS_ = 1",
+			"<if test='roleCodes != null and roleCodes.size() > 0'>",
+			"AND r.CODE_ IN",
+			"<foreach collection='roleCodes' item='code' open='(' separator=',' close=')'>",
+			"#{code}",
+			"</foreach>",
+			"</if>",
+			"<if test='auditGroups != null and auditGroups.size() > 0'>",
+			"AND u.ID_ NOT IN",
+			"<foreach collection='auditGroups' item='id' open='(' separator=',' close=')'>",
+			"#{id}",
+			"</foreach>",
+			"</if>",
+			"GROUP BY u.ID_",
+			"</script>"
+	})
+	List<User> getUserListByRoleCodes(@Param("roleCodes") List<String> list,@Param("auditGroups") List<String> auditGroups);
 }

uc/src/main/java/com/hotent/uc/manager/UserManager.java

@@ -840,5 +840,5 @@ public interface UserManager extends BaseManager<User>{
 
     List<User> getUserList();
 
-	List<User> getUserListByRoleCodes(List<String> list1);
+	List<User> getUserListByRoleCodes(List<String> list1,List<String> auditGroups);
 }

uc/src/main/java/com/hotent/uc/manager/impl/UserManagerImpl.java

@@ -4027,9 +4027,9 @@ public class UserManagerImpl extends BaseManagerImpl <UserDao, User> implements
 	}
 
 	@Override
-	public List<User> getUserListByRoleCodes(List<String> list) {
+	public List<User> getUserListByRoleCodes(List<String> list,List<String> auditGroups) {
 
-		return baseMapper.getUserListByRoleCodes(list);
+		return baseMapper.getUserListByRoleCodes(list,auditGroups);
 	}
 
 

uc/src/main/resources/mapper/UserMapper.xml

@@ -125,17 +125,6 @@
 	</select>
 
 
-	<select id="getUserListByRoleCodes" parameterType="java.lang.String" resultMap="BaseResultMap">
-		SELECT u.*,r.CODE_ from uc_user u inner JOIN uc_user_role ur on u.ID_=ur.USER_ID_
-		inner join UC_ROLE r on ur.ROLE_ID_=r.ID_
-		WHERE u.IS_DELE_!='1' AND ur.IS_DELE_!='1' AND r.IS_DELE_!='1' AND u.STATUS_ =1
-		<if test="roleCodes!=null">
-			and r.CODE_ in
-			<foreach collection="roleCodes" index="index" item="item" open="(" separator="," close=")">
-				#{item}
-			</foreach>
-		</if>
-	</select>
 
 	<select id="getUserListByRoleCodeMap" parameterType="java.util.Map" resultMap="BaseResultMap">
 		SELECT u.*,r.CODE_ from uc_user u