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

business/es-service/pom.xml

@@ -16,7 +16,6 @@
    <dependencies>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
@@ -46,11 +45,6 @@
            <artifactId>base-service</artifactId>
            <version>2.0.0</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>
            <version>${verion.fastjson}</version>
        </dependency>
        <!--elasticsearch start-->
        <dependency>
            <groupId>org.nlpcn</groupId>

common/common-entity/src/main/java/com/yihu/jw/entity/care/lifeCare/LifeCareItemDictDO.java

@@ -8,6 +8,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
 * Created by yeshijie on 2021/3/26.
@@ -30,6 +32,7 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    private String orgName;//服务机构名称
    private String orgPhoto;
    private String address;
    private List orgInfo;
    public String getCode() {
        return code;
@@ -145,4 +148,13 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    public void setAddress(String address) {
        this.address = address;
    }
    @Transient
    public List getOrgInfo() {
        return orgInfo;
    }
    public void setOrgInfo(List orgInfo) {
        this.orgInfo = orgInfo;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/lifeCare/LifeCareEndpoint.java

@@ -11,10 +11,7 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -77,7 +74,7 @@ public class LifeCareEndpoint extends EnvelopRestEndpoint {
    @ApiOperation("获取服务详情")
    @RequestMapping(value = "/getLifeItemDetail",method = RequestMethod.GET)
    public ObjEnvelop getLifeItemDetail(@ApiParam(name = "code",value = "服务项code",required = true)
                                    @RequestParam(value = "code",required = false)String id){
                                    @RequestParam(value = "code",required = true)String id){
        try {
            return success(lifeCareService.getLifeItemDetail(id));
        }catch (Exception e){
@@ -85,4 +82,20 @@ public class LifeCareEndpoint extends EnvelopRestEndpoint {
        }
    }
    @ApiOperation("删除服务项/机构服务项")
    @PostMapping(value = "/delLifeItem")
    public Envelop delLifeItem(@ApiParam(name = "code", value = "服务项code", required = true)
                               @RequestParam(value = "code", required = true) String code,
                               @ApiParam(name = "orgCode", value = "机构code", required = false)
                               @RequestParam(value = "orgCode", required = false) String orgCode) {
        try {
            return success(lifeCareService.delLifeItem(code, orgCode));
        } catch (Exception e) {
            return failedException2(e);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/lifeCare/LifeCareService.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
@@ -26,14 +27,16 @@ public class LifeCareService {
    /**
     * 1.7.6
     * 一个服务项会对应多个机构
     * 获取服务项目列表
     */
    public PageEnvelop<List<Map<String,Object>>> getServeDictList(String orgName, String itemName, Integer page, Integer size){
        String sql = "SELECT dict.id,dict.`name`,dict.sort,dict.`code`,dict.life_care_img,dict.pad_icon_img,GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode" +
        String sql = "SELECT dict.id,dict.`name`,dict.sort,dict.`code`,dict.life_care_img as lifeCareImg,dict.pad_icon_img as padIconImg,GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode" +
                ",GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName FROM " +
                "base_life_care_item_dict dict INNER JOIN base_org org ON dict.org_code = org.CODE WHERE dict.del = 1  AND org.del = 1" ;
                "base_life_care_item_dict dict INNER JOIN base_org org ON dict.org_code = org.CODE WHERE  org.del = 1" ;
        String sqlCount = " select count(dict.id) from base_life_care_item_dict dict INNER JOIN base_org org on dict.org_code = org.code  where dict.del=1 and org.del=1  ";
        String sqlCount = " select count(dict.id) from base_life_care_item_dict dict INNER JOIN base_org org on dict.org_code = org.code  where  org.del=1  ";
        String filter = " ";
        if (StringUtils.isNotBlank(orgName)){
            filter +=" and org.name like '%"+orgName+"%' ";
@@ -53,9 +56,9 @@ public class LifeCareService {
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
    }
    @Transactional(rollbackFor = Exception.class)
    public String saveLifeItem(String json) {
        List<LifeCareItemDictDO> lifeCareItemDictDO = JSONArray.parseArray(json, LifeCareItemDictDO.class);
        if (lifeCareItemDictDO.size() > 0 && StringUtils.isBlank(lifeCareItemDictDO.get(0).getId())) {
            String code = "";
            Boolean notExist = true;
@@ -68,23 +71,48 @@ public class LifeCareService {
            }
        }
        String lifeItemCode = lifeCareItemDictDO.get(0).getCode();
        String delOrgLifeItemSql = "DELETE FROM base_life_care_item_dict where code ='"+lifeItemCode+"' ";
        jdbcTemplate.update(delOrgLifeItemSql);
        lifeCareItemDictDao.save(lifeCareItemDictDO);
        return "success";
    }
    public String updDelLifeItem(String code,Integer status,String orgCode){
        LifeCareItemDictDO lifeCareItemDictDO = lifeCareItemDictDao.findByCodeAndOrgCode(code,orgCode);
        if(null == lifeCareItemDictDO){
    public String updDelLifeItem(String code, Integer status, String orgCode) {
        String sql = "select * from base_life_care_item_dict  where code = '" + code + "' ";
        if (StringUtils.isNotBlank(orgCode)) {
            sql += " and orgCode = '" + orgCode + "'";
        }
        List<LifeCareItemDictDO> lifeCareItemDictDOList = jdbcTemplate.queryForList(sql, LifeCareItemDictDO.class);
        if (lifeCareItemDictDOList.size() < 1) {
            return " 未找到改服务项目 ";
        }
        lifeCareItemDictDO.setDel(status);
        lifeCareItemDictDao.save(lifeCareItemDictDO);
        lifeCareItemDictDOList.stream().forEach(lifeCareItemDictObj -> lifeCareItemDictObj.setDel(status));
        lifeCareItemDictDao.save(lifeCareItemDictDOList);
        return "success";
    }
    @Transactional(rollbackFor = Exception.class)
    public String delLifeItem(String code, String orgCode){
        String sql = "DELETE FROM base_life_care_item_dict where code = '"+code+"'";
        if (StringUtils.isNotBlank(orgCode)) {
            sql+= " and orgCode ='"+orgCode+"'";
        }
        jdbcTemplate.update(sql);
        return "success";
    }
    public JSONObject getLifeItemDetail(String code){
        JSONObject result = new JSONObject();
        String lifeSql = "SELECT code,name,sort,del*1 as del,life_care_img AS lifeCareImg,org_code AS orgCode,org_name AS orgName,charge_standard AS chargeStandard," +
        String lifeSql = "SELECT id,code,name,sort,del*1 as del,life_care_img AS lifeCareImg,pad_icon_img as padIconImg,org_code AS orgCode,org_name AS orgName,charge_standard AS chargeStandard," +
                "serve_standard AS serveStandard,remark FROM base_life_care_item_dict WHERE `code` = '"+code+"' ";
        List<Map<String, Object>> lifeList = jdbcTemplate.queryForList(lifeSql);
@@ -96,6 +124,7 @@ public class LifeCareService {
            lifeItemObj.put("sort",lifeList.get(0).get("sort"));
            lifeItemObj.put("del",lifeList.get(0).get("del"));
            lifeItemObj.put("lifeCareImg",lifeList.get(0).get("lifeCareImg"));
            lifeItemObj.put("padIconImg",lifeList.get(0).get("padIconImg"));
            result.put("lifeItem",lifeItemObj);
        }
        result.put("data",lifeList);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -471,14 +471,27 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        String sql = "select dict.id,dict.`code`,dict.`name`,dict.serve_standard,org.address,org.photo as orgPhoto,GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName,\n" +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,GROUP_CONCAT( DISTINCT dict.charge_standard SEPARATOR ',' ) AS charge_standard ,dict.life_care_img,dict.pad_icon_img  from base_life_care_item_dict dict LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1\n" +
                " " ;
        String sql = "select dict.id,dict.`code`,dict.`name`,dict.remark," +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,dict.life_care_img,dict.pad_icon_img  " +
                " from base_life_care_item_dict dict LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1 " ;
        if (StringUtils.isNotBlank(orgCode)){
            sql += " and dict.org_code='"+orgCode+"' ";
        }
        sql+=  " and dict.del=1  GROUP BY dict.`code` order by dict.sort asc ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        list.stream().forEach(liftCareItemObj ->{
            if (StringUtils.isNotBlank(liftCareItemObj.getOrgCode())) {
                String replace = liftCareItemObj.getOrgCode().replace(",", "','");
                String orgSqlList = "SELECT dict.org_code AS orgCode,dict.org_name AS orgName,dict.charge_standard AS chargeStandard," +
                        " dict.serve_standard AS serveStandard,org.address,org.photo FROM base_life_care_item_dict dict " +
                        " LEFT JOIN base_org org  on dict.org_code = org.`code` WHERE dict.`code` = '10' and dict.del = 1 AND org.`code` in ('"+replace+"')";
                List<Map<String, Object>> orgList = jdbcTemplate.queryForList(orgSqlList);
                liftCareItemObj.setOrgInfo(orgList);
            }
        });
        return list;
    }