init: init project step4: biz code support

hnqz-common/hnqz-common-mq/src/main/java/com/qunzhixinxi/hnqz/common/rabbitmq/core/BaseRabbiMqHandler.java

@@ -63,6 +63,27 @@ public class BaseRabbiMqHandler<T> {
 
     }
 
+	public void onMessageAck1(T t, Long deliveryTag, Channel channel, MqListener mqListener) {
+		log.warn("==================== delivery-tag：[{}], ack1 开始 ==========================", deliveryTag);
+		try {
+			log.warn("开始执行操作");
+			mqListener.handler(t, channel);
+		} catch (Exception e) {
+			log.info("接收消息失败,但不放回队列");
+			e.printStackTrace();
+		} finally {
+			log.warn("开始ack操作");
+			try {
+				channel.basicAck(deliveryTag, false);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
+			log.warn("==================== delivery-tag：[{}], ack1 结束 ==========================", deliveryTag);
+		}
+
+	}
+
 	private void setIntoRedis(final String key, final String res) {
 
 		log.warn("-----------------------------循环插入redis开始--------------------------------------");

hnqz-common/hnqz-common-oss/pom.xml

@@ -20,5 +20,15 @@
 			<artifactId>aws-java-sdk-s3</artifactId>
 			<version>${aws.version}</version>
 		</dependency>
+		<!--文件存储-->
+		<dependency>
+			<groupId>io.minio</groupId>
+			<artifactId>minio</artifactId>
+			<version>7.1.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 	</dependencies>
 </project>

hnqz-common/hnqz-common-oss/src/main/java/com/qunzhixinxi/hnqz/common/oss/OssAutoConfiguration.java

@@ -2,6 +2,7 @@ package com.qunzhixinxi.hnqz.common.oss;
 
 import com.qunzhixinxi.hnqz.common.oss.http.OssEndpoint;
 import com.qunzhixinxi.hnqz.common.oss.service.OssTemplate;
+import io.minio.MinioClient;
 import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -33,4 +34,14 @@ public class OssAutoConfiguration {
 		return new OssEndpoint(template);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean(MinioClient.class)
+	@ConditionalOnProperty(name = "oss.enable", havingValue = "true", matchIfMissing = true)
+	public MinioClient minioTemplate() {
+		return MinioClient.builder()
+				.endpoint(properties.getEndpoint())
+				.credentials(properties.getAccessKey(), properties.getSecretKey())
+				.build();
+	}
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/ReportHandlerDeptRelation.java

@@ -61,4 +61,9 @@ public class ReportHandlerDeptRelation extends Model<ReportHandlerDeptRelation>
      */
     private Integer updateUser;
 
+    /**
+     * 模板名称
+     */
+    private String template;
+
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmDaDrugEntDrugtable.java

@@ -115,4 +115,9 @@ public class WmDaDrugEntDrugtable extends Model<WmDaDrugEntDrugtable> {
 	 * 规格名称
 	 */
 	private String guigeName;
+
+	/**
+	 * 详情信息(暂手动维护,用于报告)
+	 */
+	private String detail;
 }

hnqz-upms/hnqz-upms-api/src/main/java/com/qunzhixinxi/hnqz/admin/api/entity/WmReportExportRecord.java

@@ -0,0 +1,47 @@
+package com.qunzhixinxi.hnqz.admin.api.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * {@code WmReportExportRecord}
+ * <p>
+ * 报告导出记录
+ *
+ * @author Hengchen.Sun
+ * @version 1.0.0
+ * @date 2021/12/09 16:22
+ */
+@Data
+public class WmReportExportRecord implements Serializable {
+	private static final long serialVersionUID = 223686558735172743L;
+
+
+	@TableId(value = "record_id", type = IdType.AUTO)
+	private Integer id;
+
+	@TableField(value = "report_no")
+	private String reportNum;
+
+	@TableField(value = "report_title")
+	private String title;
+
+	private Integer deptId;
+
+	private Integer exportStatus;
+
+	private String createBy;
+
+	@TableField(value = "oss_url")
+	private String url;
+
+	private LocalDateTime createdTime;
+
+	private LocalDateTime finishTime;
+
+}

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -296,4 +298,37 @@ public class WmTask extends Model<WmTask> {
 	 * 乐观锁
 	 */
 	private Integer version;
+
+    /**
+     * 任务提交审核信息
+     */
+    private String taskSettleStatus;
+
+    /**
+     * 任务类型父级ID
+     */
+    @TableField(exist = false)
+    private String taskTypeParentId;
+
+    /**
+     * 序号用于统计
+     */
+    @TableField(exist = false)
+    private Integer tmpId;
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum TaskSettleStatusEnum {
+
+        NOT_SUBMITTED("0", "未提交"),
+        WAITING("1", "待结算"),
+        SETTLING("2", "结算中"),
+        SETTLED("3", "已结算"),
+        REJECTED("4", "已打回");
+
+        private final String code;
+
+        private final String desc;
+    }
 }

hnqz-visual/hnqz-report-biz/pom.xml

@@ -0,0 +1,246 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.qunzhixinxi</groupId>
+        <artifactId>hnqz-visual</artifactId>
+        <version>3.9.0</version>
+    </parent>
+
+    <artifactId>hnqz-report-biz</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <!--注册中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+        <!--配置中心客户端-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+        </dependency>
+        <!--upms api、model 模块-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-upms-api</artifactId>
+        </dependency>
+        <!--日志处理-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-data</artifactId>
+        </dependency>
+        <!--文件系统-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-oss</artifactId>
+        </dependency>
+        <!--mybatis-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+        <!-- druid 连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <!--数据库-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!--DM8-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+        </dependency>
+        <!--web 模块-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!--undertow容器-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.3.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>5.2.7.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--<dependency>
+          <groupId>com.pig4cloud.excel</groupId>
+          <artifactId>excel-spring-boot-starter</artifactId>
+          <version>0.4.1</version>
+        </dependency>-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>4.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+        <!-- Excel导入导出 -->
+        <dependency>
+            <groupId>net.fenghaitao</groupId>
+            <artifactId>auto-excel</artifactId>
+            <version>2.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.deepoove</groupId>
+            <artifactId>poi-tl</artifactId>
+            <version>1.8.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-mq</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>4.0.0-alpha-6</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.codeborne/phantomjsdriver -->
+        <dependency>
+            <groupId>com.codeborne</groupId>
+            <artifactId>phantomjsdriver</artifactId>
+            <version>1.4.4</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.webfolder/cdp4j -->
+        <dependency>
+            <groupId>io.webfolder</groupId>
+            <artifactId>cdp4j</artifactId>
+            <version>3.0.15</version>
+        </dependency>
+        <dependency>
+            <groupId>ru.yandex.qatools.ashot</groupId>
+            <artifactId>ashot</artifactId>
+            <version>1.5.4</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>javax.mail</artifactId>
+            <version>1.6.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <!-- 重试机制 -->
+        <dependency>
+            <groupId>org.springframework.retry</groupId>
+            <artifactId>spring-retry</artifactId>
+            <version>1.2.4.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.9.4</version>
+        </dependency>
+        <!--itexpdf-->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itext-asian</artifactId>
+            <version>5.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>itextpdf</artifactId>
+            <version>5.5.13.2</version>
+        </dependency>
+        <!--spring security 、oauth、jwt依赖-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-security</artifactId>
+        </dependency>
+        <!--灰度支持-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-gray</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.11.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-datasource</artifactId>
+        </dependency>
+        <!--sentinel 依赖-->
+        <dependency>
+            <groupId>com.qunzhixinxi</groupId>
+            <artifactId>hnqz-common-sentinel</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <configuration>
+                    <skip>false</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/config/ThreadPoolConfig.java

@@ -0,0 +1,37 @@
+package com.qunzhixinxi.hnqz.report.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 服务线程池配置
+ *
+ * @author jimmy
+ * @version 1.0.0
+ * @date 2022-09-04 11:34
+ */
+@EnableAsync
+@Configuration
+public class ThreadPoolConfig {
+
+
+	@Bean(value = "taskExecutor")
+	public TaskExecutor taskExecutor() {
+		ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+		executor.setCorePoolSize(4);
+		executor.setMaxPoolSize(8);
+		executor.setQueueCapacity(1000);
+		executor.setKeepAliveSeconds(60);
+		executor.setThreadNamePrefix("queue-task-");
+		executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+		executor.setWaitForTasksToCompleteOnShutdown(true);
+		return executor;
+	}
+
+
+}

hnqz-visual/hnqz-report-biz/src/main/java/com/qunzhixinxi/hnqz/report/config/UpmsConfig.java

@@ -0,0 +1,40 @@
+package com.qunzhixinxi.hnqz.report.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ *  项目内 请求URL配置
+ *
+ * @author zhangwt
+ * @since 1.0
+ */
+@Data
+@Component
+@ConfigurationProperties( prefix = "app.config")
+public class UpmsConfig {
+
+	private Boolean enable;
+    /**
+     * apiUrl
+     */
+    private String apiUrl;
+    private String serverUrl;
+    private String clientUrl;
+    private String basePath;
+
+	/**
+	 * 最大分享值
+	 */
+	private Integer maxShareTimes;
+
+	private String formMail;
+
+	/**
+	 * 小程序环境
+	 */
+	private String wechatEnv;
+
+
+}

hnqz-visual/hnqz-report-biz/src/main/resources/bootstrap.yml

@@ -0,0 +1,24 @@
+server:
+  port: @profiles.report.port@
+
+spring:
+  profiles:
+    active: @profiles.active@
+  application:
+    name: @artifactId@
+  cloud:
+    nacos:
+      username: @nacos.username@
+      password: @nacos.password@
+      discovery:
+        server-addr: @nacos.server-addr@
+        namespace: @profiles.namespace@
+        group: ${spring.profiles.active}
+      config:
+        server-addr: ${spring.cloud.nacos.discovery.server-addr}
+        namespace: @profiles.namespace@
+        group: ${spring.profiles.active}
+        file-extension: yml
+        shared-configs:
+          - data-id: application.yml
+            group: ${spring.profiles.active}

hnqz-visual/hnqz-report-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    小技巧: 在根pom里面设置统一存放路径，统一管理方便维护
+    <properties>
+        <log-path>/Users/hnqz</log-path>
+    </properties>
+    1. 其他模块加日志输出，直接copy本文件放在resources 目录即可
+    2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
+-->
+<configuration debug="false" scan="false">
+	<property name="log.path" value="logs/${project.artifactId}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- Console log output -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- Log file debug output -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- Log file error output -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<logger name="org.activiti.engine.impl.db" level="DEBUG">
+		<appender-ref ref="debug"/>
+	</logger>
+
+	<!--nacos 心跳 INFO 屏蔽-->
+	<logger name="com.alibaba.nacos" level="OFF">
+		<appender-ref ref="error"/>
+	</logger>
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+	</root>
+</configuration>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/SysDeptMapper.xml

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.SysDeptMapper">
+	<resultMap id="sysDeptMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysDept">
+		<id property="deptId" column="dept_id"/>
+		<result property="name" column="name"/>
+		<result property="sort" column="sort"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="parentId" column="parent_id"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="deptCode" column="dept_code"/>
+		<result property="level" column="level"/>
+		<result property="level1Name" column="level1_name"/>
+		<result property="level1Id" column="level1_id"/>
+		<result property="level2Name" column="level2_name"/>
+		<result property="level2Id" column="level2_id"/>
+		<result property="level3Name" column="level3_name"/>
+		<result property="level3Id" column="level3_id"/>
+		<result property="taxCode" column="tax_code"/>
+	</resultMap>
+
+	<select id="selectDistinctDeptId" resultMap="sysDeptMap">
+		select
+		DISTINCT dept_id,
+		level
+		from
+		sys_dept
+		where
+		dept_id = #{query.deptId,jdbcType=INTEGER}
+		order by level
+		limit 1
+	</select>
+
+	<select id="selectDeptList" resultMap="sysDeptMap">
+		select
+		dept_id,
+		sort,
+		name
+		from
+		sys_dept
+	</select>
+
+	<select id="selectDeptByIds" resultMap="sysDeptMap">
+  		select
+  		*
+   		from
+   		sys_dept
+   		where
+   		dept_id = #{query.deptId,jdbcType=INTEGER}
+	</select>
+
+	<select id="selectDeptByName" resultMap="sysDeptMap">
+  		select
+  		dept_id,name
+   		from
+   		sys_dept
+   		where
+   		dept_id = #{query.deptId,jdbcType=INTEGER}
+	</select>
+
+	<select id="selectDept" resultMap="sysDeptMap">
+  		select
+  		*
+   		from
+   		sys_dept
+   		where
+   		dept_id = #{deptId,jdbcType=INTEGER}
+	</select>
+
+	<select id="selectListByDept" resultMap="sysDeptMap">
+		select
+		dept_id,
+		name
+		from
+		sys_dept
+		where del_flag = 0
+	</select>
+
+	<select id="selectDeptById" resultType="java.util.HashMap">
+  		SELECT
+		d.dept_id as deptId,d.name,d.level,
+		CASE WHEN a.zj_number IS NULL THEN e.entcode ELSE a.zj_number END entcode
+		FROM
+		sys_dept d
+		LEFT JOIN wm_da_agent a ON d.dept_id = a.dept_id
+		LEFT JOIN wm_da_drug_ent e ON d.dept_id = e.dept_id
+		WHERE
+		d.dept_id = #{query.deptId,jdbcType=INTEGER}
+	</select>
+
+	<select id="getAllParentDept" resultMap="sysDeptMap">
+		select DISTINCT
+		dept_id,
+		`name`,
+		`level`
+		from sys_dept
+		where dept_id IN
+		(select d.dept_id  from sys_dept d
+		where d.dept_id=#{query.deptId}
+		union
+		select r.up_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.down_id
+		where d.dept_id=#{query.deptId}
+		union
+		select r2.up_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.down_id
+		left join wm_relation r2 on r.up_id=r2.down_id
+		where d.dept_id=#{query.deptId}
+				)
+		and del_flag=0
+		AND dept_id NOT in(1)
+	</select>
+
+	<select id="selectByName" resultMap="sysDeptMap">
+		select
+		*
+		from
+		sys_dept
+		where
+		name = #{name,jdbcType=VARCHAR}
+	</select>
+	<select id="selectEntCodeByLevelId" resultType="string">
+		<choose>
+			<when test="level = 1">
+				SELECT `entcode` FROM `wm_da_drug_ent`
+			</when>
+			<otherwise>
+				SELECT `zj_number` FROM `wm_da_agent`
+			</otherwise>
+		</choose>
+		WHERE `id` = #{levelId}
+	</select>
+
+	<update id="updateByPrimaryKeySelective" parameterType="com.qunzhixinxi.hnqz.admin.api.entity.SysDept" >
+		update sys_dept
+		<set >
+			<if test="delFlag != null" >
+				del_flag = #{delFlag,jdbcType=VARCHAR},
+			</if>
+			<if test="name != null" >
+				name = #{name,jdbcType=VARCHAR},
+			</if>
+			<if test="subjectType != null" >
+				subject_type = #{subjectType,jdbcType=VARCHAR},
+			</if>
+			<if test="taxCode != null" >
+				tax_code = #{taxCode,jdbcType=VARCHAR},
+			</if>
+			<if test="deptPermissions != null and deptPermissions != ''">
+				dept_permissions = #{deptPermissions, jdbcType=VARCHAR}
+			</if>
+		</set>
+		where dept_id = #{deptId,jdbcType=BIGINT}
+	</update>
+
+	<select id="getParentDept" resultType="map">
+		select DISTINCT
+		dept_id  deptId,
+		`name`
+		from sys_dept
+		where dept_id IN
+		(
+		select r.up_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.down_id
+		where d.dept_id=#{query.deptId}
+		union
+		select r2.up_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.down_id
+		left join wm_relation r2 on r.up_id=r2.down_id
+		where d.dept_id=#{query.deptId}
+				)
+		and del_flag=0
+		AND dept_id NOT in(1)
+	</select>
+
+	<select id="getChildDept" resultType="map">
+		select DISTINCT
+		dept_id  deptId,
+		`name`
+		from sys_dept
+		where dept_id IN
+		(
+		select r.down_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.up_id
+		where d.dept_id=#{query.deptId}
+		union
+		select r2.down_id from sys_dept d
+		left join wm_relation r on d.dept_id=r.up_id
+		left join wm_relation r2 on r.down_id=r2.up_id
+		where d.dept_id=#{query.deptId}
+				)
+		and del_flag=0
+		AND dept_id NOT in(1)
+	</select>
+
+	<select id="getDeptConvertToName" resultType="map">
+		select  dept_id  deptId, `name` from sys_dept
+	</select>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/SysTenantMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.admin.mapper.SysTenantMapper">
+
+	<resultMap id="sysTenantMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysTenant">
+		<id property="id" column="id"/>
+		<result property="name" column="name"/>
+		<result property="code" column="code"/>
+		<result property="startTime" column="start_time"/>
+		<result property="endTime" column="end_time"/>
+		<result property="status" column="status"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateTime" column="update_time"/>
+	</resultMap>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.SysUserMapper">
+	<resultMap id="userResultMap" type="com.qunzhixinxi.hnqz.admin.api.entity.SysUser">
+		<id column="user_id" property="userId"/>
+		<result column="username" property="username"/>
+		<result column="password" property="password"/>
+		<result column="salt" property="salt"/>
+		<result column="phone" property="phone"/>
+		<result column="id_card_number" property="idCardNumber"/>
+		<result column="userSign" property="user_sign"/>
+		<result column="avatar" property="avatar"/>
+		<result column="wx_openid" property="wxOpenid"/>
+		<result column="qq_openid" property="qqOpenid"/>
+		<result column="create_time" property="createTime"/>
+		<result column="update_time" property="updateTime"/>
+		<result column="lock_flag" property="lockFlag"/>
+		<result column="del_flag" property="delFlag"/>
+		<result column="dept_id" property="deptId"/>
+		<result column="tenant_id" property="tenantId"/>
+		<result column="realname" property="realname"/>
+		<result column="temp1" property="temp1"/>
+		<result column="temp2" property="temp2"/>
+		<result column="temp3" property="temp3"/>
+		<result column="temp4" property="temp4"/>
+		<result column="temp5" property="temp5"/>
+		<result column="w1" property="w1"/>
+		<result column="plat_id" property="platId"/>
+		<result column="drug_ent_id" property="drugEntId"/>
+	</resultMap>
+
+	<!-- 通用查询映射结果 -->
+	<resultMap id="baseResultMap" type="com.qunzhixinxi.hnqz.admin.api.vo.UserVO">
+		<id column="user_id" property="userId"/>
+		<result column="username" property="username"/>
+		<result column="password" property="password"/>
+		<result column="salt" property="salt"/>
+		<result column="phone" property="phone"/>
+		<result column="id_card_number" property="idCardNumber"/>
+		<result column="userSign" property="user_sign"/>
+		<result column="avatar" property="avatar"/>
+		<result column="wx_openid" property="wxOpenid"/>
+		<result column="qq_openid" property="qqOpenid"/>
+		<result column="ucreate_time" property="createTime"/>
+		<result column="uupdate_time" property="updateTime"/>
+		<result column="lock_flag" property="lockFlag"/>
+		<result column="udel_flag" property="delFlag"/>
+		<result column="dept_id" property="deptId"/>
+		<result column="tenant_id" property="tenantId"/>
+		<result column="dept_name" property="deptName"/>
+		<result column="realname" property="realname"/>
+		<result column="temp1" property="temp1"/>
+		<result column="temp2" property="temp2"/>
+		<result column="temp3" property="temp3"/>
+		<result column="temp4" property="temp4"/>
+		<result column="temp5" property="temp5"/>
+		<result column="w1" property="w1"/>
+		<result column="plat_id" property="platId"/>
+		<result column="drug_ent_id" property="drugEntId"/>
+		<collection property="roleList" ofType="com.qunzhixinxi.hnqz.admin.api.entity.SysRole"
+					select="com.qunzhixinxi.hnqz.admin.mapper.SysRoleMapper.listRolesByUserId" column="user_id">
+		</collection>
+	</resultMap>
+
+	<!-- userVo结果集 -->
+	<resultMap id="userVoResultMap" type="com.qunzhixinxi.hnqz.admin.api.vo.UserVO">
+		<id column="user_id" property="userId"/>
+		<result column="username" property="username"/>
+		<result column="password" property="password"/>
+		<result column="salt" property="salt"/>
+		<result column="phone" property="phone"/>
+		<result column="id_card_number" property="idCardNumber"/>
+		<result column="avatar" property="avatar"/>
+		<result column="wx_openid" property="wxOpenid"/>
+		<result column="qq_openid" property="qqOpenid"/>
+		<result column="create_time" property="createTime"/>
+		<result column="update_time" property="updateTime"/>
+		<result column="lock_flag" property="lockFlag"/>
+		<result column="del_flag" property="delFlag"/>
+		<result column="dept_id" property="deptId"/>
+		<result column="tenant_id" property="tenantId"/>
+		<result column="dept_name" property="deptName"/>
+		<result column="realname" property="realname"/>
+		<result column="temp1" property="temp1"/>
+		<result column="temp2" property="temp2"/>
+		<result column="temp3" property="temp3"/>
+		<result column="temp4" property="temp4"/>
+		<result column="temp5" property="temp5"/>
+		<result column="plat_id" property="platId"/>
+		<result column="w1" property="w1"/>
+		<result column="drug_ent_id" property="drugEntId"/>
+		<collection property="roleList" ofType="com.qunzhixinxi.hnqz.admin.api.entity.SysRole">
+			<id column="role_id" property="roleId"/>
+			<result column="role_name" property="roleName"/>
+			<result column="role_code" property="roleCode"/>
+			<result column="role_desc" property="roleDesc"/>
+			<result column="rcreate_time" property="createTime"/>
+			<result column="rupdate_time" property="updateTime"/>
+		</collection>
+	</resultMap>
+
+
+
+	<sql id="userRoleSql">
+		distinct
+		u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.id_card_number,
+		u.user_type,
+		u.bank_card_number,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		r.role_id,
+		r.role_name,
+		r.role_code,
+		r.role_desc,
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time,
+		u.realname,
+		u.province,
+		u.city,
+		u.province_code,
+		u.city_code,
+		u.area,
+		u.address,
+		u.temp1,
+		u.temp2,
+		u.temp3,
+		u.temp4,
+		u.temp5,
+		u.plat_id,
+		u.drug_ent_id,
+		u.cert_status,
+		u.rlj_cert_status,
+		u.cert_remark,
+		u.w1,
+		r.role_id,
+		r.role_name,
+		r.role_code,
+		r.role_desc,
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time
+	</sql>
+
+	<sql id="userRoleDeptSql">
+		distinct
+		u.user_id,
+		u.username,
+		u.password,
+		u.salt,
+		u.phone,
+		u.id_card_number,
+		u.user_type,
+		u.bank_card_number,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		r.role_id,
+		r.role_name,
+		r.role_code,
+		r.role_desc,
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time,
+		u.realname,
+		u.province,
+		u.city,
+		u.province_code,
+		u.city_code,
+		u.area,
+		u.address,
+		u.temp1,
+		u.temp2,
+		u.temp3,
+		u.temp4,
+		u.temp5,
+		u.plat_id,
+		u.drug_ent_id,
+		u.cert_status,
+		u.rlj_cert_status,
+		u.cert_remark,
+		u.w1,
+		r.role_id,
+		r.role_name,
+		r.role_code,
+		r.role_desc,
+		r.create_time  rcreate_time,
+		r.update_time  rupdate_time,
+		d.name  dept_name,
+		d.dept_id
+    </sql>
+
+	<select id="selectByDeptId" resultMap="userVoResultMap">
+		SELECT
+		*
+		FROM
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		LEFT JOIN sys_dept_sub s ON s.dept_id = u.dept_id and s.enable_flag = '1'
+		where
+		u.del_flag = 0
+		<if test="query.username != null and query.username !=''">
+			AND u.username like CONCAT('%',#{query.username},'%')
+		</if>
+		<if test="query.realname != null and query.realname !=''">
+			AND u.realname like CONCAT('%',#{query.realname},'%')
+		</if>
+		<if test="query.deptId != null and query.deptId != ''">
+			AND u.dept_id = #{query.deptId}
+		</if>
+		<if test="query.certStatus != null and query.certStatus != ''">
+			<choose>
+				<when test="query.certStatus == 10">
+					AND (u.cert_status = #{query.certStatus} OR u.cert_status IS NULL)
+				</when>
+				<otherwise>
+					AND u.cert_status = #{query.certStatus}
+				</otherwise>
+			</choose>
+		</if>
+		<if test="query.rljCertStatus != null and query.rljCertStatus != ''">
+			<choose>
+				<when test="query.rljCertStatus == 4">
+					AND (u.rlj_cert_status = #{query.rljCertStatus} OR u.rlj_cert_status IS NULL)
+				</when>
+				<otherwise>
+					AND u.rlj_cert_status = #{query.rljCertStatus}
+				</otherwise>
+			</choose>
+		</if>
+		<if test="query.subType != null and query.subType != ''">
+			AND s.subject_type = #{query.subType}
+		</if>
+		<if test="query.lockFlag != null and query.lockFlag != ''">
+			AND u.lock_flag = #{query.lockFlag}
+		</if>
+		<if test="query.role != null and query.role.size()>0">
+			AND r.role_id in (
+			<foreach collection="query.role" item="pid" index="index" separator=",">
+				#{pid}
+			</foreach>
+			)
+		</if>
+	</select>
+
+	<select id="selectByPhone" resultMap="userVoResultMap">
+		SELECT
+		*
+		FROM
+		sys_user  u
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		where
+		u.del_flag = 0
+		<if test="query.username != null and query.username !=''">
+			AND u.username = #{query.username}
+		</if>
+		<if test="query.role != null and query.role.size()>0">
+			AND r.role_id in (
+			<foreach collection="query.role" item="pid" index="index" separator=",">
+				#{pid}
+			</foreach>
+			)
+		</if>
+	</select>
+
+	<select id="getUserVoByUsername" resultMap="userVoResultMap">
+		SELECT
+			<include refid="userRoleSql"/>
+		FROM
+		sys_user  u
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+			WHERE u.username = #{username} and r.role_id not in (5,6)
+			and u.lock_flag=0
+	</select>
+
+	<select id="getUserVoById" resultMap="userVoResultMap">
+        SELECT
+	   		<include refid="userRoleDeptSql"/>
+        FROM
+            sys_user  u
+            LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+            LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+            LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+        WHERE
+           u.user_id = #{id}
+           and u.lock_flag=0
+    </select>
+
+	<select id="getByIdIgnore" resultMap="userResultMap">
+		SELECT * FROM sys_user  where user_id = #{id}
+	</select>
+
+	<select id="selectByUserId" resultMap="userVoResultMap">
+		SELECT
+		*
+		FROM
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		where
+		u.del_flag = 0
+		<if test="query.username != null and query.username !=''">
+			AND u.username like CONCAT('%',#{query.username},'%')
+		</if>
+		<if test="query.realname != null and query.realname !=''">
+			AND u.realname like CONCAT('%',#{query.realname},'%')
+		</if>
+		<if test="query.userId != null and query.userId != ''">
+			AND u.user_id = #{query.userId}
+		</if>
+		<if test="query.lockFlag != null and query.lockFlag != ''">
+			AND u.lock_flag = #{query.lockFlag}
+		</if>
+		<if test="query.role != null and query.role.size()>0">
+			AND r.role_id in (
+			<foreach collection="query.role" item="pid" index="index" separator=",">
+				#{pid}
+			</foreach>
+			)
+		</if>
+	</select>
+
+	<select id="selectUserByName" resultMap="userResultMap">
+		SELECT
+		*
+		FROM
+		sys_user
+		where
+		username = #{username}
+		and
+		dept_id = #{deptId}
+	</select>
+
+	<select id="selectUserById" resultMap="userResultMap">
+		SELECT
+		*
+		FROM
+		sys_user
+		where
+		dept_id = #{deptId}
+	</select>
+
+	<select id="getUserVosPage" resultMap="baseResultMap">
+		SELECT
+		distinct
+		u.user_id,
+		u.username,
+		u.password,
+		u.id_card_number,
+		u.user_type,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		 d.name  dept_name,
+		u.realname,
+		u.province,
+		u.city,
+		u.province_code,
+		u.city_code,
+		u.area,
+		u.address,
+		u.temp1,
+		u.temp2,
+		u.temp3,
+		u.temp4,
+		u.temp5,
+		u.w1,
+		u.plat_id,
+		u.drug_ent_id,
+		u.cert_status,
+		u.rlj_cert_status,
+		u.cert_remark,
+		u.bank_card_number
+		FROM
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		LEFT JOIN sys_dept_sub s ON s.dept_id = u.dept_id and s.enable_flag = '1'
+		<where>
+			u.del_flag = '0'
+			<if test="query.username != null and query.username != ''">
+				AND u.username LIKE CONCAT('%',#{query.username},'%')
+			</if>
+			<if test="query.realname != null and query.realname != ''">
+				AND u.realname LIKE CONCAT('%',#{query.realname},'%')
+			</if>
+			<if test="query.deptId != null and query.deptId != ''">
+				AND u.dept_id = #{query.deptId}
+			</if>
+			<if test="query.certStatus != null and query.certStatus != ''">
+				<choose>
+					<when test="query.certStatus == 10">
+						AND (u.cert_status = #{query.certStatus} OR u.cert_status IS NULL)
+					</when>
+					<otherwise>
+						AND u.cert_status = #{query.certStatus}
+					</otherwise>
+				</choose>
+			</if>
+			<if test="query.rljCertStatus != null and query.rljCertStatus != ''">
+				<choose>
+					<when test="query.rljCertStatus == 4">
+						AND (u.rlj_cert_status = #{query.rljCertStatus} OR u.rlj_cert_status IS NULL)
+					</when>
+					<otherwise>
+						AND u.rlj_cert_status = #{query.rljCertStatus}
+					</otherwise>
+				</choose>
+			</if>
+			<if test="query.subType != null and query.subType != ''">
+				AND s.subject_type = #{query.subType}
+			</if>
+			<if test="query.role != null and query.role.size()>0">
+				AND r.role_id in (
+				<foreach collection="query.role" item="pid" index="index" separator=",">
+					#{pid}
+				</foreach>
+				)
+			</if>
+
+			<if test="query.platId != null and query.platId != ''">
+				AND u.plat_id =#{query.platId}
+			</if>
+			<if test="query.lockFlag != null and query.lockFlag != ''">
+				AND u.lock_flag =#{query.lockFlag}
+			</if>
+			AND <![CDATA[ u.username<>'admin']]>
+		</where>
+		ORDER BY u.create_time DESC
+	</select>
+
+	<select id="getUserVosPageNoLock" resultMap="baseResultMap">
+		SELECT
+		distinct
+		u.user_id,
+		u.username,
+		u.password,
+		u.id_card_number,
+		u.user_type,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		d.name  dept_name,
+		u.realname,
+		u.province,
+		u.city,
+		u.area,
+		u.province_code,
+		u.city_code,
+		u.address,
+		u.temp1,
+		u.temp2,
+		u.temp3,
+		u.temp4,
+		u.temp5,
+		u.w1,
+		u.plat_id,
+		u.drug_ent_id,
+		u.cert_status,
+		u.rlj_cert_status,
+		u.cert_remark,
+		u.bank_card_number
+		FROM
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		<where>
+			u.del_flag = '0'
+			<if test="query.username != null and query.username != ''">
+				AND u.username LIKE CONCAT('%',#{query.username},'%')
+			</if>
+			<if test="query.realname != null and query.realname != ''">
+				AND u.realname LIKE CONCAT('%',#{query.realname},'%')
+			</if>
+			<if test="query.deptId != null and query.deptId != ''">
+				AND u.dept_id = #{query.deptId}
+			</if>
+			<if test="query.role != null and query.role.size()>0">
+				AND r.role_id in (
+				<foreach collection="query.role" item="pid" index="index" separator=",">
+					#{pid}
+				</foreach>
+				)
+			</if>
+
+			<if test="query.platId != null and query.platId != ''">
+				AND u.plat_id =#{query.platId}
+			</if>
+			AND <![CDATA[ u.username<>'admin']]>
+		</where>
+		ORDER BY u.create_time DESC
+	</select>
+
+
+	<select id="getUserVoByPlatId" resultMap="baseResultMap">
+		SELECT
+		distinct
+		u.user_id,
+		u.username,
+		u.password,
+		u.id_card_number,
+		u.user_type,
+		u.user_sign,
+		u.salt,
+		u.phone,
+		u.avatar,
+		u.wx_openid,
+		u.qq_openid,
+		u.dept_id,
+		u.create_time  ucreate_time,
+		u.update_time  uupdate_time,
+		u.del_flag,
+		u.lock_flag,
+		u.tenant_id,
+		d.name  dept_name,
+		u.realname,
+		u.province,
+		u.city,
+		u.province_code,
+		u.city_code,
+		u.area,
+		u.address,
+		u.temp1,
+		u.temp2,
+		u.temp3,
+		u.temp4,
+		u.temp5,
+		u.w1,
+		u.plat_id,
+		u.drug_ent_id,
+		u.cert_status,
+		u.rlj_cert_status,
+		u.cert_remark,
+		u.bank_card_number,
+		u.tax_helper_agreement_signature
+		FROM
+		sys_user  u
+		LEFT JOIN sys_dept  d ON d.dept_id = u.dept_id
+		LEFT JOIN sys_user_role  ur ON ur.user_id = u.user_id
+		LEFT JOIN sys_role  r ON r.role_id = ur.role_id
+		<where>
+			u.del_flag = '0'
+			and u.lock_flag=0
+			<if test="query.username != null and query.username != ''">
+				AND u.username LIKE CONCAT('%',#{query.username},'%')
+			</if>
+			<if test="query.realname != null and query.realname != ''">
+				AND u.realname LIKE CONCAT('%',#{query.realname},'%')
+			</if>
+			<if test="query.deptId != null and query.deptId != ''">
+				AND u.dept_id = #{query.deptId}
+			</if>
+			<if test="query.role != null and query.role.size()>0">
+				AND r.role_id in (
+				<foreach collection="query.role" item="pid" index="index" separator=",">
+					#{pid}
+				</foreach>
+				)
+			</if>
+
+			<if test="query.platId != null and query.platId != ''">
+				AND u.plat_id =#{query.platId}
+			</if>
+
+			<if test="query.drugEntId != null and query.drugEntId != ''">
+				AND u.drug_ent_id =#{query.drugEntId}
+			</if>
+
+		</where>
+		ORDER BY u.create_time DESC
+	</select>
+	<update id="updateByPrimaryKeySelective" parameterType="com.qunzhixinxi.hnqz.admin.api.entity.SysUser" >
+		update sys_user
+		<set >
+			<if test="delFlag != null" >
+				del_flag = #{delFlag,jdbcType=VARCHAR},
+			</if>
+		</set>
+		where user_id = #{userId,jdbcType=BIGINT}
+	</update>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmDaDrugEntMapper.xml

@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmDaDrugEntMapper">
+
+	<resultMap id="wmDaDrugEntMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEnt">
+		<id property="id" column="id"/>
+		<result property="entname" column="entname"/>
+		<result property="entcode" column="entcode"/>
+		<result property="temp1" column="temp1"/>
+		<result property="temp2" column="temp2"/>
+		<result property="temp3" column="temp3"/>
+		<result property="temp4" column="temp4"/>
+		<result property="deptId" column="dept_id"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="enableFlag" column="enable_flag"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="updateUser" column="update_user"/>
+		<result property="pgqx" column="pgqx"/>
+		<result property="management" column="management"/>
+	</resultMap>
+
+	<!-- 分页查询 -->
+	<select id="selectPage" resultMap="wmDaDrugEntMap">
+		SELECT
+			e.id,
+			e.entname,
+			e.entcode,
+			e.temp1,
+			e.temp2,
+			e.temp3,
+			e.temp4,
+			e.dept_id,
+			e.del_flag,
+			e.enable_flag,
+			e.tenant_id,
+			e.create_time,
+			e.create_user,
+			e.update_time,
+			e.update_user,
+			e.pgqx,
+			e.management,
+			e.subject_type,
+			d.dept_permissions
+		FROM wm_da_drug_ent e LEFT JOIN sys_dept d ON e.dept_id=d.dept_id
+		<where>
+			<if test="query.entname != null and query.entname != ''">
+				AND e.entname LIKE CONCAT('%', #{query.entname, jdbcType=VARCHAR}, '%')
+			</if>
+			<if test="query.entcode != null and query.entcode != ''">
+				AND e.entcode = #{query.entcode, jdbcType=VARCHAR}
+			</if>
+		</where>
+		ORDER BY e.create_time DESC
+	</select>
+
+	<select id="selectByDrugId" resultType="java.lang.Integer" parameterType="java.util.HashMap">
+		select o.entname,d.gsmc
+		from wm_relation r
+		left join  wm_da_drug_ent o on r.up_id=o.id
+		left join  wm_da_agent d on r.up_id=d.id
+		where r.up_id = #{upId,jdbcType=INTEGER}
+
+	</select>
+
+	<select id="selectEntNameByDrugId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+   select
+   id,dept_id,entname
+   from wm_da_drug_ent
+   where
+   id = #{id,jdbcType=VARCHAR}
+</select>
+
+	<select id="selectEntNameByDrugIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+
+			select d.id,d.entname,d.dept_id
+			from wm_da_drug_ent  d
+			left join  wm_relation r on r.up_id=d.id
+			left join  wm_da_agent o on r.down_id=o.id
+			where r.down_id = #{downId,jdbcType=INTEGER}
+			UNION
+			select id,gsmc,dept_id from wm_da_agent where id= #{Id,jdbcType=INTEGER}
+	</select>
+	<select id="selectByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+   select
+   *
+   from wm_da_drug_ent
+   where
+   dept_id = #{deptId,jdbcType=VARCHAR}
+</select>
+
+	<select id="selectByUserDeptId" resultType="java.util.HashMap" parameterType="java.lang.Integer">
+   select
+   id,entname as gsmc,entcode as zjNumber,management
+   from wm_da_drug_ent
+   where
+   dept_id = #{deptId,jdbcType=VARCHAR}
+</select>
+	<select id="selectDeptId" resultMap="wmDaDrugEntMap">
+		select
+		*
+		from wm_da_drug_ent
+		where
+		dept_id = #{deptId,jdbcType=INTEGER}
+	</select>
+	<select id="selectDeptId1" resultType="java.util.HashMap">
+		select
+		cast(id as char) as id,entname as name
+		from wm_da_drug_ent
+		where
+		dept_id = #{deptId,jdbcType=VARCHAR}
+	</select>
+	<select id="selectId" resultMap="wmDaDrugEntMap">
+		select
+		*
+		from wm_da_drug_ent
+		where
+		id = #{id,jdbcType=BIGINT}
+	</select>
+
+	<select id="selectEntNameByDeptId" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+   select
+   id,dept_id,entname
+   from wm_da_drug_ent
+   where
+   dept_id = #{deptId,jdbcType=INTEGER}
+</select>
+
+	<select id="selectEntNameByByDeptIds" resultMap="wmDaDrugEntMap" parameterType="java.util.HashMap">
+
+			select d.id,d.entname,d.dept_id
+			from wm_da_drug_ent  d
+			left join  wm_relation r on r.up_id=d.dept_id
+			left join  wm_da_agent o on r.down_id=o.dept_id
+			where r.down_id = #{downId,jdbcType=INTEGER}
+			UNION
+			select id,gsmc,dept_id from wm_da_agent where dept_id= #{deptId,jdbcType=VARCHAR}
+	</select>
+
+	<select id="getListByCsoDeptId" resultMap="wmDaDrugEntMap" >
+
+			SELECT DISTINCT
+				*
+			FROM
+				wm_da_drug_ent
+			WHERE
+				dept_id IN (
+					SELECT
+						up_id
+					FROM
+						wm_relation
+					WHERE
+						down_id = #{deptId,jdbcType=INTEGER}
+					UNION
+						SELECT
+							up_id
+						FROM
+							wm_relation
+						WHERE
+							down_id IN (
+								SELECT
+									up_id
+								FROM
+									wm_relation
+								WHERE
+									down_id = #{deptId,jdbcType=INTEGER}
+							)
+				)
+	</select>
+
+
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmReportMapper.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmReportMapper">
+
+	<resultMap id="wmReportMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmReport">
+		<id property="id" column="id"/>
+		<result property="reportNo" column="report_no"/>
+		<result property="drugEntId" column="drug_ent_id"/>
+		<result property="scoreId" column="score_id"/>
+		<result property="applyDrugEntId" column="apply_drug_ent_id"/>
+		<result property="packageScore" column="package_score"/>
+		<result property="taskNumber" column="task_number"/>
+		<result property="totalScore" column="total_score"/>
+		<result property="reportStatus" column="report_status"/>
+		<result property="createPeople" column="create_people"/>
+		<result property="createTime" column="create_time"/>
+		<result property="approvalPeople" column="approval_people"/>
+		<result property="approvalTime" column="approval_time"/>
+		<result property="updatePeople" column="update_people"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="export1" column="export1"/>
+		<result property="export2" column="export2"/>
+		<result property="export3" column="export3"/>
+		<result property="scorePackageName" column="score_package_name"/>
+
+	</resultMap>
+
+	<select id="getReportListPage" resultMap="wmReportMap">
+		select p.score_package_name,t.* from wm_report t
+		left join wm_score_package p on p.id=t.score_id
+		<if test="query.drugEntId != null and query.drugEntId !=''">
+			left join sys_dept d on t.drug_ent_id=d.dept_id
+		</if>
+		<if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
+			left join sys_dept d on t.apply_drug_ent_id=d.dept_id
+		</if>
+
+		where 1=1
+		and t.del_flag=0
+		<if test="queryScoreId != null and queryScoreId !=''">
+			AND p.score_id like CONCAT('%',#{queryScoreId},'%')
+		</if>
+		<if test="queryName != null and queryName !=''">
+			AND d.`name` like CONCAT('%',#{queryName},'%')
+		</if>
+		<if test="query.reportNo != null and query.reportNo !=''">
+			AND t.report_no like CONCAT('%',#{query.reportNo},'%')
+		</if>
+		<if test="query.reportStatus != null and query.reportStatus !=''">
+			AND t.report_status =#{query.reportStatus}
+		</if>
+		<if test="query.drugEntId != null and query.drugEntId !=''">
+			AND t.drug_ent_id =#{query.drugEntId}
+		</if>
+		<if test="query.applyDrugEntId != null and query.applyDrugEntId !=''">
+			AND t.apply_drug_ent_id =#{query.applyDrugEntId}
+		</if>
+		<if test="query.scorePackageName != null and query.scorePackageName !=''">
+			AND p.score_package_name like CONCAT('%',#{query.scorePackageName},'%')
+		</if>
+		order by t.create_time desc
+	</select>
+
+
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmScorePackageMapper.xml

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmScorePackageMapper">
+
+	<resultMap id="wmScorePackageMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage">
+		<id property="id" column="id"/>
+		<result property="taskRuleId" column="task_rule_id"/>
+		<result property="drugEntId" column="drug_ent_id"/>
+		<result property="scoreId" column="score_id"/>
+		<result property="scoreName" column="score_name"/>
+		<result property="relationScoreId" column="relation_score_id"/>
+		<result property="score" column="score"/>
+		<result property="packageStatus" column="package_status"/>
+		<result property="packageFinishStatus" column="package_finish_status"/>
+		<result property="packageAuditStatus" column="package_audit_status"/>
+		<result property="sendPackageDeptId" column="send_package_dept_id"/>
+		<result property="agentTypeId" column="agent_type_id"/>
+		<result property="level1Id" column="level1_id"/>
+		<result property="level2Id" column="level2_id"/>
+		<result property="zbId" column="zb_id"/>
+		<result property="xxdbId" column="xxdb_id"/>
+		<result property="typeid" column="typeid"/>
+		<result property="deptId" column="dept_id"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="enableFlag" column="enable_flag"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="settlementDate" column="settlement_date"/>
+		<result property="updateUser" column="update_user"/>
+		<result property="isConduct" column="is_conduct"/>
+		<result property="receiveDate" column="receive_date"/>
+		<result property="settleAmount" column="settle_amount"/>
+		<result property="discount" column="discount"/>
+		<result property="settleStatus" column="settle_status"/>
+		<result property="invoiceCategory" column="invoice_category"/>
+		<result property="remark" column="remark"/>
+		<result property="certStatus" column="cert_status"/>
+		<result property="belongDate" column="belong_date"/>
+		<result property="allocationDate" column="allocation_date"/>
+		<result property="payRate" column="pay_rate"/>
+		<result property="payScore" column="pay_score"/>
+		<result property="acceptSug" column="accept_sug"/>
+		<result property="finishRate" column="finish_rate"/>
+		<result property="ysh" column="ysh"/>
+		<result property="shtg" column="shtg"/>
+		<result property="shbtg" column="shbtg"/>
+		<result property="shtgnum" column="shtgnum"/>
+		<result property="shbtgnum" column="shbtgnum"/>
+		<result property="shtgtt" column="shtgtt"/>
+		<result property="shbtgtt" column="shbtgtt"/>
+		<result property="packageType1" column="package_type1"/>
+		<result property="description" column="description"/>
+		<result property="kfpjf" column="kfpjf"/>
+		<result property="relatedService" column="related_service"/>
+		<result property="scorePackageName" column="score_package_name"/>
+		<result property="endLabelDate" column="end_label_date"/>
+		<result property="packageIsConduct" column="package_is_conduct"/>
+		<result property="ruleId" column="rule_id"/>
+		<result property="packageFinishTime" column="package_finish_time"/>
+		<result property="packageType2" column="package_type2"/>
+		<result property="userNum" column="user_num"/>
+		<result property="taskNum" column="task_num"/>
+		<result property="packageUserScope" column="package_user_scope"/>
+		<result property="userScore" column="user_score"/>
+		<result property="enableType" column="enable_type"/>
+		<result property="isReceive" column="is_receive"/>
+		<result property="settleFlag" column="settle_flag"/>
+		<result property="oldPackage" column="old_package"/>
+		<result property="scorePackageStatus" column="score_package_status"/>
+		<result property="subType" column="sub_type"/>
+		<result property="drugProducerList" column="drug_producer"/>
+
+	</resultMap>
+
+
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmTaskContentConfigMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmTaskContentConfigMapper">
+
+  <resultMap id="wmTaskContentConfigMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContentConfig">
+                  <id property="id" column="id"/>
+	  					<result property="baseTypeId" column="base_type_id"/>
+	 				    <result property="taskTypeId" column="task_type_id"/>
+                        <result property="taskFiledKey" column="task_filed_key"/>
+                        <result property="taskFiledValue" column="task_filed_value"/>
+                        <result property="taskFiledType" column="task_filed_type"/>
+                        <result property="taskFiledMinsize" column="task_filed_minsize"/>
+                        <result property="taskFiledMaxsize" column="task_filed_maxsize"/>
+                        <result property="taskFiledAlert" column="task_filed_alert"/>
+                        <result property="dictUrl" column="dict_url"/>
+                        <result property="dictGroupName" column="dict_group_name"/>
+                        <result property="isMustfill" column="is_mustfill"/>
+                        <result property="deptId" column="dept_id"/>
+                        <result property="delFlag" column="del_flag"/>
+                        <result property="enableFlag" column="enable_flag"/>
+                        <result property="tenantId" column="tenant_id"/>
+                        <result property="createTime" column="create_time"/>
+                        <result property="createUser" column="create_user"/>
+                        <result property="updateTime" column="update_time"/>
+                        <result property="updateUser" column="update_user"/>
+            </resultMap>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmTaskContentMapper.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmTaskContentMapper">
+
+  <resultMap id="wmTaskContentMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent">
+                  <id property="id" column="id"/>
+                        <result property="temp1" column="temp1"/>
+                        <result property="temp2" column="temp2"/>
+                        <result property="temp3" column="temp3"/>
+                        <result property="temp4" column="temp4"/>
+                        <result property="temp5" column="temp5"/>
+                        <result property="temp6" column="temp6"/>
+                        <result property="temp7" column="temp7"/>
+                        <result property="temp8" column="temp8"/>
+                        <result property="temp9" column="temp9"/>
+                        <result property="temp10" column="temp10"/>
+                        <result property="temp11" column="temp11"/>
+                        <result property="temp12" column="temp12"/>
+                        <result property="temp13" column="temp13"/>
+                        <result property="temp14" column="temp14"/>
+                        <result property="temp15" column="temp15"/>
+                        <result property="temp16" column="temp16"/>
+                        <result property="temp17" column="temp17"/>
+                        <result property="temp18" column="temp18"/>
+                        <result property="temp19" column="temp19"/>
+                        <result property="temp20" column="temp20"/>
+                        <result property="temp21" column="temp21"/>
+                        <result property="temp22" column="temp22"/>
+                        <result property="temp23" column="temp23"/>
+                        <result property="temp24" column="temp24"/>
+                        <result property="temp25" column="temp25"/>
+                        <result property="temp26" column="temp26"/>
+                        <result property="temp28" column="temp28"/>
+                        <result property="temp29" column="temp29"/>
+                        <result property="temp30" column="temp30"/>
+                        <result property="temp31" column="temp31"/>
+                        <result property="temp32" column="temp32"/>
+            </resultMap>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -0,0 +1,1250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmTaskMapper">
+
+	<resultMap id="wmTaskMap" type="com.qunzhixinxi.hnqz.admin.api.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"/>
+		<result property="scorePackageDrugId" column="score_package_drug_id"/>
+		<result property="scorePackageId" column="score_package_id"/>
+		<result property="scoreDrugId" column="score_drug_id"/>
+		<result property="lookintoDate" column="lookinto_date"/>
+		<result property="province" column="province"/>
+		<result property="city" column="city"/>
+		<result property="area" column="area"/>
+		<result property="address" column="address"/>
+		<result property="lookintoTypeId" column="lookinto_type_id"/>
+		<result property="taskContentId" column="task_content_id"/>
+		<result property="taskStatus" column="task_status"/>
+		<result property="submitStatus" column="submit_status"/>
+		<result property="taskUserId" column="task_user_id"/>
+		<result property="taskUserType" column="task_user_type"/>
+		<result property="drugEntId" column="drug_ent_id"/>
+		<result property="deptId" column="dept_id"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="enableFlag" column="enable_flag"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="updateUser" column="update_user"/>
+		<result property="shareImgUrl" column="share_img_url"/>
+		<result property="platAuditStatus" column="plat_audit_status"/>
+		<result property="scorePackageLevel1Id" column="score_package_level1_id"/>
+		<result property="taskInfoImg" column="task_info_img"/>
+		<result property="compareResult" column="compare_result"/>
+		<result property="approvalOpinion" column="approval_opinion"/>
+		<result property="approvalInfo" column="approval_info"/>
+		<result property="realFlag" column="real_flag"/>
+		<result property="reportOneId" column="report_one_id"/>
+		<result property="reportOneApprovalStatus" column="report_one_approval_status"/>
+		<result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
+		<result property="reportOneApprovalInfo" column="report_one_approval_info"/>
+		<result property="reportSecondId" column="report_second_id"/>
+		<result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
+		<result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
+		<result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
+		<result property="reportDrugId" column="report_drug_id"/>
+		<result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
+		<result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
+		<result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
+		<result property="taskStatusInfo" column="task_status_info"/>
+		<result property="taskFrom" column="task_from"/>
+
+	</resultMap>
+
+	<resultMap id="wmTaskWithContentMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTask">
+		<id property="id" column="id"/>
+		<result property="taskTypeId" column="task_type_id"/>
+		<result property="taskRuleId" column="task_rule_id"/>
+		<result property="score" column="score"/>
+		<result property="scorePackageDrugId" column="score_package_drug_id"/>
+		<result property="scorePackageId" column="score_package_id"/>
+		<result property="scoreDrugId" column="score_drug_id"/>
+		<result property="lookintoDate" column="lookinto_date"/>
+		<result property="province" column="province"/>
+		<result property="city" column="city"/>
+		<result property="area" column="area"/>
+		<result property="address" column="address"/>
+		<result property="lookintoTypeId" column="lookinto_type_id"/>
+		<result property="taskContentId" column="task_content_id"/>
+		<result property="taskStatus" column="task_status"/>
+		<result property="submitStatus" column="submit_status"/>
+		<result property="taskUserId" column="task_user_id"/>
+		<result property="taskUserType" column="task_user_type"/>
+		<result property="drugEntId" column="drug_ent_id"/>
+		<result property="deptId" column="dept_id"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="enableFlag" column="enable_flag"/>
+		<result property="tenantId" column="tenant_id"/>
+		<result property="createTime" column="create_time"/>
+		<result property="createUser" column="create_user"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="updateUser" column="update_user"/>
+		<result property="shareImgUrl" column="share_img_url"/>
+		<result property="platAuditStatus" column="plat_audit_status"/>
+		<result property="scorePackageLevel1Id" column="score_package_level1_id"/>
+		<result property="taskInfoImg" column="task_info_img"/>
+		<result property="compareResult" column="compare_result"/>
+		<result property="approvalOpinion" column="approval_opinion"/>
+		<result property="approvalInfo" column="approval_info"/>
+		<result property="realFlag" column="real_flag"/>
+		<result property="reportOneId" column="report_one_id"/>
+		<result property="reportOneApprovalStatus" column="report_one_approval_status"/>
+		<result property="reportOneApprovalOpinion" column="report_one_approval_opinion"/>
+		<result property="reportOneApprovalInfo" column="report_one_approval_info"/>
+		<result property="reportSecondId" column="report_second_id"/>
+		<result property="reportSecondApprovalStatus" column="report_second_approval_status"/>
+		<result property="reportSecondApprovalOpinion" column="report_second_approval_opinion"/>
+		<result property="reportSecondApprovalInfo" column="report_second_approval_info"/>
+		<result property="reportDrugId" column="report_drug_id"/>
+		<result property="reportDrugApprovalStatus" column="report_drug_approval_status"/>
+		<result property="reportDrugApprovalOpinion" column="report_drug_approval_opinion"/>
+		<result property="reportDrugApprovalInfo" column="report_drug_approval_info"/>
+		<result property="taskStatusInfo" column="task_status_info"/>
+		<result property="taskFrom" column="task_from"/>
+		<association property="wmTaskContent" javaType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent">
+			<result property="temp1" column="temp1"/>
+			<result property="temp2" column="temp2"/>
+			<result property="temp3" column="temp3"/>
+			<result property="temp4" column="temp4"/>
+			<result property="temp5" column="temp5"/>
+			<result property="temp6" column="temp6"/>
+			<result property="temp7" column="temp7"/>
+			<result property="temp8" column="temp8"/>
+			<result property="temp9" column="temp9"/>
+			<result property="temp10" column="temp10"/>
+			<result property="temp11" column="temp11"/>
+			<result property="temp12" column="temp12"/>
+			<result property="temp13" column="temp13"/>
+			<result property="temp14" column="temp14"/>
+			<result property="temp15" column="temp15"/>
+			<result property="temp16" column="temp16"/>
+			<result property="temp17" column="temp17"/>
+			<result property="temp18" column="temp18"/>
+			<result property="temp19" column="temp19"/>
+			<result property="temp20" column="temp20"/>
+			<result property="temp21" column="temp21"/>
+			<result property="temp22" column="temp22"/>
+			<result property="temp23" column="temp23"/>
+			<result property="temp24" column="temp24"/>
+			<result property="temp25" column="temp25"/>
+			<result property="temp26" column="temp26"/>
+			<result property="temp28" column="temp28"/>
+			<result property="temp29" column="temp29"/>
+			<result property="temp30" column="temp30"/>
+			<result property="temp31" column="temp31"/>
+			<result property="temp32" column="temp32"/>
+		</association>
+	</resultMap>
+
+	<select id="selectListByExtEnt" resultMap="wmTaskMap">
+		SELECT
+		wm_task.*
+		FROM
+		wm_task,
+		wm_task_content
+		<where>
+			wm_task.task_content_id = wm_task_content.id
+			and wm_task.del_flag='0' and wm_task.enable_flag='0'
+
+
+			<if test="query.extIds != null and query.extIds.size()>0">
+				AND wm_task.task_content_id in (
+
+				<foreach collection="query.extIds" item="pid" index="index">
+					select id from wm_task_content where wm_task_content.temp1  LIKE CONCAT('%',#{pid},'%')
+					<if test="query.extIds.size()>1">
+						<if test="query.extIds.size()>index-1">
+							union
+						</if>
+					</if>
+				</foreach>
+
+				)
+			</if>
+
+			<if test="query.createTime != null and query.createTime != ''">
+				AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
+			</if>
+
+			<if test="query.updateTime != null and query.updateTime != ''">
+				AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
+			</if>
+
+			<if test="query.drugEntId != null and query.drugEntId != ''">
+				AND <![CDATA[ wm_task.drug_ent_id=#{query.drugEntId}]]>
+			</if>
+		</where>
+	</select>
+
+
+	<select id="selectListByExtEntNoPage" resultMap="wmTaskMap">
+		SELECT
+		wm_task.*
+		FROM
+		wm_task,
+		wm_task_content
+		<where>
+			wm_task.task_content_id = wm_task_content.id
+			and wm_task.del_flag='0' and wm_task.enable_flag='0'
+
+
+			<if test="query.extIds != null and query.extIds.size()>0">
+				AND wm_task.task_content_id in (
+
+				<foreach collection="query.extIds" item="pid" index="index">
+					select id from wm_task_content where wm_task_content.temp1  LIKE CONCAT('%',#{pid},'%')
+					<if test="query.extIds.size()>1">
+						<if test="query.extIds.size()>index-1">
+							union
+						</if>
+					</if>
+				</foreach>
+
+				)
+			</if>
+
+
+
+			<if test="query.createTime != null and query.createTime != ''">
+				AND <![CDATA[ wm_task.create_time>= #{query.createTime}]]>
+			</if>
+
+			<if test="query.updateTime != null and query.updateTime != ''">
+				AND <![CDATA[ wm_task.update_time<=#{query.updateTime}]]>
+			</if>
+
+			<if test="query.drugEntId != null and query.drugEntId != ''">
+				AND <![CDATA[ wm_task.drug_ent_id<=#{query.drugEntId}]]>
+			</if>
+		</where>
+	</select>
+
+
+	<select id="getTaskListByPackageIds" resultType="java.util.HashMap">
+		select * from (SELECT
+		package_id,
+		score_name,
+		base_id,
+		sum(score) score,
+		count(1) score_count,
+		realname,
+		dept_name,
+		DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		group by
+		package_id,
+		score_name,
+		base_id,
+		realname,
+		dept_name
+		) a ORDER BY  a.dept_name,a.score_name,a.realname
+	</select>
+
+	<select id="getTaskListByPackageIdsAndUser" resultType="java.util.HashMap">
+		SELECT
+		*
+		FROM
+		(
+		SELECT
+		score_name,
+		sum( score ) score,
+		count( 1 ) score_count,
+		realname,
+		dept_name
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		GROUP BY
+		score_name,
+		dept_name,
+		realname
+		) A
+		ORDER BY
+		A.dept_name,
+		a.score_name,
+		a.realname
+	</select>
+
+
+	<select id="getTaskListByPackageIdsCount" resultType="java.util.HashMap">
+		SELECT
+		base_id taskTypeName,
+		sum( score ) taskSum,
+		count( 1 ) taskCount
+		FROM
+		wm_zb_count
+		WHERE
+		package_id IN (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+
+		GROUP BY
+		base_id
+	</select>
+
+	<select id="getTaskListByPackageIdsZd" resultType="java.util.HashMap">
+		SELECT
+		DATE_FORMAT(min( create_time ),'%Y-%m-%d') mindate,
+		DATE_FORMAT(max( create_time ),'%Y-%m-%d') maxdate,
+		GROUP_CONCAT( DISTINCT realname ) realname,
+		sum( score ) sumscore,
+		GROUP_CONCAT( DISTINCT task_rule_id ) task_rule_id
+		FROM
+		wm_zb_count
+		where package_id IN (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		or
+		package_id IN (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+	</select>
+
+
+
+
+
+	<select id="getTaskListByPackageIdsReturnWmtaskInfo" resultMap="wmTaskMap">
+		SELECT
+		*
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+
+		order by task_user_id asc,create_time asc
+
+	</select>
+
+	<select id="selectZbCount" resultType="java.util.HashMap">
+		select * from (select * from (SELECT
+		package_id,
+		score_name,
+		send_package_dept_id,
+		dept_id,
+		sum(score) score,
+		count(1) score_count,
+		realname,
+		dept_name,
+		DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
+		DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		group by
+		package_id,
+		score_name,
+		send_package_dept_id,
+		dept_id,
+		package_score,
+		realname,
+		dept_name
+		) a ORDER BY  a.dept_name,a.score_name,a.realname ) b
+	</select>
+
+	<select id="selectByWmTaskOne" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_one_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+	</select>
+	<select id="selectByWmTaskSecond" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_second_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+	</select>
+	<select id="selectByWmTaskDrug" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_drug_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+	</select>
+
+	<select id="selectByWmTaskId" resultMap="wmTaskMap">
+		select
+		*
+		from wm_task
+		where
+		score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+		and
+		del_flag =0
+   		and
+   		enable_flag=0
+	</select>
+
+	<select id="selectByReportOneApprovalStatus" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_one_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+		and
+		report_one_approval_status = #{query.reportOneApprovalStatus,jdbcType=VARCHAR}
+		group by dept_id, report_one_approval_status, score_package_id
+	</select>
+
+	<select id="selectByReportSecondApprovalStatus" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_second_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+		and
+		report_second_approval_status = #{query.reportSecondApprovalStatus,jdbcType=VARCHAR}
+		group by dept_id, report_second_approval_status, score_package_id
+	</select>
+
+	<select id="selectByReportDrugApprovalStatus" resultType="java.util.HashMap">
+		select
+		sum(score) score,
+		count(1) score_count,
+		dept_id,
+		report_drug_approval_status,
+		score_package_id
+		from wm_task
+		where  score_package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+		and
+		report_drug_approval_status = #{query.reportDrugApprovalStatus,jdbcType=VARCHAR}
+		group by dept_id, report_drug_approval_status, score_package_id
+	</select>
+	<select id="selectById" resultMap="wmTaskMap">
+		select
+		*
+		from wm_task
+		where
+		id = #{query.Id,jdbcType=BIGINT}
+	</select>
+
+	<select id="selectByRealFlag" resultMap="wmTaskMap">
+		select
+		*
+		from wm_task
+		where
+		id = #{Id,jdbcType=BIGINT}
+		and real_flag = 0
+	</select>
+
+	<select id="selectWmTaskById" resultMap="wmTaskMap">
+		select
+		*
+		from wm_task
+		where
+		id = #{query.id,jdbcType=BIGINT}
+		and
+		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+	</select>
+	<select id="selectListByIds" resultMap="wmTaskMap">
+   		SELECT
+   		*
+   		FROM
+   		wm_task
+   		where
+   		score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+   		and real_flag = 0
+</select>
+	<select id="selectListByScorePackageId" resultMap="wmTaskMap">
+   		SELECT
+   		*
+   		FROM
+   		wm_task
+   		where
+   		score_package_id = #{query.scorePackageId,jdbcType=VARCHAR}
+   		and
+   		task_status = #{query.taskStatus,jdbcType=VARCHAR}
+   		and
+   		del_flag =0
+   		and
+   		enable_flag=0
+</select>
+	<select id="getTaskListByPackageIdsForJs" resultType="java.util.HashMap">
+		select * from (select * from (SELECT
+		package_id,
+		score_name,
+		package_score,
+		sum(score) score,
+		count(1) score_count,
+		realname,
+		dept_name,
+		DATE_FORMAT(max( create_time ),'%Y-%m-%d') create_time,
+		DATE_FORMAT(max( pcreate_time ),'%Y-%m-%d') pcreate_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		group by
+		package_id,
+		score_name,
+		package_score,
+		realname,
+		dept_name
+		) a ORDER BY  a.dept_name,a.score_name,a.realname ) b
+
+		union
+
+		SELECT
+		"" package_id,
+		"" score_name,
+		package_score,
+		sum(score) score,
+		count(1) score_count,
+		"合计" realname,
+		"" dept_name,
+		"" create_time,
+		"" pcreate_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+	</select>
+
+	<select id="getTaskListByPackageIdsForJsUser" resultType="java.util.HashMap">
+		select * from (SELECT
+		*
+		FROM
+		(
+		SELECT
+		sum( score ) score,
+		count( 1 ) score_count,
+		user_id,
+		realname,
+		phone,
+		dept_name,
+		DATE_FORMAT( max( create_time ), '%Y-%m-%d' ) create_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		GROUP BY
+		user_id,
+		realname,
+		phone,
+		dept_name
+		) a
+		ORDER BY
+		a.dept_name,
+		a.realname) bb
+		UNION
+		SELECT
+		sum( score ) score,
+		count( 1 ) score_count,
+		"" user_id,
+		"合计" realname,
+		"" phone,
+		""dept_name,
+		"" create_time
+		FROM
+		wm_zb_count
+		where  package_id in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+	</select>
+
+
+
+
+	<select id="getH5PackageList" resultType="java.util.HashMap">
+		SELECT
+		p.id id ,
+		p.score_package_name as score_name,u.realname,
+	   	p.package_type1 as type1,
+		u.phone,
+		u.user_id as userId,
+		sum( ifnull(t.score, 0) ) taskSum,
+		count( 1 ) taskCount
+		FROM
+		wm_task t
+		left join wm_score_package p on p.id=t.score_package_id
+		left join sys_user u on u.user_id=t.task_user_id
+		where  p.score_package_name in (
+		<foreach collection="query.extIds" item="pid" index="index" separator=",">
+			#{pid}
+		</foreach>
+		)
+		and t.task_status=3
+		and t.del_flag=0
+		and t.enable_flag=0
+		GROUP BY
+		p.id,p.score_package_name,u.realname,u.phone
+	</select>
+
+
+
+	<select id="getH5TaskList" resultType="java.util.HashMap">
+		SELECT
+		t.id id ,
+		p.score_package_name  as score_name,
+		p.package_type2 as `type`,
+		p.package_type1 as type1,
+		u.realname,
+		e.task_type_name,
+		DATE_FORMAT( t.create_time, '%Y-%m-%d' ) create_time,
+		ifnull(t.score, 0) taskSum,
+		ifnull(t.score, 0) taskCount
+		FROM
+		wm_task t
+		left join wm_score_package p on p.id=t.score_package_id
+		left join sys_user u on u.user_id=t.task_user_id
+		left join wm_task_type e on e.id=t.task_type_id
+		where  p.id = #{query.scorePackageId}
+		and t.task_status=3
+		and t.task_user_id= #{query.taskUserId}
+		and t.del_flag=0
+		and t.enable_flag=0
+		ORDER BY
+		t.create_time DESC
+
+</select>
+
+
+	<select id="getTaskListByIds" resultType="java.util.HashMap">
+		select * from (
+		SELECT
+		p.id AS package_id,
+		p.score_package_name AS score_name,
+		c.realname AS realname,
+		d.name AS dept_name,
+		m.label AS base_id,
+		sum(t.score) score,
+		count(1) score_count,
+		DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+		JOIN wm_task_type b
+		left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+		JOIN sys_user c
+		JOIN sys_dept d
+		WHERE b.id = t.task_type_id
+		AND c.user_id = t.task_user_id
+		AND c.dept_id = d.dept_id
+		and t.task_status=3
+		and t.enable_flag=0
+		and t.del_flag=0
+		and t.real_flag = '0'
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		group by
+		p.id,
+		p.score_package_name,
+		m.label,
+		c.realname,
+		d.name
+		)a ORDER BY a.dept_name,a.score_name,a.realname
+	</select>
+
+	<select id="getTaskListByIdsOld" resultType="java.util.HashMap">
+		select * from (
+		SELECT
+		p.id AS package_id,
+		p.score_package_name AS score_name,
+		c.realname AS realname,
+		d.name AS dept_name,
+		m.label AS base_id,
+		sum(t.score) score,
+		count(1) score_count,
+		DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_drug_id = p.id
+		JOIN wm_task_type b
+		left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+		JOIN sys_user c
+		JOIN sys_dept d
+		WHERE b.id = t.task_type_id
+		AND c.user_id = t.task_user_id
+		AND c.dept_id = d.dept_id
+	  	<if test="query.taskStatus != null and query.taskStatus != ''">
+		    and t.task_status = #{query.taskStatus}
+	  	</if>
+		<if test="query.taskStatus == null or query.taskStatus == ''">
+			and t.task_status = 3
+		</if>
+		and t.enable_flag=0
+		and t.del_flag=0
+		and t.real_flag = '0'
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		group by
+		p.id,
+		p.score_package_name,
+		m.label,
+		c.realname,
+		d.name
+		)a ORDER BY a.dept_name,a.score_name,a.realname
+	</select>
+
+	<select id="getTaskListByIdsJs" resultType="java.util.HashMap">
+		select * from (
+		SELECT
+		p.id AS package_id,
+		p.score_package_name AS score_name,
+		c.realname AS realname,
+		d.name AS dept_name,
+		m.label AS base_id,
+		sum(t.score) score,
+		count(1) score_count,
+		DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') create_time
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+		JOIN wm_task_type b
+		left join sys_dict_item m on m.type='score_task_type' and b.parent_id=m.`value`
+		JOIN sys_user c
+		JOIN sys_dept d
+		WHERE b.id = t.task_type_id
+		AND c.user_id = t.task_user_id
+		and d.dept_id=t.dept_id
+		<if test="query.taskStatus != null and query.taskStatus != ''">
+			and t.task_status = #{query.taskStatus}
+		</if>
+		<if test="query.taskStatus == null or query.taskStatus == ''">
+			and t.task_status = 3
+		</if>
+		and t.enable_flag=0
+		and t.del_flag=0
+		and p.package_type2=2
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		group by
+		p.id,
+		p.score_package_name,
+		m.label,
+		c.realname,
+		d.name
+		)a ORDER BY a.dept_name,a.score_name,a.realname
+	</select>
+
+
+	<select id="getTaskListByIdsReturnWmtaskInfo" resultMap="wmTaskMap">
+		SELECT
+		t.id AS id,
+		t.task_number,
+		t.task_rule_id AS task_rule_id,
+		t.score AS score,
+		t.score_package_drug_id AS score_package_drug_id,
+		t.score_package_level1_id AS score_package_level1_id,
+		t.score_package_id AS score_package_id,
+		t.task_type_id AS task_type_id,
+		t.lookinto_date AS lookinto_date,
+		t.province AS province,
+		t.city AS city,
+		t.area AS area,
+		t.address AS address,
+		t.lookinto_type_id AS lookinto_type_id,
+		t.task_content_id AS task_content_id,
+		t.task_status AS task_status,
+		t.task_user_id AS task_user_id,
+		t.task_user_type AS task_user_type,
+		t.drug_ent_id AS drug_ent_id,
+		t.dept_id AS dept_id,
+		t.del_flag AS del_flag,
+		t.enable_flag AS enable_flag,
+		t.tenant_id AS tenant_id,
+		t.lookinto_date AS create_time,
+		t.create_user AS create_user,
+		t.update_time AS update_time,
+		t.update_user AS update_user,
+		t.submit_status AS submit_status,
+		t.share_img_url AS share_img_url,
+		t.plat_audit_status AS plat_audit_status,
+		t.ext_ids AS ext_ids,
+		t.task_info_img AS task_info_img
+		FROM wm_task t
+		where 1=1
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		order by t.task_user_id asc,t.create_time asc
+	</select>
+
+	<select id="getTaskListByIdsCount" resultType="java.util.HashMap">
+		SELECT
+		m.label AS taskTypeName,
+		sum( t.score ) taskSum,
+		count( 1 ) taskCount
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+		JOIN wm_task_type b
+		left join sys_dict_item m on m.type='score_task_type' and m.`value`=b.parent_id
+		WHERE b.id = t.task_type_id
+		<if test="query.taskStatus != null and query.taskStatus != ''">
+			and t.task_status = #{query.taskStatus}
+		</if>
+		<if test="query.taskStatus == null or query.taskStatus == ''">
+			and t.task_status = 3
+		</if>
+		and t.enable_flag=0
+		and t.del_flag=0
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		GROUP BY
+		m.label
+	</select>
+
+	<select id="getTaskListByIdsZd" resultType="java.util.HashMap">
+		SELECT
+		DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
+		DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
+		GROUP_CONCAT( DISTINCT c.realname ) realname,
+		sum( t.score ) sumscore,
+		GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+		JOIN wm_task_type b
+		JOIN sys_user c
+		JOIN sys_dept d
+		WHERE b.id = t.task_type_id
+		AND c.user_id = t.task_user_id
+		AND c.dept_id = d.dept_id
+		<if test="query.taskStatus != null and query.taskStatus != ''">
+			and t.task_status = #{query.taskStatus}
+		</if>
+		<if test="query.taskStatus == null or query.taskStatus == ''">
+			and t.task_status = 3
+		</if>
+		and t.enable_flag=0
+		and t.del_flag=0
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		ORDER BY
+		t.task_rule_id,
+		t.task_user_id,
+		t.lookinto_date
+
+	</select>
+
+	<select id="getTaskListByIdsZdJs" resultType="java.util.HashMap">
+		SELECT
+		DATE_FORMAT(min( t.lookinto_date ),'%Y-%m-%d') mindate,
+		DATE_FORMAT(max( t.lookinto_date ),'%Y-%m-%d') maxdate,
+		GROUP_CONCAT( DISTINCT c.realname ) realname,
+		sum( t.score ) sumscore,
+		GROUP_CONCAT( DISTINCT t.task_rule_id ) task_rule_id
+		FROM wm_task t
+		LEFT JOIN wm_score_package p ON t.score_package_id = p.id
+		JOIN wm_task_type b
+		JOIN sys_user c
+		JOIN sys_dept d
+		WHERE b.id = t.task_type_id
+		AND c.user_id = t.task_user_id
+		AND t.dept_id = d.dept_id
+		<if test="query.taskStatus != null and query.taskStatus != ''">
+			and t.task_status = #{query.taskStatus}
+		</if>
+		<if test="query.taskStatus == null or query.taskStatus == ''">
+			and t.task_status = 3
+		</if>
+		and t.enable_flag=0
+		and t.del_flag=0
+		and p.package_type2=2
+		<if test="query.id!=null and query.id!=''">
+			AND t.id in(${query.id})
+		</if>
+		ORDER BY
+		t.task_rule_id,
+		t.task_user_id,
+		t.lookinto_date
+
+	</select>
+
+	<select id="getWmTaskList" resultMap="wmTaskMap">
+		SELECT
+		t.id AS id,
+		t.task_rule_id AS task_rule_id,
+		t.score AS score,
+		p2.id AS score_package_drug_id,
+		p1.id AS score_package_level1_id,
+		p.score_package_name AS score_package_id,
+		t.task_type_id AS task_type_id,
+		t.lookinto_date AS lookinto_date,
+		t.province AS province,
+		t.city AS city,
+		t.area AS area,
+		t.address AS address,
+		t.lookinto_type_id AS lookinto_type_id,
+		t.task_content_id AS task_content_id,
+		t.task_status AS task_status,
+		u.realname AS task_user_id,
+		t.task_user_type AS task_user_type,
+		t.drug_ent_id AS drug_ent_id,
+		d.`name` AS dept_id,
+		t.del_flag AS del_flag,
+		t.enable_flag AS enable_flag,
+		t.tenant_id AS tenant_id,
+		t.lookinto_date AS create_time,
+		t.create_user AS create_user,
+		t.update_time AS update_time,
+		t.update_user AS update_user,
+		t.submit_status AS submit_status,
+		t.share_img_url AS share_img_url,
+		t.plat_audit_status AS plat_audit_status,
+		t.task_info_img AS task_info_img
+		FROM wm_task t
+		left join sys_user u on  u.user_id=t.task_user_id
+		left join sys_dept d on d.dept_id=t.dept_id
+		left join wm_score_package p on p.id=t.score_package_id
+		left join wm_score_package p1 on p1.id=t.score_package_level1_id
+		left join wm_score_package p2 on p1.id=t.score_package_drug_id
+		where t.del_flag=0
+		and t.real_flag=0
+		and t.task_status !='1'
+		<if test="query.scorePackageDrugId!=null and query.scorePackageDrugId!=''">
+			and t.score_package_drug_id = #{query.scorePackageDrugId}
+		</if>
+		<if test="query.scorePackageLevel1Id!=null and query.scorePackageLevel1Id!=''">
+			and t.score_package_level1_id = #{query.scorePackageLevel1Id}
+		</if>
+		<if test="query.scorePackageId!=null and query.scorePackageId!=''">
+			and  t.score_package_id = #{query.scorePackageId}
+		</if>
+		<if test="query.id!=null and query.id!=''">
+			and  t.id = #{query.id}
+		</if>
+		<if test="query.taskStatus!=null and query.taskStatus!=''">
+			and  t.task_status = #{query.taskStatus}
+		</if>
+		<if test="query.taskUserId!=null and query.taskUserId!=''">
+			and  t.task_user_id = #{query.taskUserId}
+		</if>
+		order by t.lookinto_date
+
+	</select>
+
+
+	<select id="selectByTask" resultMap="wmTaskMap">
+		select t.* FROM wm_task t
+		where t.del_flag=0
+		<if test="query.id!=null and query.id!=''">
+			and  t.id = #{query.id}
+		</if>
+		<if test="query.scorePackageId!=null and query.scorePackageId!=''">
+			and  t.score_package_id = #{query.scorePackageId}
+		</if>
+		<if test="query.taskUserId!=null and query.taskUserId!=''">
+			and  t.task_user_id = #{query.taskUserId}
+		</if>
+		<if test="query.enableFlag!=null and query.enableFlag!=''">
+			and  t.enable_flag in (${query.enableFlag})
+		</if>
+
+
+	</select>
+
+	<select id="PackageIsFinishByTask" resultType="java.util.HashMap">
+	SELECT
+	tt.*
+FROM
+	(
+	SELECT
+		b.num,
+		a.task_num,
+		b.scoreSum,
+		a.user_score,
+	CASE
+
+			WHEN b.package_type1 = '1' THEN
+			b.user_score - b.scoreSum
+			WHEN (b.package_type1 = '2' or b.package_type1 = '3') THEN
+			b.task_num - b.num ELSE '1'
+		END AS isFinish,
+		a.id
+	FROM
+		wm_score_package_status a
+		LEFT JOIN (
+		SELECT
+			s.id,
+			p.package_type1,
+			count( t.id ) AS num,
+			sum( t.score ) AS scoreSum ,
+			case when s.user_score is null then p.score else s.user_score end as user_score,
+			case when s.task_num is null then p.task_num else s.task_num end as task_num
+		FROM
+			wm_score_package_status s
+			LEFT JOIN wm_score_package p ON s.package_id = p.id
+			LEFT JOIN wm_task t ON t.score_package_id = p.id
+			AND s.user_id = t.task_user_id
+		WHERE
+			s.del_flag = 0
+			AND s.enable_flag = 0
+			AND s.`status` != 3
+			AND p.del_flag = 0
+			AND t.del_flag = 0
+			AND t.task_status = 3
+			AND p.id = #{query.scorePackageId}
+		GROUP BY
+			s.id,
+			p.package_type1
+		) b ON a.id = b.id
+	WHERE
+		a.del_flag = 0
+		AND a.`status` != 3
+		AND a.enable_flag = 0
+	AND a.package_id = #{query.scorePackageId}
+	) tt
+	</select>
+
+	<select id="getMaxCreateTime" resultType="java.util.HashMap">
+	select max(t.lookinto_date) as MaxTime from wm_task t
+	where 1=1
+	<if test="query.id!=null and query.id!=''">
+		AND t.id in(${query.id})
+	</if>
+	</select>
+
+	<select id="selectListByWmTask" resultMap="wmTaskMap">
+	select * from wm_task where score_package_id
+	in (
+	select id from wm_score_package where id = #{query.id}
+	union all
+	select id from wm_score_package where relation_score_id = #{query.id}
+	union all
+	select id from wm_score_package where relation_score_id in (select id from wm_score_package where relation_score_id = #{query.id})
+	union all
+	select id from wm_score_package where relation_score_id in (select id from wm_score_package where relation_score_id in (select id from wm_score_package where relation_score_id = #{query.id}))
+	)
+	and task_status=3
+	and (
+	(report_drug_approval_status in ( 5,6)  and report_drug_approval_opinion = 1)
+	 or (report_one_approval_status in ( 5,6)and report_one_approval_opinion = 1)
+	 )
+	</select>
+
+
+	<select id="selectSettleTask" resultType="java.util.HashMap">
+		select t.id,
+		t.task_type_id as taskTypeId
+		,p.task_type_name as taskTypeName
+		,t.lookinto_date as lookintoDate
+		,c.temp1,c.temp2,c.temp3,c.temp4
+		from wm_task t
+		left join wm_task_type p on t.task_type_id=p.id
+		left join wm_task_content c on c.id=t.task_content_id
+		where t.del_flag=0
+		<if test="query.id!=null and query.id!=''">
+			and  t.id = #{query.id}
+		</if>
+		<if test="query.scorePackageId!=null and query.scorePackageId!=''">
+			and  t.score_package_id = #{query.scorePackageId}
+		</if>
+		<if test="query.taskUserId!=null and query.taskUserId!=''">
+			and  t.task_user_id = #{query.taskUserId}
+		</if>
+		<if test="query.enableFlag!=null and query.enableFlag!=''">
+			and  t.enable_flag in (${query.enableFlag})
+		</if>
+		order by t.create_time desc
+	</select>
+
+	<select id="getUserTaskSubScore" resultType="java.lang.Integer">
+		SELECT IFNULL(sum(t.score), 0)  FROM
+			wm_task t, wm_score_package p
+		WHERE
+			t.score_package_id = p.id
+		AND p.package_type1 = '1'
+		AND t.task_status != '4'
+		AND t.task_user_id = #{userId,jdbcType=VARCHAR}
+		AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP})
+	</select>
+
+	<select id="newGetUserTaskSubScore" resultType="java.lang.Integer">
+		SELECT IFNULL(sum(t.score), 0)  FROM
+			wm_task t, wm_score_package p
+		WHERE
+			t.score_package_id = p.id
+		  AND p.package_type1 = '1'
+		  AND t.real_flag = '0'
+		  AND t.task_status = '3'
+		  AND t.task_user_id = #{userId,jdbcType=VARCHAR}
+		  AND (t.create_time BETWEEN #{startTime,jdbcType=TIMESTAMP} AND #{endTime,jdbcType=TIMESTAMP})
+	</select>
+
+	<!-- 患者教育-处方列表-分页 -->
+	<select id="listTaskPrescriptionPage" resultMap="wmTaskWithContentMap">
+		SELECT
+		*
+		FROM
+		wm_task t
+		LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+		<where>
+			t.del_flag = 0
+			AND t.real_flag = 0
+			AND task_status = 3
+			AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
+			<if test="prescriptionNo != null and prescriptionNo != ''">
+				AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
+			</if>
+		</where>
+	</select>
+
+	<!-- 患者教育-处方列表 -->
+	<select id="listTaskPrescription" resultMap="wmTaskWithContentMap">
+		SELECT
+		*
+		FROM
+		wm_task t
+		LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+		<where>
+			t.del_flag = 0
+			AND t.real_flag = 0
+			AND task_status = 3
+			AND score_package_id = #{scorePackageId, jdbcType=BIGINT}
+			<if test="prescriptionNo != null and prescriptionNo != ''">
+				AND tc.temp3 = #{prescriptionNo, jdbcType=VARCHAR}
+			</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>
+
+	<!-- 查询同一家医院一个月做的任务 -->
+	<select id="listCurrentMonthHospitalTask" resultMap="wmTaskMap">
+		SELECT t.*
+		FROM wm_task t
+				 LEFT JOIN wm_task_content tc ON tc.id = t.task_content_id
+		WHERE t.task_status in (1, 2, 3)
+		  AND t.enable_flag = 0
+		  AND t.del_flag = 0
+		  AND MONTH(t.create_time) = MONTH(CURDATE())
+		  AND tc.temp29 = #{hospitalId}
+	</select>
+
+	<!-- 查询会议任务个数 -->
+	<select id="countMeetingTask" resultType="java.lang.Long">
+		SELECT COUNT(*)
+		FROM wm_task
+				 LEFT JOIN wm_task_content ON wm_task.task_content_id = wm_task_content.id
+		WHERE wm_task.task_type_id IN
+		<foreach collection="taskTypeList" item="item" index="index" separator="," open="(" close=")">
+			#{item}
+		</foreach>
+		AND wm_task.task_user_id = #{taskUserId}
+	  	AND wm_task_content.temp4 BETWEEN #{startTime} AND #{endTime}
+	</select>
+</mapper>

hnqz-visual/hnqz-report-biz/src/main/resources/mapper/WmTaskTypeMapper.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.qunzhixinxi.hnqz.report.mapper.WmTaskTypeMapper">
+
+    <resultMap id="wmTaskTypeMap" type="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskType">
+        <id property="id" column="id"/>
+        <result property="taskTypeName" column="task_type_name"/>
+        <result property="taskTypeLevel" column="task_type_level"/>
+        <result property="status" column="status"/>
+        <result property="score" column="score"/>
+        <result property="baseId" column="base_id"/>
+        <result property="taskScoreStart" column="task_score_start"/>
+        <result property="taskScoreEnd" column="task_score_end"/>
+        <result property="taskEntId" column="task_ent_id"/>
+        <result property="durgentId" column="durgent_id"/>
+        <result property="level1Id" column="level1_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="enableFlag" column="enable_flag"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateUser" column="update_user"/>
+        <result property="realFlag" column="real_flag"/>
+        <result property="ruleId" column="rule_id"/>
+        <result property="parentId" column="parent_id"/>
+    </resultMap>
+
+
+    <select id="selectByRuleId" resultMap="wmTaskTypeMap" parameterType="java.lang.String">
+        select
+        *
+        from wm_task_type
+        where rule_id = #{ruleId,jdbcType=VARCHAR}
+    </select>
+
+    <select id="getWmTaskType" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
+        select
+        t.task_type_name as taskTypeName,
+        t.id as taskTypeId,
+        '1' as type
+        from wm_task_type t
+        where t.del_flag='0' and t.enable_flag=0
+        and t.task_type_level=1
+        <if test="query.parentId!=null and query.parentId!=''">
+            AND t.parent_id =#{query.parentId}
+        </if>
+        order by t.id
+
+    </select>
+
+    <select id="getWmTaskTypeYX" resultType="com.qunzhixinxi.hnqz.admin.api.entity.WmTaskTypeTree">
+        select
+        t.task_type_name as taskTypeName,
+        t.id as taskTypeId,
+        '1' as type
+        from wm_task_type t
+        where t.del_flag='0' and t.enable_flag=0
+        and t.task_type_level=1
+        <if test="query.parentId!=null and query.parentId!=''">
+            AND t.parent_id =#{query.parentId}
+        </if>
+        order by t.id
+
+    </select>
+
+
+</mapper>

hnqz-visual/pom.xml

@@ -15,5 +15,6 @@
     <modules>
         <module>hnqz-daemon-elastic-job</module>
         <module>hnqz-daemon-quartz</module>
+        <module>hnqz-report-biz</module>
     </modules>
 </project>

pom.xml

@@ -83,7 +83,7 @@
 		<module>hnqz-upms</module>
 		<module>hnqz-common</module>
 		<module>hnqz-visual</module>
-	</modules>
+    </modules>
 
 	<dependencyManagement>
 		<dependencies>
@@ -249,6 +249,7 @@
 				<profiles.gateway.port>9998</profiles.gateway.port>
 				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
 				<profiles.daemon.quartz.port>5007</profiles.daemon.quartz.port>
+				<profiles.report.port>3001</profiles.report.port>
 			</properties>
 			<activation>
 				<!-- 默认环境 -->
@@ -267,6 +268,7 @@
 				<profiles.gateway.port>29999</profiles.gateway.port>
 				<profiles.upms.biz.port>24000</profiles.upms.biz.port>
 				<profiles.daemon.quartz.port>25007</profiles.daemon.quartz.port>
+				<profiles.report.port>23001</profiles.report.port>
 			</properties>
 		</profile>
 		<profile>
@@ -281,6 +283,7 @@
 				<profiles.gateway.port>19998</profiles.gateway.port>
 				<profiles.upms.biz.port>14000</profiles.upms.biz.port>
 				<profiles.daemon.quartz.port>15007</profiles.daemon.quartz.port>
+				<profiles.report.port>13001</profiles.report.port>
 			</properties>
 		</profile>
 		<profile>
@@ -295,6 +298,7 @@
 				<profiles.gateway.port>9999</profiles.gateway.port>
 				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
 				<profiles.daemon.quartz.port>5007</profiles.daemon.quartz.port>
+				<profiles.report.port>3001</profiles.report.port>
 			</properties>
 		</profile>
 		<profile>
@@ -309,6 +313,7 @@
 				<profiles.gateway.port>9999</profiles.gateway.port>
 				<profiles.upms.biz.port>4000</profiles.upms.biz.port>
 				<profiles.daemon.quartz.port>5007</profiles.daemon.quartz.port>
+				<profiles.report.port>3001</profiles.report.port>
 			</properties>
 		</profile>
 	</profiles>