Merge branch 'hotfix-infoaudit-210723' of googol/YY_BE_2 into master

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

@@ -31,12 +31,36 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.plugin.excel.annotation.RequestExcel;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
-import com.qunzhixinxi.hnqz.admin.entity.*;
+import com.qunzhixinxi.hnqz.admin.entity.AuditEntity;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaAgent;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaDistribution;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaDrugEnt;
+import com.qunzhixinxi.hnqz.admin.entity.WmDaHospital;
+import com.qunzhixinxi.hnqz.admin.entity.WmReport;
+import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
+import com.qunzhixinxi.hnqz.admin.entity.WmTask;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskContent;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskRule;
+import com.qunzhixinxi.hnqz.admin.entity.WmTaskType;
+import com.qunzhixinxi.hnqz.admin.entity.XlsPackageInfo;
+import com.qunzhixinxi.hnqz.admin.entity.XlsTask;
 import com.qunzhixinxi.hnqz.admin.entity.dto.CommonEvidenceDTO;
 import com.qunzhixinxi.hnqz.admin.entity.model.excel.CommonTaskExcelModel;
 import com.qunzhixinxi.hnqz.admin.mapper.SysDeptEncryptorMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
-import com.qunzhixinxi.hnqz.admin.service.*;
+import com.qunzhixinxi.hnqz.admin.service.ReportExportService;
+import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
+import com.qunzhixinxi.hnqz.admin.service.SysUserService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
+import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskContentService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskRuleService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskSettleNoteService;
+import com.qunzhixinxi.hnqz.admin.service.WmTaskTypeService;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
 import com.qunzhixinxi.hnqz.common.security.annotation.Inner;
