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

# Conflicts:
#	svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/util/ISqlUtils.java

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskDO.java

@@ -63,6 +63,8 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
    private Long total;//参加总数
    @Transient
    private List<TaskPatientDetailDO> taskPatientDetailDOS;//参与人详情
    @Transient
    private String ruleName;//规则名称
    public String getSaasId() {
        return saasId;
@@ -192,4 +194,11 @@ public class TaskDO extends IdEntityWithOperation implements Serializable{
        this.openId = openId;
    }
    public String getRuleName() {
        return ruleName;
    }
    public void setRuleName(String ruleName) {
        this.ruleName = ruleName;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java

@@ -54,6 +54,15 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    @Transient
    private String taskCode;//任务标识
    @Transient
    private String name;//居民名称
    @Transient
    private String hospital;//社区
    @Transient
    private String hospitalName;//社区名称
    public String getSaasId() {
        return saasId;
    }
@@ -157,4 +166,28 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    public void setTaskCode(String taskCode) {
        this.taskCode = taskCode;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
}

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

@@ -3,9 +3,11 @@ package com.yihu.jw.service;/**
 */
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.dao.AccountDao;
import com.yihu.jw.dao.ActivityDao;
import com.yihu.jw.dao.TaskDao;
import com.yihu.jw.dao.TaskPatientDetailDao;
import com.yihu.jw.entity.health.bank.AccountDO;
import com.yihu.jw.entity.health.bank.TaskDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
import com.yihu.jw.entity.health.bank.TaskRangDO;
@@ -35,6 +37,8 @@ public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private AccountDao accountDao;
    @Autowired
    private TaskDao taskDao;
    @Autowired
    private ActivityDao activityDao;
@@ -72,6 +76,27 @@ public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,
        taskPatientDetailDO.setCreateTime(new Date());
        taskPatientDetailDO.setUpdateTime(new Date());
        taskPatientDetailDO.setStatus(Integer.parseInt("0"));
        String accountSql = "select * from wlyy_health_bank_account where patient_id = '"+taskPatientDetailDO.getPatientId()+"'";
        List<AccountDO> accountDOS = jdbcTemplate.query(accountSql,new BeanPropertyRowMapper(AccountDO.class));
        if (accountDOS == null || accountDOS.size() ==0){
            AccountDO accountDO = new AccountDO();
            accountDO.setSaasId("dev");
            accountDO.setStatus(1);
            if(taskPatientDetailDO.getPatientIdcard().length()>=4){// 判断是否长度大于等于4
                String cardNumber=taskPatientDetailDO.getPatientIdcard().substring(taskPatientDetailDO.getPatientIdcard().length()- 4,taskPatientDetailDO.getPatientIdcard().length());//截取两个数字之间的部分
                int random = (int)((Math.random()*9+1)*100000);
                accountDO.setCardNumber(cardNumber+Integer.toString(random));
            }
            accountDO.setAccountName(taskPatientDetailDO.getName());
            accountDO.setTotal(0);
            accountDO.setPatientId(taskPatientDetailDO.getPatientId());
            accountDO.setCardNumber(taskPatientDetailDO.getPatientIdcard());
            accountDO.setHospital(taskPatientDetailDO.getHospital());
            accountDO.setHospitalName(taskPatientDetailDO.getHospitalName());
            accountDO.setCreateTime(new Date());
            accountDO.setUpdateTime(new Date());
            accountDao.save(accountDO);
        }
        String activitySql = "select * from wlyy_health_bank_task where transaction_id = '" + taskPatientDetailDO.getActivityId() +"'";
        List<TaskDO> taskDOList = jdbcTemplate.query(activitySql,new BeanPropertyRowMapper(TaskDO.class));
        StringBuffer buffer = new StringBuffer();

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

@@ -7,9 +7,11 @@ import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.jw.dao.ActivityDao;
import com.yihu.jw.dao.TaskDao;
import com.yihu.jw.dao.TaskPatientDetailDao;
import com.yihu.jw.dao.TaskRuleDao;
import com.yihu.jw.entity.health.bank.ActivityDO;
import com.yihu.jw.entity.health.bank.TaskDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
import com.yihu.jw.entity.health.bank.TaskRuleDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.util.DateUtils;
@@ -42,6 +44,8 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
    private TaskPatientDetailDao taskPatientDetailDao;
    @Autowired
    private ActivityDao activityDao;
    @Autowired
    private TaskRuleDao taskRuleDao;
    /**
@@ -103,6 +107,8 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
               ActivityDO activityDO = activityDao.findOne(taskDO1.getTransactionId());
               taskDO1.setActivityDO(activityDO);
           }
           TaskRuleDO taskRuleDO = taskRuleDao.findOne(taskDO1.getRuleCode());
           taskDO1.setRuleName(taskRuleDO.getName());
           //参与活动的详情
           String taskSql = "select * from wlyy_health_bank_task_patient_detail where task_id = '"+taskDO1.getId()+
                   "' and patient_openid = '"+taskDO.getOpenId()+"'";