代码修改

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

@@ -1,10 +1,12 @@
package com.yihu.jw.entity.care.lifeCare;
import com.yihu.jw.entity.UuidIdentityEntity;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
/**
@@ -26,6 +28,8 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    private String serveStandard;//服务标准标准
    private String orgCode;//服务机构
    private String orgName;//服务机构名称
    private String orgPhoto;
    private String address;
    public String getCode() {
        return code;
@@ -123,4 +127,22 @@ public class LifeCareItemDictDO extends UuidIdentityEntity{
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Transient
    public String getOrgPhoto() {
        return orgPhoto;
    }
    public void setOrgPhoto(String orgPhoto) {
        this.orgPhoto = orgPhoto;
    }
    @Transient
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
}

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

@@ -349,11 +349,12 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        String sql = " select * from base_life_care_item_dict where 1=1 " ;
        String sql = " select dict.*,org.address,org.photo as orgPhoto 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 org_code='"+orgCode+"' ";
            sql += " and dict.org_code='"+orgCode+"' ";
        }
        sql+=  " and del=1 order by sort asc  ";
        sql+=  " and dict.del=1 order by dict.sort asc  ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        return list;
    }