Merge branch 'dev' of chinawu123/wlyy2.0 into dev

server/svr-authentication/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-authentication-wsl
    name: svr-authentication
  cloud:
    config:
      failFast: true

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/org/BaseOrgEndpoint.java

@@ -19,7 +19,6 @@ import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.List;
import java.util.Map;
/**
 * 机构信息控制器
@@ -236,7 +235,7 @@ public class BaseOrgEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "/saveOrgCheck")
    @PostMapping(value = "/saveOrgCheck")
    @ApiOperation(value = "保存修改机构考核")
    public Envelop saveOrgCheck(@ApiParam(name = "id", value = "考核id")
                                @RequestParam(value = "id", required = false) String id,

svr/svr-base/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-base-wsl
    name: svr-base
  cloud:
    config:
      failFast: true

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -1412,7 +1412,12 @@ public class StatisticsService {
        String sql = " SELECT count(id) from base_life_care_order WHERE  `status` = 2 and  TIMESTAMPDIFF(SECOND,create_time,conclusion_time) < 43200";
        Integer integer = jdbcTemplate.queryForObject(sql, Integer.class);
        res.put("serviceRate",integer/saveModel2.getResult2().longValue()*100);
        if (saveModel2.getResult2().longValue()==0) {
            res.put("serviceRate",0);
        }else {
            res.put("serviceRate",integer/saveModel2.getResult2().longValue()*100);
        }
        return res;
    }
@@ -2358,7 +2363,12 @@ public class StatisticsService {
        Integer integer = jdbcTemplate.queryForObject(sql, Integer.class);
        res.put("serviceRate",integer/saveModel.getResult2().longValue()*100);
        if (saveModel.getResult2().longValue()==0) {
            res.put("serviceRate",0);
        }else {
            res.put("serviceRate",integer/saveModel.getResult2().longValue()*100);
        }
        return res;
    }

svr/svr-cloud-care/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name:  svr-cloud-care-wsl
    name:  svr-cloud-care
  cloud:
    config:
      failFast: true