Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

common/common-request-mapping/src/main/java/com/yihu/jw/rm/health/bank/HealthBankMapping.java

@@ -84,5 +84,6 @@ public class HealthBankMapping {
        public static final String weekRewardAndIntegrate = "/weekRewardAndIntegrate";
        public static final String selectWeekReward="/selectWeekReward";
        public static final String reduceIntegrate ="/reduceIntegrate";
        public static final String createPlanActivity = "/createPlanActivity";
    }
}

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/controller/ActivityController.java

@@ -70,6 +70,42 @@ public class ActivityController extends EnvelopRestEndpoint {
        }
    }
    /**
     *
     * @param planCode
     * @param patient
     * @param name
     * @param idcard
     * @param hospital
     * @param hospitalName
     * @param templateName
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.createPlanActivity)
    @ApiOperation(value = "发布活动")
    public MixEnvelop<ActivityDO, ActivityDO> publishActivity(@ApiParam(name = "planCode",value = "计划code")
                                                        @RequestParam(value = "planCode",required = true)String planCode,
                                                        @ApiParam(name = "patient",value = "居民code")
                                                        @RequestParam(value = "patient",required = true)String patient,
                                                        @ApiParam(name = "name",value = "居民名字")
                                                        @RequestParam(value = "name",required = true)String name,
                                                        @ApiParam(name = "idcard",value = "身份证")
                                                        @RequestParam(value = "idcard",required = true)String idcard,
                                                        @ApiParam(name = "hospital",value = "社区code")
                                                        @RequestParam(value = "hospital",required = true)String hospital,
                                                        @ApiParam(name = "hospitalName",value = "社区名称")
                                                            @RequestParam(value = "hospitalName",required = true)String hospitalName,
                                                        @ApiParam(name = "templateName",value = "计划模板名称")
                                                            @RequestParam(value = "templateName",required = true)String templateName){
        try {
            return service.createActivity(planCode,patient,name,idcard,hospital,hospitalName,templateName);
        }catch (Exception e){
            e.printStackTrace();
//            tracer.getCurrentSpan().logEvent(e.getMessage());
            return MixEnvelop.getError(e.getMessage());
        }
    }
    /**
     * find health activity
     *

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ActivityDao.java

@@ -18,6 +18,8 @@ public interface ActivityDao extends PagingAndSortingRepository<ActivityDO,Strin
    @Query("select t from ActivityDO t where t.type=?1 and (t.status=0 or t.status=1) and t.delFlag=1")
    List<ActivityDO> findByIdAndType(String type);
    @Query("select t from ActivityDO t where t.globelTemplate=?1 and t.type=?2")
    ActivityDO selectByTemplateIdAndType(String templateId,String type);
    @Query("select t from ActivityDO t where t.delFlag=1 order by t.sort ASC")
    List<ActivityDO> selectBySort();

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/ActivityService.java

@@ -148,6 +148,53 @@ public class ActivityService extends BaseJpaService<ActivityDO,ActivityDao> {
    }
    public MixEnvelop<ActivityDO,ActivityDO> createActivity(String planCode,String patient,String name,String idcard,String hospital,String hospitalName,String templateName){
        MixEnvelop<ActivityDO, ActivityDO> envelop = new MixEnvelop<>();
        ActivityDO activityDO = activityDao.selectByTemplateIdAndType(planCode,"健康计划");
       if (activityDO==null){
           activityDO = new ActivityDO();
           activityDO.setStatus(1);
           activityDO.setSaasId("dev");
           activityDO.setCreateTime(new Date());
           activityDO.setUpdateTime(new Date());
           activityDO.setOrganizer("SYSTEM");
           activityDO.setTitle(templateName);
           activityDO.setDescription(templateName);
           activityDO.setIntroduction(templateName);
           activityDO =  activityDao.save(activityDO);
           TaskDO taskDO = new TaskDO();
           taskDO.setCreateTime(new Date());
           taskDO.setUpdateTime(new Date());
           taskDO.setTitle(templateName);
           taskDO.setType("ACTIVITY_TASK");
           taskDO.setTaskCode("ACTIVITY_PLAN");
           taskDO.setTransactionId(activityDO.getId());
           taskDO.setContent(templateName);
           taskDO.setStatus(1);
           taskDO = taskDao.save(taskDO);
           TaskPatientDetailDO taskPatientDetailDO = taskPatientDetailDao.selectByTaskIdAndPatientId(taskDO.getId(),patient);
           if (taskPatientDetailDO==null){
               taskPatientDetailDO = new TaskPatientDetailDO();
               taskPatientDetailDO.setSaasId("dev");
               taskPatientDetailDO.setTaskId(taskDO.getId());
               taskPatientDetailDO.setActivityId(activityDO.getId());
               taskPatientDetailDO.setPatientIdcard(idcard);
               taskPatientDetailDO.setPatientId(patient);
               taskPatientDetailDO.setHospital(hospital);
               taskPatientDetailDO.setHospitalName(hospitalName);
               taskPatientDetailDO.setCreateTime(new Date());
               taskPatientDetailDO.setUpdateTime(new Date());
               taskPatientDetailDO.setTotal(0L);
               taskPatientDetailDO.setCouponTotal(0L);
               taskPatientDetailDO.setStatus(0);
               taskPatientDetailDao.save(taskPatientDetailDO);
           }
       }
       envelop.setObj(activityDO);
       return envelop;
    }
    /**
     *  find by condition
     *

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/service/CreditsDetailService.java

@@ -1683,8 +1683,6 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                accountDao.save(accountDO);
            }
        }
    }
}