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

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

@@ -64,6 +64,15 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    @Transient
    private List<String> patientIds;//团队居民id
    @Transient
    private String taskId;//任务id
    @Transient
    private Long activityRanking;//活动排名
    @Transient
    private Long activityIntegrate;//活动积分
    public String getSaasId() {
        return saasId;
    }
@@ -191,4 +200,28 @@ public class AccountDO extends IdEntityWithOperation implements Serializable {
    public void setPatientIds(List<String> patientIds) {
        this.patientIds = patientIds;
    }
    public String getTaskId() {
        return taskId;
    }
    public void setTaskId(String taskId) {
        this.taskId = taskId;
    }
    public Long getActivityRanking() {
        return activityRanking;
    }
    public void setActivityRanking(Long activityRanking) {
        this.activityRanking = activityRanking;
    }
    public Long getActivityIntegrate() {
        return activityIntegrate;
    }
    public void setActivityIntegrate(Long activityIntegrate) {
        this.activityIntegrate = activityIntegrate;
    }
}

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

@@ -48,6 +48,9 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    @Transient
    private AccountDO accountDO;//账户信息
    @Transient
    private int isFlag;//标识是否为当前用户
    public String getSaasId() {
        return saasId;
    }
@@ -135,4 +138,12 @@ public class TaskPatientDetailDO extends IdEntityWithOperation implements Serial
    public void setUnionId(String unionId) {
        this.unionId = unionId;
    }
    public int getIsFlag() {
        return isFlag;
    }
    public void setIsFlag(int isFlag) {
        this.isFlag = isFlag;
    }
}

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

