代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/family/dao/BasePatientMemberDictDao.java

@@ -1,17 +1,14 @@
package com.yihu.jw.hospital.family.dao;
import com.yihu.jw.entity.hospital.family.BasePatientMemberDictDO;
import com.yihu.jw.entity.hospital.family.WlyyPatientFamilyMemberDO;
import org.checkerframework.checker.units.qual.A;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface BasePatientMemberDictDao extends JpaRepository<BasePatientMemberDictDO, String>, JpaSpecificationExecutor<BasePatientMemberDictDO> {
    @Query("from BasePatientMemberDictDO t where t.isDel = 1")
    @Query(value = "select * from base_patient_member_dict t where t.is_del = '1' order by is_sort ",nativeQuery = true)
    List<BasePatientMemberDictDO> findDictAll();
    @Query("from BasePatientMemberDictDO t where t.relationName = ?1 and t.isDel = 1")
    BasePatientMemberDictDO findByRelationName(String illness);

business/base-service/src/main/java/com/yihu/jw/hospital/integrate/service/BaseHospitalActivityService.java

@@ -168,8 +168,8 @@ public class BaseHospitalActivityService extends BaseJpaService<BaseHospitalActi
     * 查询活动列表
     */
    public MixEnvelop selectByCondition(String title, Integer page, Integer size,Integer flag,Integer status,String startTime,String endTime,String user,String userId){
//        String orderBy = "  order by sort asc,create_time desc  ";
        String orderBy = "  order by create_time desc  ";
        String orderBy = "  order by sort asc,create_time desc  ";
//        String orderBy = "  order by create_time desc  ";
        String condition = " ";
        String sql = "SELECT\n" +
                "\tid,\n" +

business/base-service/src/main/java/com/yihu/jw/hospital/integrate/service/BaseHospitalGoodsService.java

@@ -204,7 +204,7 @@ public class BaseHospitalGoodsService extends BaseJpaService<BaseHospitalGoodsDO
    /**
     * 查询商品兑换记录
     */
    public MixEnvelop selectGoodsExchageByCondition(String name,String user,String startTime,String endTime,Integer page, Integer size){
    public MixEnvelop selectGoodsExchageByCondition(String name,String user,String type,String startTime,String endTime,Integer page, Integer size){
        String orderBy = "  order by create_time desc  ";
        String condition = " ";
        String sql = "SELECT\n" +
@@ -231,6 +231,9 @@ public class BaseHospitalGoodsService extends BaseJpaService<BaseHospitalGoodsDO
        if (StringUtils.isNoneBlank(user)){
            condition +=" and user = '"+user+"' ";
        }
        if (StringUtils.isNoneBlank(type)){
            condition +=" and type = '"+type+"' ";
        }
        if (StringUtils.isNoneBlank(startTime)){
            condition +=" and create_time >= '"+startTime+"' ";
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/integrate/BaseHospitalGoodsController.java

@@ -2,16 +2,13 @@ package com.yihu.jw.hospital.endpoint.integrate;
import com.yihu.jw.entity.hospital.integrate.BaseHospitalGoodsDO;
import com.yihu.jw.entity.hospital.integrate.BaseHospitalMedalDO;
import com.yihu.jw.hospital.integrate.service.BaseHospitalGoodsService;
import com.yihu.jw.hospital.integrate.service.BaseHospitalMedalService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -125,12 +122,14 @@ public class BaseHospitalGoodsController extends EnvelopRestEndpoint {
                                     @RequestParam(value = "name", required = false) String name,
                                     @ApiParam(name = "user", value = "用户编码", required = false)
                                     @RequestParam(value = "user", required = false) String user,
                                     @ApiParam(name = "type", value = "类型", required = false)
                                     @RequestParam(value = "type", required = false) String type,
                                     @ApiParam(name = "startTime", value = "开始时间", required = false)
                                     @RequestParam(value = "startTime", required = false) String startTime,
                                     @ApiParam(name = "endTime", value = "结束时间", required = false)
                                     @RequestParam(value = "endTime", required = false) String endTime) {
        try {
            return success(hospitalGoodsService.selectGoodsExchageByCondition(name,user,startTime,endTime,page,size));
            return success(hospitalGoodsService.selectGoodsExchageByCondition(name,user,type,startTime,endTime,page,size));
        }catch (Exception e){
            return failedException(e);
        }