项目表

wente

2024-01-12 c21bf35f523ee1430fc5fa02ab1b4171492009b6

 modules/mainPart/src/main/java/com/zt/life/modules/itemCirculatOrder/service/ItemCirculatOrderService.java

@@ -2,6 +2,8 @@

import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.core.context.User;
import com.zt.core.context.UserContext;
import com.zt.life.export.dto.WordFile;
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.configItemWarehouse.model.ConfigItemWarehouse;
@@ -79,14 +81,18 @@
     * @return
     */
    public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
        List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
        User user = UserContext.getUser();
        Integer secretClass = user.getSecretClass();
        queryFilter.getQueryParams().put("secretClass",secretClass);
        List<ItemCirculatOrder> list = baseDao.getList(queryFilter.getQueryParams());
        if (list.size() > 0) {
            workflowService.getRunFlow(list, "wplz");
        }
        return list;
    }

    /**yi
    /**
     * yi
     * 删除
     *
     * @param ids
@@ -110,14 +116,16 @@
        }

        for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
            circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
            if (circulatOrderTechnical.getId() != null) {
                technicalService.update(circulatOrderTechnical);
            } else {
            if (circulatOrderTechnical.getName() != null) {
                circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
                technicalService.insert(circulatOrderTechnical);
                if (circulatOrderTechnical.getId() != null) {
                    technicalService.update(circulatOrderTechnical);
                } else {
                    circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
                    technicalService.insert(circulatOrderTechnical);
                }
                sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 保存附件
            }
            sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 保存附件
        }

        if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
@@ -192,12 +200,16 @@
        try {
            ItemCirculatOrderDto dataObj = this.getDto(null, id);

            String acceptorPath = "文件图片:"+ getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemAcceptorId()));
            String acceptorPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemAcceptorId()));
            dataObj.getCirculatOrder().setItemAcceptor(acceptorPath);
            String detectorPath = "文件图片:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getCalibratDetectorId()));
            String detectorPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getCalibratDetectorId()));
            dataObj.getCirculatOrder().setCalibratDetector(detectorPath);
            String issuerPath = "文件图片:"+getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemIssuerId()));
            String issuerPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getItemIssuerId()));
            dataObj.getCirculatOrder().setItemIssuer(issuerPath);
            String depositPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getDepositorId()));
            dataObj.getCirculatOrder().setDepositor(depositPath);
            String detectAcceptorPath = "文件图片:" + getFilesPath.getSignPath(Convert.toLong(dataObj.getCirculatOrder().getDetectAcceptorId()));
            dataObj.getCirculatOrder().setDetectAcceptor(detectAcceptorPath);
            //通用字典列表字符串生成
            String itemRequireStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getItemRequire(), "is_or_not", false);
            dataObj.getCirculatOrder().setItemRequireStr(itemRequireStr);
@@ -211,6 +223,12 @@
            String issueSituationStr = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getIssueSituation(), "is_or_not", false);
            dataObj.getCirculatOrder().setIssueSituationStr(issueSituationStr);

            String depositSituation = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getDepositSituation(), "is_or_not", false);
            dataObj.getCirculatOrder().setDepositSituation(depositSituation);

            String detectAcceptSituation = getShowDictList.getShowDictList(dataObj.getCirculatOrder().getDetectAcceptSituation(), "is_or_not", false);
            dataObj.getCirculatOrder().setDetectAcceptSituation(detectAcceptSituation);

            for (ItemCirculatOrderTechnical technical : dataObj.getTechnicalList()) {
                String value = technical.getSecretClass();
                String secretClassStr = getShowDictList.getShowDictList(value, "secret_class", false);