fix：任务类型ID

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

@@ -535,6 +535,25 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
 
     /**
      * 提交任务任务
+     * 任务类型列表
+     * 1	POV科室会
+     * 2	区县学术会议
+     * 3	市级学术会议
+     * 4	省级学术会议
+     * 5	沙龙会
+     * 8	产品相册分享
+     * 9	学术信息交流
+     * 10	受众阅读文章
+     * 11	受众打开产品相册
+     * 12	产品展示
+     * 13	业务宣传服务
+     * 14	数据信息收集
+     * 17	医学警戒信息收集
+     * 19	健康教育课堂
+     * 51	专业拜访
+     * 52	专项拜访
+     * 53	基础拜访
+     * 64	线上学术会议
      *
      * @param wmTaskContent 任务内容
      * @return 保存结果
@@ -637,134 +656,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
                 wmTaskType.setTaskTypeName(wmTaskType1.getTaskTypeName());
                 score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType);
 
-                // 医院区分新增和修改,修改积分搞为1000 start
-                if ("15".equals(wmTaskContent.getTemp30()) || "30".equals(wmTaskContent.getTemp30())) {
-                    System.err.println("医院区分新增和修改:" + score);
-                    WmDaHospital wmDaHospital = new WmDaHospital();
-                    wmDaHospital.setYymc(wmTaskContent.getTemp3());
-                    if (wmDaHospitalMapper.selectCount(Wrappers.query(wmDaHospital)) != 0) {
-                        WmTaskType wmTaskType2 = new WmTaskType();
-                        WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                        wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                        wmTaskType2.setTaskTypeName("医院信息修改");
-                        score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
-                    }
-                }
-                // 医院区分新增和修改,修改积分搞为1000 end
-
-                // 2021-06-11 库存调查分成，首次调查和常规调查，常规调查走之前的逻辑 start
-                if ("31".equals(wmTaskContent.getTemp30())) {
-                    WmTaskType wmTaskType2 = new WmTaskType();
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    wmTaskType2.setTaskTypeName("库存信息收集-首次");
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
-                }
-                // 2021-06-11 库存调查分成，首次调查和常规调查，常规调查走之前的逻辑 end
-
-                // 调剂服务 任务积分值 = 每一味积分值 * 调剂味数
-                if ("38".equals(wmTaskContent.getTemp30())) {
-                    WmTaskType wmTaskType2 = new WmTaskType();
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    wmTaskType2.setTaskTypeName("调剂服务");
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
-                    score = (int) Math.round(score * Double.parseDouble(wmTaskContent.getTemp24()));
-                }
-
-                // 应收账款回款-A类/应收账款回款-B类/应收账款回款-C类 积分值按照“回款总额”乘“回款类别”对应的百分比，四舍五入
-                if ("39".equals(wmTaskContent.getTemp30())) {
-                    WmTaskType wmTaskType2 = new WmTaskType();
-                    // 根据选择的回款类别 查任务类型模板
-                    WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
-                    // 查询当前企业的任务类型积分
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    wmTaskType2.setTaskTypeName(baseTaskType.getTaskTypeName());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
-                    // 计算实际任务积分（任务积分值 = 每一味积分值 * 调剂味数），这里应收账款回款积分值存的是1000的倍数，所以需要除以1000
-                    score = (int) Math.round(score * Double.parseDouble(wmTaskContent.getTemp8()) / 1000.0D);
-                }
-
-                // 手术跟台-一级/手术跟台-二级/手术跟台-三级任务类型 积分值设置
-                if ("42".equals(wmTaskContent.getTemp30())) {
-                    // 根据选择的跟台级别 设置积分值
-                    String taskTypeId = "42";
-                    switch (wmTaskContent.getTemp23()) {
-                        case "1":
-                            taskTypeId = "42";
-                            break;
-                        case "2":
-                            taskTypeId = "43";
-                            break;
-                        case "3":
-                            taskTypeId = "44";
-                            break;
-                        default:
-                    }
-                    WmTaskType baseTaskType = wmTaskTypeService.getById(taskTypeId);
-                    // 查询当前企业的任务类型积分
-                    WmTaskType wmTaskType2 = new WmTaskType();
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    wmTaskType2.setTaskTypeName(baseTaskType.getTaskTypeName());
-                    wmTaskType2.setRuleId(wmScorePackage1.getRuleId());
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(wmTaskType2);
-                    // 设置实际的任务类型
-                    wmTaskContent.setTemp30(taskTypeId);
-                    wmTask.setTaskTypeId(taskTypeId);
-                }
-
-                // 药店推广-47 积分值设置
-                if ("47".equals(wmTaskContent.getTemp30())) {
-                    // 根据选择的推广类型 查任务类型模板
-                    WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
-                    // 查询当前企业的任务类型积分
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    WmTaskType queryTaskType = new WmTaskType();
-                    queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                    queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
-                    queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
-                    // 计算实际任务积分（数量*企业这个任务类型的积分值）
-                    score = score * Integer.parseInt(wmTaskContent.getTemp13());
-                    // 设置实际的任务类型
-                    wmTaskContent.setTemp30(wmTaskContent.getTemp23());
-                    wmTask.setTaskTypeId(wmTaskContent.getTemp23());
-                }
-
-                // 信用管理A/B/C 积分值设置
-                // if ("51".equals(wmTaskContent.getTemp30())) {
-                //	// 根据选择的信用等级 查任务类型模板
-                //	WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp23());
-                //	// 查询当前企业的任务类型积分
-                //	WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                //	WmTaskType queryTaskType = new WmTaskType();
-                //	queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                //	queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
-                //	queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                //	score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
-                //	// 设置实际的任务类型
-                //	wmTaskContent.setTemp30(wmTaskContent.getTemp23());
-                //	wmTask.setTaskTypeId(wmTaskContent.getTemp23());
-                //}
-                // 首营管理-诊所/药店
-                if ("56".equals(wmTaskContent.getTemp30())) {
-                    // 根据选择的终端类型 查任务类型模板
-                    WmTaskType baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp3());
-                    // 查询当前企业的任务类型积分
-                    WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTaskContent.getTemp32());
-                    WmTaskType queryTaskType = new WmTaskType();
-                    queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                    queryTaskType.setTaskTypeName(baseTaskType.getTaskTypeName());
-                    queryTaskType.setRuleId(wmScorePackage1.getRuleId());
-                    score = wmTaskTypeService.getWmTaskTypeByEnt(queryTaskType);
-                    // 设置实际的任务类型
-                    wmTaskContent.setTemp30(wmTaskContent.getTemp3());
-                    wmTask.setTaskTypeId(wmTaskContent.getTemp3());
-                }
-
                 // 校验任务类型是否启用
                 WmTaskType _baseTaskType = wmTaskTypeService.getById(wmTaskContent.getTemp30());
                 WmTaskType queryTaskType = new WmTaskType();
@@ -815,32 +706,6 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
                 // 保存任务
                 boolean isSave = wmTaskService.save(wmTask);
 
-                /*
-                 * 2020-12-21
-                 * 15、30-医院 16-商业  18-药店
-                 * 三类修改为平台管理员审核后才能在任务中心查出来
-                 * realFlag  0-真实  1-非真实  9-审核中
-                 *
-                 * 2021-9-2 by lixuesong
-                 * 去掉平台管理员审核，调整到个人任务审核
-                 */
-                if ("15".equals(wmTaskContent.getTemp30())
-                        || "16".equals(wmTaskContent.getTemp30())
-                        || "30".equals(wmTaskContent.getTemp30())
-                        || "18".equals(wmTaskContent.getTemp30())) {
-                    // 校验调查信息审核，对比信息无改动则不可保存（15、30-医院 16-商业  18-药店）
-                    R taskResult = wmTaskService.getSurveryTaskInfo(wmTask.getId());
-                    Map<String, Object> data = (Map<String, Object>) taskResult.getData();
-                    WmTask task = (WmTask) data.get("wmTask");
-                    if ("3".equals(task.getCompareResult())) {
-                        // 3-信息无变化，删除这条任务
-                        wmTaskService.removeById(wmTask.getId());
-                        this.removeById(wmTask.getTaskContentId());
-                        return R.failed("信息无变化，不可提交");
-                    }
-                    resultMap.put("type", "3");
-                }
-                // 2020-12-21 end
 
                 // 判断任务是否完成
                 if (isSave) {
@@ -929,8 +794,9 @@ public class WmTaskContentServiceImpl extends ServiceImpl<WmTaskContentMapper, W
                 } else {
                     return R.failed("任务保存失败");
                 }
+
                 // 保存打卡记录
-                if ("5".equals(wmTaskContent.getTemp30()) || "6".equals(wmTaskContent.getTemp30()) || "33".equals(wmTaskContent.getTemp30())) {
+                if ("51".equals(wmTaskContent.getTemp30()) || "52".equals(wmTaskContent.getTemp30()) || "53".equals(wmTaskContent.getTemp30())) {
                     WmUserSign wmUserSign = new WmUserSign();
                     wmUserSign.setSignEntType(wmTaskContent.getTemp29());
                     wmUserSign.setSignEntName(wmTaskContent.getTemp7());