Merge branch 'feat-20230704-reportexport' into temp-pre

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/SequenceConfig.java

@@ -48,4 +48,19 @@ public class SequenceConfig {
 				.dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes())
 				.tableName(properties.getTableName()).build();
 	}
+
+	/**
+	 * 任务发号器
+	 *
+	 * @param dataSource 数据源
+	 * @param properties 参数
+	 * @return 发号器
+	 */
+	@Bean(name = "taskSequence")
+	public Sequence taskSequence(DataSource dataSource, SequenceDbProperties properties) {
+		return DbSeqBuilder.create()
+				.bizName(() -> String.format("task_%s_%s", TenantContextHolder.getTenantId(), DateUtil.today()))
+				.dataSource(dataSource).step(properties.getStep()).retryTimes(properties.getRetryTimes())
+				.tableName(properties.getTableName()).build();
+	}
 }

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

@@ -120,6 +120,7 @@ import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -220,6 +221,7 @@ public class ApiController {
 	private final SysDeptCsmService deptCsmService;
 	private final MedicalEquipmentService medicalEquipmentService;
 	private final WmScorePackageSettleNoteMapper wmScorePackageSettleNoteMapper;
+	private final Sequence taskSequence;
 
 	@SysLog("通过任务类型获取表单配置")
 	@ApiOperation(value = "任务类型表单配置-通过任务类型获取表单配置", notes = "根据任务类型获取表单配置")
@@ -3176,6 +3178,7 @@ public class ApiController {
 
 					wmTask.setDeptId(sysU.getDeptId() + "");
 					wmTask.setSubmitStatus("0");
+					wmTask.setTaskNumber(taskSequence.nextNo());
 					boolean isSave = wmTaskService.save(wmTask);   //保存任务
 
 					//判断任务是否完成
@@ -3930,6 +3933,7 @@ public class ApiController {
 
 				wmTask.setTaskStatus(autoRejectFlag ? "4" : "2"); //任务状态
 				wmTask.setSubmitStatus(autoRejectFlag ? "1" : "0");
+				wmTask.setTaskNumber(taskSequence.nextNo());
 				boolean isSave = wmTaskService.save(wmTask);   //保存任务
 
 

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

@@ -396,12 +396,12 @@ public class WmReportController {
 	 */
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/getTaskListPage" )
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber) {
 		WmReport wmReport1=wmReportService.getById(wmReport.getId());
 		if(null==wmReport1){
 			return R.failed("未查询到报告信息");
 		}
-		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage, taskTypeId);
+		return wmReportService.getTaskListPage(page,wmReport1, isApprovalPage, taskTypeId, taskNumber);
 	}
 
 	/**

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

@@ -49,6 +49,12 @@ public class WmTask extends Model<WmTask> {
 	@TableId
 	@ApiModelProperty(value="")
 	private String id;
+
+	/**
+	 * 任务编号
+	 */
+	private String taskNumber;
+
 	/**
 	 * 任务类型ID
 	 */

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

@@ -73,7 +73,7 @@ public interface WmReportService extends IService<WmReport> {
 	 */
 	R<?> approvalReportByTaskType(List<String> taskIds, String approvalOpinion, String approvalInfo);
 
-	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId);
+	R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber);
 
 	/**
 	 * 根据积分包id查询待审核任务详情列表

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

@@ -26,7 +26,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -56,7 +55,6 @@ import com.qunzhixinxi.hnqz.admin.entity.dto.WmDeptTaskTypeConfigJsonDTO;
 import com.qunzhixinxi.hnqz.admin.entity.vo.WmTaskVO;
 import com.qunzhixinxi.hnqz.admin.enums.DelEnum;
 import com.qunzhixinxi.hnqz.admin.enums.EnableEnum;
-import com.qunzhixinxi.hnqz.admin.enums.PackageFinishStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.PackageStatusEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
 import com.qunzhixinxi.hnqz.admin.enums.ScorePackageStatusEnum;
@@ -959,19 +957,19 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 	}
 
 	/**
-	 * 报告管理--查看
-	 *
-	 * @param page
-	 * @param wmReport
-	 * @param isApprovalPage 1审批，0查看
-	 * @param taskTypeId
-	 * @return
-	 */
+     * 报告管理--查看
+     *
+     * @param page
+     * @param wmReport
+     * @param isApprovalPage 1审批，0查看
+     * @param taskTypeId 任务类型id
+     * @param taskNumber 任务编号
+     * @return
+     */
 	@Override
-	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId) {
+	public R getTaskListPage(Page page, WmReport wmReport, Integer isApprovalPage, String taskTypeId, String taskNumber) {
 		Page pages=null;
 		WmScorePackage scorePackage=wmScorePackageService.getById(wmReport.getScoreId());
-		WmTask wmTask=new WmTask();
 		LambdaQueryWrapper<WmTask> lambdaQueryWrapper= Wrappers.<WmTask>query().lambda();
 		lambdaQueryWrapper.and(wrapper -> wrapper.eq(WmTask::getReportDrugId, wmReport.getId())
 				.or().eq(WmTask::getReportOneId, wmReport.getId())
@@ -986,6 +984,9 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 				lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
 			}
 		}
+		if (StrUtil.isNotBlank(taskNumber)) {
+			lambdaQueryWrapper.like(WmTask::getTaskNumber, taskNumber);
+		}
 		if (StrUtil.isNotBlank(taskTypeId)) {
 			lambdaQueryWrapper.eq(WmTask::getTaskTypeId, taskTypeId);
 		}

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

@@ -51,13 +51,13 @@ import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionPercentRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskSubmissionRuleService;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeSubCate2Service;
 import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeSubCategoryService;
 import com.qunzhixinxi.hnqz.admin.util.HnqzUtils;
 import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -100,7 +100,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 	private final WmTaskTypeSubCategoryService taskTypeSubCategoryService;
 	private final WmTaskSubmissionRuleService taskSubmissionRuleService;
 	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
-	private final WmTaskTypeSubCate2Service wmTaskTypeSubCate2Service;
+	private final Sequence taskSequence;
 
 
 	private static final DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
@@ -716,6 +716,7 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 				wmTask.setRealFlag("0");
 				wmTask.setTaskStatus("2");
 
+				wmTask.setTaskNumber(taskSequence.nextNo());
 				//保存任务
 				boolean isSave = wmTaskService.save(wmTask);
 

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

@@ -19,6 +19,7 @@ import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.constant.enums.CommonFlag;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -60,6 +61,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 	private final WmTaskSubmissionPercentRuleService wmTaskSubmissionPercentRuleService;
 	private final WmTaskSubmissionRuleService wmTaskSubmissionRuleService;
 	private final UpmsConfig upmsConfig;
+	private final Sequence taskSequence;
 
 	@Override
 	public R saveWmUserSign(WmUserSign wmUserSign) {
@@ -367,6 +369,7 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 			wmTaskContentService.save(wmTaskContent);
 
 			wmTask.setTaskContentId(wmTaskContent.getId() + "");
+			wmTask.setTaskNumber(taskSequence.nextNo());
 			//保存任务
 			wmTaskService.save(wmTask);
 

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

@@ -25,6 +25,7 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmWkArticleShareMapper;
 import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
+import com.qunzhixinxi.hnqz.common.sequence.sequence.Sequence;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
@@ -48,6 +49,7 @@ public class WmWkArticleShareServiceImpl extends ServiceImpl<WmWkArticleShareMap
 	private final WmTaskTypeService wmTaskTypeService;
 	private final WmScorePackageService wmScorePackageService;
 	private final WmTaskService wmTaskService;
+	private final Sequence taskSequence;
 
 	@Override
 	public R saveWmWkArticleShare(String artileId, String shareUserId, String openUserId,int type) {
@@ -131,6 +133,7 @@ public class WmWkArticleShareServiceImpl extends ServiceImpl<WmWkArticleShareMap
 
 					wmTask.setDeptId(sysU.getDeptId()+"");
 					wmTask.setSubmitStatus("0");
+					wmTask.setTaskNumber(taskSequence.nextNo());
 					boolean isSave=wmTaskService.save(wmTask);   //保存任务
 
 					//判断任务是否完成

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

@@ -25,6 +25,7 @@
 
 	<resultMap id="wmTaskMap" type="com.qunzhixinxi.hnqz.admin.entity.WmTask">
 		<id property="id" column="id"/>
+		<result property="taskNumber" column="task_number"/>
 		<result property="taskTypeId" column="task_type_id"/>
 		<result property="taskRuleId" column="task_rule_id"/>
 		<result property="score" column="score"/>
@@ -944,6 +945,7 @@
 	<select id="getWmTaskList" resultMap="wmTaskMap">
 		SELECT
 		t.id AS id,
+		t.task_number,
 		t.task_rule_id AS task_rule_id,
 		t.score AS score,
 		p2.id AS score_package_drug_id,
@@ -1004,6 +1006,9 @@
 		<if test="query.taskUserId!=null and query.taskUserId!=''">
 			and  t.task_user_id = #{query.taskUserId}
 		</if>
+		<if test="query.taskNumber != null and query.taskNumber != ''">
+			and t.task_number like concat('%', #{query.taskNumber}, '%')
+		</if>
 		<if test="query.taskTypeId != null and query.taskTypeId != ''">
 			and  t.task_type_id = #{query.taskTypeId}
 		</if>