lulihong 3 лет назад
Родитель
Сommit
8c2eeac177

+ 9 - 1
common/common-entity/src/main/java/com/yihu/jw/entity/base/searchClient/BaseSearchNoveltyRepeatDO.java

@ -32,8 +32,16 @@ public class BaseSearchNoveltyRepeatDO extends UuidIdentityEntityWithOperator {
    private String reversion;                 //答复
   /* private String update_time;           //更新时间
    private String update_user_name;      //更新用户*/
    private String statusName;            //状态名称
  /*  public String getUpdate_time() {
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
/*  public String getUpdate_time() {
        return update_time;
    }

+ 2 - 0
common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@ -867,6 +867,8 @@ public class BaseRequestMapping {
        public static final String FINDALL = "/findAll";
        public static final String CHANGESTATUS = "/changestatus";
        public static final String REPLY = "/reply";
        public static final String FILEDOWNLOAD = "/fileDownLoad";
        public static final String FILEUPLOAD = "/fileUpLoad";
    }
}

+ 16 - 1
svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/searchClient/ClientSearchEndpoint.java

@ -2,19 +2,31 @@ package com.yihu.jw.base.endpoint.searchClient;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.fastdfs.FastDFSUtil;
import com.yihu.jw.base.service.clientSearch.ClientSearchService;
import com.yihu.jw.entity.base.searchClient.BaseSearchNoveltyRepeatDO;
import com.yihu.jw.entity.base.searchClient.FileResourceVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import java.util.Map;
/**
 * Created by wsy on 2021/9/4.
@ -27,6 +39,7 @@ public class ClientSearchEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private ClientSearchService clientSearchService;
    @PostMapping(value = BaseRequestMapping.ClientSearch.CREATE)
    @ApiOperation(value = "保存查新查重服务")
    public Envelop saveBaseSearchNoveltyRepeat(@ApiParam(name = "jsonData",value = "")
@ -80,7 +93,8 @@ public class ClientSearchEndpoint extends EnvelopRestEndpoint {
                                               @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize) throws Exception{
        try{
            List<BaseSearchNoveltyRepeatDO> list = clientSearchService.search(fields,filters,sorts,page,pageSize);
            return success(list);
            int count = (int) clientSearchService.getCount(filters);
            return success("success",200,list,count,page,pageSize);
        }catch (Exception e){
            return failedException(e);
        }
@ -116,4 +130,5 @@ public class ClientSearchEndpoint extends EnvelopRestEndpoint {
        }
    }
}

+ 24 - 0
svr/svr-base/src/main/java/com/yihu/jw/base/service/clientSearch/ClientSearchService.java

@ -38,6 +38,8 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
        //获取随机数
        int number = r.nextInt();
        baseSearchNoveltyRepeatDO.setNumber(Integer.toString(number).replace("-",""));
        baseSearchNoveltyRepeatDO.setStatus(1);
        baseSearchNoveltyRepeatDO.setStatusName("待接收");
        baseSearchNoveltyRepeatDO.setCreateTime(new Date());
        return baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
    }
@ -60,7 +62,22 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
    public void updateById(String id, Integer status) {
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findOne(id);
        if (baseSearchNoveltyRepeatDO != null){
            if(status == 1){
                baseSearchNoveltyRepeatDO.setStatusName("待接收");
            }
            if(status == 2){
                baseSearchNoveltyRepeatDO.setStatusName("办理中");
            }
            if(status == 3){
                baseSearchNoveltyRepeatDO.setStatusName("已退回");
            }
            if(status == 4){
                baseSearchNoveltyRepeatDO.setStatusName("已办结");
            }
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd HH:mm:ss");
            Date date = new Date();
           /* baseSearchNoveltyRepeatDO.setUpdate_time(sdf.format(date));*/
@ -82,4 +99,11 @@ public class ClientSearchService extends BaseJpaService<BaseSearchNoveltyRepeatD
            baseSearchNoveltyRepeatDao.save(baseSearchNoveltyRepeatDO);
        }
    }
    public BaseSearchNoveltyRepeatDO findFileById(String id){
        BaseSearchNoveltyRepeatDO baseSearchNoveltyRepeatDO = new BaseSearchNoveltyRepeatDO();
        baseSearchNoveltyRepeatDO = baseSearchNoveltyRepeatDao.findOne(id);
        return baseSearchNoveltyRepeatDO;
    }
}