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

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

@@ -88,7 +88,7 @@ public class AccountController extends EnvelopRestController {
     * @param size 每页大小
     * @return
     */
    @PostMapping(value = HealthBankMapping.healthBank.findAccount)
/*    @PostMapping(value = HealthBankMapping.healthBank.findAccount)
    @ApiOperation(value = "查看账户信息")
    public Envelop<AccountDO> getAccount(@ApiParam(name = "account",value = "账户JSON")
                                           @RequestParam(value = "account",required = false)String account,
@@ -104,6 +104,6 @@ public class AccountController extends EnvelopRestController {
            tracer.getCurrentSpan().logEvent(e.getMessage());
            return Envelop.getError(e.getMessage());
        }
    }
    }*/
}

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -87,6 +88,8 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            accountDO1.setHospital("海沧区");
            accountDO1.setPassword("321321312321");
            accountDO1.setHospitalName("haichan");
            accountDO1.setCreateTime(new Date());
            accountDO1.setUpdateTime(new Date());
            accountDao.save(accountDO1);
        }
        List<AccountDO>  accountDOS1 = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(AccountDO.class));
@@ -129,7 +132,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
            }
            buffer.deleteCharAt(buffer.length()-1);
        }
        buffer.append(") AND");
        buffer.append(") ");
        String sql = "SELECT" +
                " ba.patient_id AS patient_id, " +
                " ba.account_name AS account_name," +
@@ -138,7 +141,7 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                " ba.create_time AS create_time, " +
                " (ba.total +(cd1.total)) AS sum " +
                " FROM " +
                " wlyy_health_bank_account ba, " +
                " wlyy_health_bank_account ba LEFT JOIN " +
                " ( " +
                " SELECT " +
                " SUM(cd.integrate) AS total, " +
@@ -149,17 +152,16 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                " cd.trade_direction = - 1 " +
                " GROUP BY " +
                " cd.patient_id " +
                " ) cd1 " +
                " ) cd1  ON cd1.patient_id = ba.patient_id " +
                "WHERE " + buffer +
                " cd1.patient_id = ba.patient_id " +
                "ORDER BY " +
                " ORDER BY " +
                " ba.create_time, " +
                " (ba.total + cd1.total) DESC " +
                "LIMIT "+(page-1)*size+","+size;
        List<AccountDO> accountDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(AccountDO.class));
        String sqlCount = "SELECT count(1) AS total"+
                " FROM " +
                " wlyy_health_bank_account ba, " +
                " wlyy_health_bank_account ba LEFT JOIN " +
                " ( " +
                " SELECT " +
                " SUM(cd.integrate) AS total, " +
@@ -170,10 +172,9 @@ public class CreditsDetailService extends BaseJpaService<CreditsDetailDO,Creditt
                " cd.trade_direction = - 1 " +
                " GROUP BY " +
                " cd.patient_id " +
                " ) cd1 " +
                " ) cd1 ON cd1.patient_id = ba.patient_id " +
                "WHERE " + buffer +
                " cd1.patient_id = ba.patient_id " +
                "ORDER BY " +
                " ORDER BY " +
                " ba.create_time, " +
                " (ba.total + cd1.total) DESC ";
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sqlCount);

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

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -99,6 +100,8 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
       taskDO.setTaskContent("（使用社区发放的已关联您身份信息的设备,登录厦门i健康绑定设备）");
       taskDO.setTradeType("activity");
       taskDO.setTransactionId("402885e96324a409016324c0a45a0006");
       taskDO.setCreateTime(new Date());
       taskDO.setUpdateTime(new Date());
       taskDOList.add(taskDO);
       TaskDO taskDO1 = new TaskDO();
       taskDO1.setPatientId(patientId);
@@ -108,6 +111,8 @@ public class TaskService extends BaseJpaService<TaskDO,TaskDao>{
       taskDO1.setTaskContent("（使用社区发放的已关联您身份信息的设备，绑定后每天完成测量）");
       taskDO1.setTradeType("activity");
       taskDO1.setTransactionId("402885e96324a409016324c0a45a0006");
       taskDO1.setCreateTime(new Date());
       taskDO1.setUpdateTime(new Date());
       taskDOList.add(taskDO1);
       return taskDOList;
    }