Merge branch 'hotfix-missprops-20210719' of googol/YY_BE_2 into master

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -2490,7 +2491,8 @@ public class ApiController {
 			if (StringUtils.isNotEmpty(userUpdateInput.getIdCardNumber())) {
 				sysUser.setIdCardNumber(userUpdateInput.getIdCardNumber());
 			}
-			sysUser.setRealname(userUpdateInput.getRealname());
+			// 姓名去除空格（包括字符之间的所有空格都会去除）
+			sysUser.setRealname(StrUtil.cleanBlank(userUpdateInput.getRealname()));
 			sysUser.setUserSign(userUpdateInput.getUserSign());
 			sysUserService.updateById(sysUser);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -19,6 +19,7 @@
 
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
 import com.alibaba.nacos.common.utils.Md5Utils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -291,6 +292,10 @@ public class SysUserController {
 	@PostMapping
 	@PreAuthorize("@pms.hasPermission('sys_user_add')")
 	public R user(@RequestBody UserDTO userDto) {
+
+		// 姓名去除空格（包括字符之间的所有空格都会去除）
+		userDto.setRealname(StrUtil.cleanBlank(userDto.getRealname()));
+
 		// if (SecurityUtils.getRoles().contains(2) ||
 		// SecurityUtils.getRoles().contains(1)) {
 		SysDept sysDept = sysDeptService.getById(userDto.getDeptId());
@@ -1368,8 +1373,10 @@ public class SysUserController {
 		 */
 		SysDept sysDept = sysDeptService.getById(userDto.getDeptId());
 
-
 		if (null != userDto.getUserId()) {
+			// 姓名去除空格（包括字符之间的所有空格都会去除）
+			userDto.setRealname(StrUtil.cleanBlank(userDto.getRealname()));
+
 			SysUser oldData = userService.getById(userDto.getUserId());
 			if (!userDto.getRealname().equals(oldData.getRealname())) {
 				if (userDto.getRole().contains(6) || userDto.getRole().contains(10)) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmProjectController.java

@@ -82,8 +82,8 @@ public class WmProjectController {
 	@ApiOperation(value = "分页查询项目", notes = "分页查询项目")
 	public R page(Page page, String projectName, String delegate) {
 		try {
-
-			IPage<WmProject> pageResult = wmProjectService.listProjectPage(page, projectName, delegate);
+			Integer deptId = SecurityUtils.getUser().getDeptId();
+			IPage<WmProject> pageResult = wmProjectService.listProjectPage(page, deptId, projectName, delegate);
 			List<WmProject> records = pageResult.getRecords();
 
 			if (CollectionUtil.isNotEmpty(records)) {

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageSettleNoteController.java

@@ -124,6 +124,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setNumber(i + 1);
 			excelModel.setScorePackageName(scorePackage.getScorePackageName());
 			excelModel.setRealName(settleNoteOutput.getRealName());
+			excelModel.setUsername(settleNoteOutput.getUsername());
 			excelModel.setTaskTypeName(settleNoteOutput.getTaskTypeName());
 			excelModel.setXmbm(settleNoteOutput.getXmbm());
 			excelModel.setCreateTime(settleNoteOutput.getCreateTime());
@@ -132,7 +133,7 @@ public class WmScorePackageSettleNoteController {
 			excelModel.setSubType(SubjectTypeEnum.resolve(settleNoteOutput.getSubType()).getDesc());
 			excelModel.setSubTime(settleNoteOutput.getSubTime());
 			excelModel.setNotifyTime(settleNoteOutput.getNotifyTime());
-			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName());
+			excelModel.setSettleNoteStatus(SettleStatusEnum.resolve(String.valueOf(settleNoteOutput.getSettleNoteStatus())).getName2());
 			exportList.add(excelModel);
 		}
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/model/excel/WmSettlePackageSettleExcelModel.java

@@ -31,6 +31,13 @@ public class WmSettlePackageSettleExcelModel {
 	@ExcelProperty("任务成员")
 	private String realName;
 
+	/**
+	 * 手机号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("手机号")
+	private String username;
+
 	/**
 	 * 任务类型
 	 */

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/output/WmTaskSettleNoteOutput.java

@@ -128,4 +128,9 @@ public class WmTaskSettleNoteOutput {
 	 * 用户姓名
 	 */
 	private String realName;
+
+	/**
+	 * 用户手机号
+	 */
+	private String username;
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/enums/SettleStatusEnum.java

@@ -12,23 +12,25 @@ import lombok.Getter;
 public enum SettleStatusEnum {
 
 	// 结算状态
-	SETTLE_STATUS_SUCCESS("1", "结算成功"),
-	SETTLE_STATUS_FAIL("2", "结算失败"),
-	SETTLE_STATUS_SUBMIT("3", "已提交"),
-	SETTLE_STATUS_NO("4", "未结算"),
-	SETTLE_STATUS_PART("5", "部分成功"),
-	SETTLE_STATUS_WAIT("9", "待结算"),
-
-	SETTLE_STATUS_NULL("", "");
-	;
+	SETTLE_STATUS_NOTSETTLE("0", "", "未结算"),
+	SETTLE_STATUS_SUCCESS("1", "结算成功", "结算成功"),
+	SETTLE_STATUS_FAIL("2", "结算失败", "结算失败"),
+	SETTLE_STATUS_SUBMIT("3", "已提交", "已提交结算"),
+	SETTLE_STATUS_NO("4", "未结算", ""),
+	SETTLE_STATUS_PART("5", "部分成功", ""),
+	SETTLE_STATUS_WAIT("9", "待结算", "申请结算"),
+	SETTLE_STATUS_NULL("", "", "");
 
 	private String val;
 
 	private String name;
 
-	SettleStatusEnum(String val, String name) {
+	private String name2;
+
+	SettleStatusEnum(String val, String name, String name2) {
 		this.val = val;
 		this.name = name;
+		this.name2 = name2;
 	}
 
 	public static SettleStatusEnum resolve(String val){

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmProjectMapper.java

@@ -20,11 +20,12 @@ public interface WmProjectMapper extends BaseMapper<WmProject> {
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
-	IPage<WmProject> listProjectPage(Page page, @Param("projectName") String projectName, @Param("delegate") String delegate);
+	IPage<WmProject> listProjectPage(Page page, @Param("deptId") Integer deptId, @Param("projectName") String projectName, @Param("delegate") String delegate);
 
 	/**
 	 * 根据id查询

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmProjectService.java

@@ -17,11 +17,12 @@ public interface WmProjectService extends IService<WmProject> {
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
-	IPage<WmProject> listProjectPage(Page page, String projectName, String delegate);
+	IPage<WmProject> listProjectPage(Page page, Integer deptId, String projectName, String delegate);
 
 	/**
 	 * 根据id查询

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmDaDrugEntDrugtableServiceImpl.java

@@ -101,7 +101,7 @@ public class WmDaDrugEntDrugtableServiceImpl extends ServiceImpl<WmDaDrugEntDrug
 	public Set<String> listDrugProducerByDeptId(Integer deptId) {
 		Set<Integer> drugIds = reDeptDrugService.list(Wrappers.<ReDeptDrug>lambdaQuery()
 				.eq(deptId != null, ReDeptDrug::getDeptId, deptId))
-				.stream()
+				.stream()/**/
 				.mapToInt(ReDeptDrug::getDrugId)
 				.boxed()
 				.collect(Collectors.toSet());

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmProjectServiceImpl.java

@@ -37,13 +37,14 @@ public class WmProjectServiceImpl extends ServiceImpl<WmProjectMapper, WmProject
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
 	@Override
-	public IPage<WmProject> listProjectPage(Page page, String projectName, String delegate) {
-		return wmProjectMapper.listProjectPage(page, projectName, delegate);
+	public IPage<WmProject> listProjectPage(Page page, Integer deptId, String projectName, String delegate) {
+		return wmProjectMapper.listProjectPage(page, deptId, projectName, delegate);
 	}
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmProjectMapper.xml

@@ -24,6 +24,7 @@
 		FROM
 			wm_project
 		<where>
+			dept_id = #{deptId}
 			<if test="projectName != null and projectName != ''">
 				AND project_name LIKE CONCAT('%',#{projectName},'%')
 			</if>

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageSettleNoteMapper.xml

@@ -89,6 +89,7 @@
 		t.score_package_id,
 		t.task_user_id,
 		u.realname real_name,
+		u.username,
 		c.temp3 xmbm,
 		e.id noteId,
 		e.invoice_type,
@@ -118,7 +119,7 @@
 		<if test="query.settleNoteStatus != null">
 			AND e.settle_note_status = #{query.settleNoteStatus}
 		</if>
-		ORDER BY e.sub_time DESC
+		ORDER BY e.sub_time DESC, t.id
 	</select>
 
 	<!-- 结算包结算列表 -->
@@ -131,6 +132,7 @@
 		t.task_user_id,
 		tt.task_type_name,
 		u.realname real_name,
+		u.username,
 		c.temp3 xmbm,
 		e.id noteId,
 		e.invoice_type,
@@ -163,6 +165,6 @@
 		<if test="query.settleNoteStatus != null">
 			AND e.settle_note_status = #{query.settleNoteStatus}
 		</if>
-		ORDER BY e.sub_time DESC
+		ORDER BY e.sub_time DESC, t.id
 	</select>
 </mapper>