@@ -1,17 +1,19 @@
package com.yihu.jw.controller;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.health.bank.ActiveRecordDO;
import com.yihu.jw.entity.health.bank.TaskPatientDetailDO;
import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.rm.health.bank.HealthBankMapping;
import com.yihu.jw.service.ActiveRecordService;
import com.yihu.jw.service.TaskPatientDtailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
@@ -23,21 +25,30 @@ import org.springframework.web.bind.annotation.RestController;
public class ActiveRecordController extends EnvelopRestController {
    @Autowired
    private ActiveRecordService activeRecordService;
    @Autowired
    private TaskPatientDtailService taskPatientDtailService;
    @PostMapping(value = HealthBankMapping.healthBank.createActiveRecord)
    @ApiOperation(value = "添加健康银行活动活跃记录")
    public Envelop<ActiveRecordDO> addActiveRecord(@ApiParam(name = "saasId",value = "saasId")@RequestParam(value = "saasId",required = false)String saasId,
                                                   @ApiParam(name = "taskId",value = "任务id")@RequestParam(value = "taskId",required = false)String taskId,
                                                   @ApiParam(name = "activityId",value = "活动的id")@RequestParam(value = "activityId",required = false)String activityId,
                                                   @ApiParam(name = "originalStatus",value = "原有状态")@RequestParam(value = "originalStatus",required = true)Integer originalStatus,
                                                   @ApiParam(name = "currentStatus",value = "当前状态")@RequestParam(value = "currentStatus",required = true)Integer currentStatus,
                                                   @ApiParam(name = "patientId",value = "居民code")@RequestParam(value = "patientId",required = true)String patientId){
    public Envelop<ActiveRecordDO> addActiveRecord(@RequestBody JSONObject object){
        try{
            ActiveRecordDO activeRecordDO = activeRecordService.insert(saasId,taskId,activityId,originalStatus,currentStatus,patientId);
            if(activeRecordDO!=null){
                return Envelop.getSuccess("添加成功",activeRecordDO);
            }else{
                return Envelop.getError("添加失败");
            String openId = object.getString("patientOpenid");
            String idCard = object.getString("patientIdcard");
            String unionId = object.getString("unionId");
            String taskCode = object.getString("taskCode");
            Integer originalStatus = object.getInteger("originalStatus");
            Integer currentStatus = object.getInteger("currentStatus");
            String patientId = object.getString("patientId");
            TaskPatientDetailDO taskPatientDetailDO = taskPatientDtailService.selectByPatientId(openId,idCard,unionId,taskCode);
            if (taskPatientDetailDO == null){
                return Envelop.getError("尚未报名！");
            }else {
                ActiveRecordDO activeRecordDO = activeRecordService.insert(taskPatientDetailDO.getSaasId(),taskPatientDetailDO.getTaskId(),taskPatientDetailDO.getActivityId(),originalStatus,currentStatus,patientId);
                if(activeRecordDO!=null){
                    return Envelop.getSuccess("添加成功",activeRecordDO);
                }else{
                    return Envelop.getError("添加失败");
                }
            }
        }catch (Exception e){
            return Envelop.getError("添加失败");

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

@@ -180,12 +180,14 @@ public class CreditsDetailController extends EnvelopRestController {
    @ApiOperation(value = "根据活动id查找全部排行")
    public Envelop<TaskPatientDetailDO> selectByActivityRanking1(@ApiParam(name = "activityId",value = "活动id")
                                                     @RequestParam(value = "activityId",required = true)String activityId,
                                                     @ApiParam(name = "patientId",value = "居民id")
                                                     @RequestParam(value = "patientId",required = true)String patientId,
                                                     @ApiParam(name = "page", value = "第几页，从1开始")
                                                     @RequestParam(value = "page", defaultValue = "1",required = false)Integer page,
                                                     @ApiParam(name = "size",defaultValue = "10",value = "，每页分页大小")
                                                     @RequestParam(value = "size", required = false)Integer size){
        try{
            return service.selectByActivityRanking1(activityId,page,size);
            return service.selectByActivityRanking1(activityId,patientId,page,size);
        }catch (Exception e){
            e.printStackTrace();
            tracer.getCurrentSpan().logEvent(e.getMessage());

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

@@ -72,8 +72,8 @@ public class AccountService extends BaseJpaService<AccountDO,AccountDao> {
        List<AccountDO> accountDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(AccountDO.class));
        for (AccountDO accountDO1:accountDOS){
            String sql1 = "select COALESCE(sum(bcd.integrate),0) as total from wlyy_health_bank_credits_detail bcd where bcd.trade_direction = 1" +
                    " AND bcd.create_time > '"+ DateUtils.getDayBegin()+"' AND bcd.create_time < '"+DateUtils.getDayEnd()+"' AND bcd.patient_id = " +
                    " '"+ accountDO1.getPatientId() +"'";
                    " AND bcd.create_time > '"+ DateUtils.getDayBegin()+"' AND bcd.create_time < '"+DateUtils.getDayEnd()+"' AND bcd.patient_id = '" + accountDO1.getPatientId() +"'"
                    +"AND transaction_id = '"+accountDO.getTaskId()+"'";
            List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql1);
            Long count = 0L;
            if(rstotal!=null&&rstotal.size()>0){
@@ -81,6 +81,17 @@ public class AccountService extends BaseJpaService<AccountDO,AccountDao> {
                count = Long.parseLong(object.toString());
            }
            accountDO1.setNowTotal(count);
            String activitySql1 =" SELECT " +
                    " SUM(ptpd.total) AS total FROM wlyy_health_bank_task_patient_detail ptpd " +
                    " WHERE " +" task_id = '" + accountDO.getTaskId() + "' " +
                    "and patient_id = '"+accountDO1.getPatientId()+"'";
            List<Map<String,Object>> rstotal6 = jdbcTemplate.queryForList(activitySql1);
            Long activityIntegrate = 0L;
            if(rstotal6!=null&&rstotal6.size()>0){
                Object object = rstotal6.get(0).get("total");
                activityIntegrate = Long.parseLong(object.toString());
            }
            accountDO1.setActivityIntegrate(activityIntegrate);
            String activitySql = "SELECT  COUNT(*) AS total FROM ( SELECT * FROM " +
                    "wlyy_health_bank_task_patient_detail " +
                    " WHERE patient_id = '" + accountDO1.getPatientId()+

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

@@ -74,9 +74,10 @@ public class ActiveRecordService extends BaseJpaService<ActiveRecordDO,ActiveRec
            activeRecordDO.setPatientName(result.get("name")+"");
        }
        String sql2 = "select f.* from wlyy.wlyy_sign_family f where f.patient='"+patientId+"' and f.status=1 and f.expenses_status=1";
        Map<String,Object> result2 = jdbcTemplate.queryForMap(sql2);
        if(result2!=null){
            activeRecordDO.setTeamId(result2.get("admin_team_code")!=null?(Integer)result2.get("admin_team_code"):null);;
//        Map<String,Object> result2 = jdbcTemplate.queryForMap(sql2);
        List<Map<String, Object>> result2 = jdbcTemplate.queryForList(sql2);
        if(result2!=null&&result2.size()>0){
            activeRecordDO.setTeamId(result2.get(0).get("admin_team_code")!=null?(Integer)result2.get(0).get("admin_team_code"):null);;
        }
        return activeRecordDao.save(activeRecordDO);
    }

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

@@ -461,7 +461,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
     * @param size 分页大小
     * @return
     */
    public Envelop<TaskPatientDetailDO> selectByActivityRanking1(String activityId,Integer page,Integer size){
    public Envelop<TaskPatientDetailDO> selectByActivityRanking1(String activityId,String patientId,Integer page,Integer size){
        String sql = "SELECT " +
                " * " +
                "FROM " +
@@ -488,6 +488,30 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            TaskPatientDetailDO taskPatientDetailDO = taskPatientDetailDOS.get(i);
            String accountSql = "select * from wlyy_health_bank_account where patient_id = '"+taskPatientDetailDO.getPatientId()+"'";
            List<AccountDO> accountDOS = jdbcTemplate.query(accountSql,new BeanPropertyRowMapper(AccountDO.class));
            if (taskPatientDetailDOS.get(i).getPatientId().equalsIgnoreCase(patientId)){
                /*String taskSql = "select count(1)+1 as total from (" +
                        "select *  from (SELECT " +
                        " SUM(ptpd.total) AS total, " +
                        " ptpd.patient_openid AS patient_openid, " +
                        " ptpd.task_id AS task_id, " +
                        " ptpd.activity_id AS activity_id, " +
                        " ptpd.create_time as create_time, " +
                        " ptpd.patient_id AS patient_id " +
                        " FROM " +
                        " wlyy_health_bank_task_patient_detail ptpd " +
                        " WHERE " +
                        " activity_id = '" + activityId + "')ptpd1 where" +
                        " ptpd1.patient_id = '"+patientId+"' AND ptpd1.total > "+taskPatientDetailDOS.get(i).getTotal()+") ptpd2";
                List<Map<String,Object>> rstotal1 = jdbcTemplate.queryForList(taskSql);
                Long count = 0L;
                if(rstotal1!=null&&rstotal1.size()>0){
                    count = (Long) rstotal1.get(0).get("total");
                }
                accountDOS.get(0).setActivityRanking(count);*/
                taskPatientDetailDO.setIsFlag(1);
            }else {
                taskPatientDetailDO.setIsFlag(0);
            }
            taskPatientDetailDO.setAccountDO(accountDOS.get(0));
        }
        String sqlCount =  "SELECT " +

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

@@ -110,5 +110,20 @@ public class TaskPatientDtailService extends BaseJpaService<TaskPatientDetailDO,
        return envelop;
    }
    /**
     * 获取参与活动信息
     *
     * @param openId 微信id
     * @param idCard 身份证号
     * @param unionId
     * @param taskCode 任务标识
     * @return
     */
    public TaskPatientDetailDO selectByPatientId(String openId,String idCard,String unionId,String taskCode){
        String sql ="select * from wlyy_health_bank_task_patient_detail where patient_openid = '"+openId+"'" +
                " AND patient_idcard = '"+idCard+"' AND union_id ='"+unionId+"' AND task_id = " +
                "(select id from wlyy_health_bank_task where task_code = '"+taskCode+"' )";
        List<TaskPatientDetailDO> taskPatientDetailDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(TaskPatientDetailDO.class));
        return taskPatientDetailDOS.get(0);
    }
}