@@ -49,11 +73,24 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.util.ResourceUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLEncoder;
@@ -329,42 +366,17 @@ public class WmTaskController {
 	@ApiOperation(value = "分页查询", notes = "分页查询")
 	@GetMapping("/pageAudit")
 	public R pageAudit(Page page, WmTask wmTask, String endDate, String startDate) {
-//		OrderItem orderItem=new OrderItem();
-//		orderItem.setColumn("create_time");
-//		orderItem.setAsc(false);
-//		page.addOrder(orderItem);
 
-		wmTask.setDelFlag("0");
-		wmTask.setEnableFlag("0");
-		List<String> list = new ArrayList<>();
-		list.add("15");
-		list.add("16");
-		list.add("18");
-		list.add("30");
-		LambdaQueryWrapper<WmTask> query = Wrappers.query(wmTask)
-				.select("max(id) as id", "max(task_user_id) as task_user_id",
-						"max(create_time) as create_time", "max(approval_info) as approval_info",
-						"max(plat_audit_status) as plat_audit_status", "max(task_status) as task_status",
-						"task_content_id", "task_type_id")
-				.lambda()
-				.in(WmTask::getTaskTypeId, list)
-				.ne(WmTask::getTaskFrom, "2");
+		LocalDateTime _startDate = null;
+		LocalDateTime _endDate = null;
 		if (StringUtils.isNotEmpty(startDate)) {
-			query.ge(WmTask::getCreateTime, LocalDateTime.of(LocalDate.parse(startDate), LocalTime.MIN));
+			_startDate = LocalDateTime.of(LocalDate.parse(startDate), LocalTime.MIN);
 		}
 		if (StringUtils.isNotEmpty(endDate)) {
-			query.le(WmTask::getCreateTime, LocalDateTime.of(LocalDate.parse(endDate), LocalTime.MAX));
+			_endDate = LocalDateTime.of(LocalDate.parse(endDate), LocalTime.MAX);
 		}
-		query.groupBy(WmTask::getTaskContentId, WmTask::getTaskTypeId);
-//		query.orderByAsc(WmTask::getPlatAuditStatus);
-		query.orderByDesc(WmTask::getCreateTime);
-		Page pageAnswer = wmTaskService.page(page, query);
-		List<WmTask> wmTaskList = pageAnswer.getRecords();
-		for (WmTask wmt :
-				wmTaskList) {
-			wmt.setUpdateUser(wmt.getTaskUserId());
-		}
-		return R.ok(pageAnswer);
+		IPage<WmTask> iPage = wmTaskService.listInfoAudit(page, wmTask, _startDate, _endDate);
+		return R.ok(iPage);
 	}
 
 

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

@@ -251,4 +251,10 @@ public class WmTask extends Model<WmTask> {
 	 */
 	@TableField(exist = false)
 	private String taskUsername;
+
+	/**
+	 * 关联的用户手机号
+	 */
+	@TableField(exist = false)
+	private String username;
 }

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

@@ -143,4 +143,14 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
 	 * @return 处方列表
 	 */
 	List<WmTask> listTaskPrescription(@Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
+
+	/**
+	 * 查询调查信息审核列表
+	 *
+	 * @param wmTask
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	IPage<WmTask> listInfoAudit(Page page, @Param("query") WmTask wmTask, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 }

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

@@ -31,6 +31,7 @@ import com.qunzhixinxi.hnqz.common.core.util.R;
 import org.apache.ibatis.annotations.Param;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -158,4 +159,14 @@ public interface WmTaskService extends IService<WmTask> {
 	 */
 	Map<String, String> taskBatchImport(Map<String, List<CommonEvidenceDTO>> commonEvidenceDTOMap,
 										String packageName);
+
+	/**
+	 * 查询调查信息审核列表
+	 *
+	 * @param wmTask
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	IPage<WmTask> listInfoAudit(Page page, WmTask wmTask, LocalDateTime startDate, LocalDateTime endDate);
 }

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

@@ -2137,4 +2137,17 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 			wmScorePackageSettleNoteService.save(note);
 		}
 	}
+
+	/**
+	 * 查询调查信息审核列表
+	 *
+	 * @param wmTask
+	 * @param startDate
+	 * @param endDate
+	 * @return
+	 */
+	@Override
+	public IPage<WmTask> listInfoAudit(Page page, WmTask wmTask, LocalDateTime startDate, LocalDateTime endDate) {
+		return wmTaskMapper.listInfoAudit(page, wmTask, startDate, endDate);
+	}
 }

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

@@ -1174,4 +1174,32 @@ FROM
 			</if>
 		</where>
 	</select>
+
+	<!-- 查询调查信息审核列表 -->
+	<select id="listInfoAudit" resultMap="wmTaskMap">
+		SELECT
+			temp.*, u.realname AS task_user_name, u.username
+		FROM
+			(
+				SELECT max(id) AS id, max(task_user_id) AS task_user_id, max(create_time) AS create_time,
+					   max(approval_info) AS approval_info, max(plat_audit_status) AS plat_audit_status,
+					   max(task_status) AS task_status, task_content_id, task_type_id
+				FROM wm_task
+				<where>
+					del_flag = '0' AND enable_flag = '0' AND (task_type_id IN ('15', '16', '18', '30') AND task_from != '2')
+					<if test="query.taskTypeId != null and query.taskTypeId != ''">
+						AND task_type_id = #{query.taskTypeId, jdbcType=VARCHAR}
+					</if>
+					<if test="query.platAuditStatus != null and query.platAuditStatus != ''">
+						AND plat_audit_status = #{query.platAuditStatus, jdbcType=VARCHAR}
+					</if>
+					<if test="startDate != null and endDate != null">
+						AND create_time BETWEEN #{startDate, jdbcType=TIMESTAMP} AND #{endDate, jdbcType=TIMESTAMP}
+					</if>
+				</where>
+				GROUP BY task_content_id, task_type_id
+			) temp
+		LEFT JOIN sys_user u ON u.user_id = temp.task_user_id
+		ORDER BY temp.create_time DESC
+	</select>
 </mapper>