小程序打卡-添加医院拜访详情

db/v2.0/220118.sql

@@ -1,4 +1,3 @@
-
 -- 新增 部门任务类型模板
 CREATE TABLE `wm_dept_task_type_template`
 (
@@ -14,3 +13,15 @@ CREATE TABLE `wm_dept_task_type_template`
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='部门任务类型模板';
 
+-- 新增 签到详情表
+CREATE TABLE `wm_user_sign_detail`
+(
+    `id`      INT     NOT NULL AUTO_INCREMENT,
+    `sign_id` INT     NOT NULL COMMENT '签到表id',
+    `drug`    text    NOT NULL COMMENT '推广药品',
+    `purpose` CHAR(1) NOT NULL COMMENT '拜访目的',
+    `result`  CHAR(1) NOT NULL COMMENT '拜访结果',
+    `remark`  VARCHAR(255) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8mb4 COMMENT = '用户签到详情';

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

@@ -95,4 +95,10 @@ public class WmUserSign extends Model<WmUserSign> {
 	@TableField(exist = false)
 	private String packageId;
 
+	/**
+	 * 签到详情
+	 */
+	@TableField(exist = false)
+	private WmUserSignDetail userSignDetail;
+
 }

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

@@ -0,0 +1,50 @@
+package com.qunzhixinxi.hnqz.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户签到详情实体
+ *
+ * @author lixuesong
+ * @date 2022年01月18日 17:45
+ */
+@Data
+@TableName("wm_user_sign_detail")
+@EqualsAndHashCode(callSuper = true)
+public class WmUserSignDetail extends Model<WmUserSignDetail> {
+
+	/**
+	 * 主键id
+	 */
+	@TableId
+	private Integer id;
+
+	/**
+	 * 签到表id
+	 */
+	private Integer signId;
+
+	/**
+	 * 推广药品
+	 */
+	private String[] drug;
+
+	/**
+	 * 拜访目的
+	 */
+	private String purpose;
+
+	/**
+	 * 拜访结果
+	 */
+	private String result;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
+}

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

@@ -0,0 +1,13 @@
+package com.qunzhixinxi.hnqz.admin.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qunzhixinxi.hnqz.admin.entity.WmUserSignDetail;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author lixuesong
+ * @date 2022年01月18日 18:19
+ */
+@Mapper
+public interface WmUserSignDetailMapper extends BaseMapper<WmUserSignDetail> {
+}

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

@@ -0,0 +1,14 @@
+package com.qunzhixinxi.hnqz.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qunzhixinxi.hnqz.admin.entity.WmUserSignDetail;
+
+/**
+ * 用户签到详情服务
+ *
+ * @author lixuesong
+ * @date 2022年01月18日 17:53
+ */
+public interface WmUserSignDetailService extends IService<WmUserSignDetail> {
+
+}

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

@@ -0,0 +1,19 @@
+package com.qunzhixinxi.hnqz.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qunzhixinxi.hnqz.admin.entity.WmUserSignDetail;
+import com.qunzhixinxi.hnqz.admin.mapper.WmUserSignDetailMapper;
+import com.qunzhixinxi.hnqz.admin.service.WmUserSignDetailService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户签到详情服务
+ *
+ * @author lixuesong
+ * @date 2022年01月18日 17:57
+ */
+@Service
+@AllArgsConstructor
+public class WmUserSignDetailServiceImpl extends ServiceImpl<WmUserSignDetailMapper, WmUserSignDetail> implements WmUserSignDetailService {
+}

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

@@ -58,6 +58,8 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 	private final SysRoleService sysRoleService;
 	private final WmTaskRuleService wmTaskRuleService;
 	private final SysPublicParamService sysPublicParamService;
+	private final WmDeptTaskTypeTemplateService wmDeptTaskTypeTemplateService;
+	private final WmUserSignDetailService wmUserSignDetailService;
 
 	@Override
 	public R saveWmUserSign(WmUserSign wmUserSign) {
@@ -256,6 +258,15 @@ public class WmUserSignServiceImpl extends ServiceImpl<WmUserSignMapper, WmUserS
 				}
 				updatePke.setIsConduct("1");
 				wmScorePackageService.updateById(updatePke);
+
+				// 如果配置了医院拜访的任务类型模板，则关联保存签到详情
+				if (wmDeptTaskTypeTemplateService.checkDeptIdHospitalTemplate(sysU.getDeptId())) {
+					WmUserSignDetail userSignDetail = wmUserSign.getUserSignDetail();
+					if (userSignDetail != null) {
+						userSignDetail.setSignId(wmUserSign.getId());
+						wmUserSignDetailService.save(userSignDetail);
+					}
+				}
 				return R.ok(wmTask);
 			}
 		}