czt
2023-06-05 bf055224492ed78cf937bc94cfe7c33885f86989
优化嘉定纪委接口5
已删除1个文件
已修改4个文件
55 ■■■■■ 文件已修改
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/gd2022/dto/FinanceDto.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -94,7 +94,7 @@
                if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
                    continue;
                }
                fz35CheckItems = null;
                //获取入库质检信息
                fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
                if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
@@ -115,6 +115,9 @@
                //货位代码
                apiData.setHwdm(api1105.getHwdm());
                apiData.setRkywdh(apiData.getRkjydh());
                if(null == sysData.getFullWeightTime()){
                    sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
                }
                apiData.setQysj(sysData.getFullWeightTime());
                apiData.setQyrxm(sysData.getCheckUser());
                //扦样方式 2-智能随机
src/main/java/com/fzzy/push/gd2022/dto/FinanceDto.java
ÎļþÒÑɾ³ý
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -334,15 +334,16 @@
        shjdjwApi1310.setPznm(api1310.getLspzdm());
        shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
        shjdjwApi1310.setJylbbm(api1310.getJylb());
        if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
            String[] split = shjdjwApi1310.getJyxm().split(",");
            StringBuilder jyjl = new StringBuilder();
            for (String s : split) {
                jyjl.append(",合格");
            }
            shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
        }
//        if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
//            String[] split = shjdjwApi1310.getJyxm().split(",");
//            StringBuilder jyjl = new StringBuilder();
//            for (String s : split) {
//                jyjl.append(",合格");
//            }
//            shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
//        }
        //调整为传递检验值
        shjdjwApi1310.setJyjl(api1310.getJyxmz());
        shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
        //查询单位信息
        List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
@@ -2,17 +2,16 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = false)
public class ShjdjwApi1310 implements Serializable {
    @PropertyDef(label = "质检报告单号")
    @JsonProperty("Zjbgdbh")
    private String zjbgdbh;
    @PropertyDef(label = "单位名称")
src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
  port: 8088
  port: 8090
spring:
  datasource: