smartor.git - Gitblit

			@@ -41,12 +41,21 @@
			@ApiModelProperty(value = "机构ID")
			private String orgid;

			@ApiModelProperty("发送状态")
			private String sendstate;
			/**
			* 发送状态
			*/
			@Excel(name = " 发送状态 ")
			@ApiModelProperty(value = "发送状态 1 被领取(在任务中是新建，在服务中是被领取) 2 待发送 3 已发送 4 不执行 5 发送失败 6 已完成 7 超时(人工)")
			private Long sendstate;

			@ApiModelProperty("完成状态（0未完成 1已完成对应finishtime是否有值）")
			private String isFinished;

			/**
			* 超链接统计列表类型 - 宣教超链接统计
			* totalCountInfo - 宣教发送总量
			* sendSuccessCountInfo - 发送成功量 sendstate = 6
			* readCountInfo - 已读量 finishtime ！= null
			*/
			@ApiModelProperty("超链接统计列表类型")
			private String hyperLinkInfoType;

			@@ -4544,7 +4544,7 @@
			case "totalCountInfo":
			break;
			case "sendSuccessCountInfo":
			heLibraryCountVO.setSendstate("6");
			heLibraryCountVO.setSendstate(6L);
			break;
			case "readCountInfo":
			heLibraryCountVO.setIsFinished("1");

			@@ -2878,7 +2878,7 @@
			<if test="sendstate != null">
			AND sendstate = #{sendstate}
			</if>
			<if test="isFinished != null and isFinished != '0'">
			<if test="isFinished != null and isFinished == '1'">
			AND finishtime is not null
			</if>
			<if test="starttime != null">AND starttime >= #{starttime}</if>
			@@ -2955,10 +2955,10 @@
			<if test="orgid != null and orgid != ''">
			and orgid = #{orgid}
			</if>
			<if test="sendstate != null and isFinished != '0'">
			<if test="sendstate != null">
			AND sendstate = #{sendstate}
			</if>
			<if test="isFinished != null">
			<if test="isFinished != null and isFinished == '1'">
			AND finishtime is not null
			</if>
			<if test="hospitaldistrictcodes != null and hospitaldistrictcodes.size() > 0">

	smartor/src/main/java/com/smartor/domain/VO/HeLibraryCountVO.java	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史