修改

jinlin

2024-02-01 2df883fcbed176f83d8d144fd007e7f72fcb54d6

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

@@ -2,9 +2,19 @@

import cn.hutool.core.convert.Convert;
import com.zt.common.service.BaseService;
import com.zt.common.utils.UUIDUtil;
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;
import com.zt.life.modules.configItemWarehouse.model.WarehouseCmAudit;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.model.WarehouseQaAudit;
import com.zt.life.modules.configItemWarehouse.service.ConfigItemWarehouseService;
import com.zt.life.modules.configItemWarehouse.service.WarehouseCmAuditService;
import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
import com.zt.life.modules.configItemWarehouse.service.WarehouseQaAuditService;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
@@ -17,6 +27,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.life.sys.service.SysOssConfigService;
import com.zt.modules.coderule.service.SysCodeRuleService;
import com.zt.modules.oss.model.SysOss;
import com.zt.modules.oss.service.SysOssService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
@@ -28,6 +39,7 @@
import javax.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -71,6 +83,17 @@
    @Autowired
    private GetFilesPath getFilesPath;

    @Autowired
    private ConfigItemWarehouseService configItemWarehouseService;

    @Autowired
    private WarehouseCmAuditService cmAuditService;

    @Autowired
    private WarehouseQaAuditService qaAuditService;

    @Autowired
    private WarehouseConfigItemService configItemService;

    /**
     * 分页查询
@@ -79,14 +102,20 @@
     * @return
     */
    public List<ItemCirculatOrder> page(QueryFilter queryFilter) {
        List<ItemCirculatOrder> list= baseDao.getList(queryFilter.getQueryParams());
        User user = UserContext.getUser();
        Integer secretClass = user.getSecretClass();
        Long deptId = user.getDeptId();
        queryFilter.getQueryParams().put("secretClass",secretClass);
        queryFilter.getQueryParams().put("deptId",deptId);
        List<ItemCirculatOrder> list = baseDao.getList(queryFilter.getQueryParams());
        if (list.size() > 0) {
            workflowService.getRunFlow(list, "wplz");
        }
        return list;
    }

    /**yi
    /**
     * yi
     * 删除
     *
     * @param ids
@@ -95,9 +124,13 @@
        super.deleteLogic(ids);
    }

    public Boolean save(ItemCirculatOrderDto itemCirculatOrderDto) {
        Long circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
        if (circulatOrderid != null)
    public Long save(ItemCirculatOrderDto itemCirculatOrderDto) {
        User user = UserContext.getUser();
        String userName=user.getRealName();
        String userNameId=user.getId().toString();
        Long configItemWarehouseId = 0L;
        Long circulatOrderId = itemCirculatOrderDto.getCirculatOrder().getId();
        if (circulatOrderId != null)
            baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
        else {
            Map<String, String> map = new HashMap<>();
@@ -106,22 +139,24 @@
            itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
            itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
            circulatOrderid = itemCirculatOrderDto.getCirculatOrder().getId();
            circulatOrderId = itemCirculatOrderDto.getCirculatOrder().getId();
        }

        for (ItemCirculatOrderTechnical circulatOrderTechnical : itemCirculatOrderDto.getTechnicalList()) {
            circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
            if (circulatOrderTechnical.getId() != null) {
                technicalService.update(circulatOrderTechnical);
            } else {
                circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
                technicalService.insert(circulatOrderTechnical);
            if (circulatOrderTechnical.getName() != null) {
                circulatOrderTechnical.setCirculatOrderId(circulatOrderId);
                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) {
            itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderid);
            itemCirculatOrderDto.getTestAgencyInfo().setId(circulatOrderId);
            testAgencyInfoService.insert(itemCirculatOrderDto.getTestAgencyInfo());
        } else {
            testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
@@ -133,25 +168,87 @@
        if (flowInfoDto != null && flowInfoDto.getSubmitType() != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
            if ("tj".equals(flowInfoDto.getSubmitType())) {
                workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
            } else {
                if ("wplz_wprk".equals(flowInfoDto.getStepIdMark()) && "bl".equals(flowInfoDto.getSubmitType())) {
                    String Code = itemCirculatOrderDto.getCirculatOrder().getCode();
                    configItemWarehouseId = UUIDUtil.generateId();
                    ConfigItemWarehouse configItemWarehouse = new ConfigItemWarehouse();
                    configItemWarehouse.setId(configItemWarehouseId);
                    configItemWarehouse.setProjectId(itemCirculatOrderDto.getProjectId());
                    configItemWarehouse.setLibraryType("1");
                    Map<String, String> map = new HashMap<>();
                    map.put("funCode", "config_item_warehouse");
                    map.put("projectId", itemCirculatOrderDto.getProjectId().toString());
                    configItemWarehouse.setCode(sysCodeRuleService.getNewCode(map));
                    // insert
                    configItemWarehouseService.insert(configItemWarehouse);
                    Long WarehouseConfigItemId = 0L;
                    for (int i = 0; i < itemCirculatOrderDto.getTechnicalList().size(); i++) {
                        ItemCirculatOrderTechnical circulatOrderTechnical = itemCirculatOrderDto.getTechnicalList().get(i);
                        Long circulatOrderTechnicalId = circulatOrderTechnical.getId();
                        WarehouseConfigItemId = UUIDUtil.generateId();

                        WarehouseConfigItem warehouseConfigItem = new WarehouseConfigItem();

                        warehouseConfigItem.setId(WarehouseConfigItemId);
                        warehouseConfigItem.setProjectId(itemCirculatOrderDto.getProjectId());
                        warehouseConfigItem.setLibraryType("1");
                        warehouseConfigItem.setSrcId(circulatOrderTechnicalId);
                        warehouseConfigItem.setWarehouseId(configItemWarehouseId);
                        warehouseConfigItem.setNo(circulatOrderTechnical.getNo());
                        String itemName = circulatOrderTechnical.getName();
                        itemName = itemName.replace(Code, "");
                        warehouseConfigItem.setItemName(itemName);
                        warehouseConfigItem.setItemIdentify(circulatOrderTechnical.getName());
                        warehouseConfigItem.setVersion(circulatOrderTechnical.getIdentify());
                        warehouseConfigItem.setSecretClass(circulatOrderTechnical.getSecretClass());
                        // insert
                        configItemService.insert(warehouseConfigItem);
                        List<SysOss> sysOssList = sysOssService.getSysOssByBusiIdAnd(circulatOrderTechnicalId, "circulat_order");
                        for (SysOss sysOss : sysOssList) {
                            sysOss.setId(UUIDUtil.generateId());
                            sysOss.setBusiId(WarehouseConfigItemId);
                            sysOss.setBusiType("config_item_warehouse");
                            sysOss.setBusiTypeName("配置项入库");
                            sysOss.setBusiField("config_item_warehouse");
                            sysOss.setBusiFieldName("配置项入库");
                            sysOssService.insert(sysOss);
                        }
                    }
                    List<WarehouseCmAudit> cmList = configItemWarehouseService.itemCmList("warehouse_cm_audit");
                    for (WarehouseCmAudit cmAudit : cmList) {
                        cmAudit.setWarehouseId(configItemWarehouseId);
                        cmAuditService.insert(cmAudit);
                    }
                    List<WarehouseQaAudit> qaList = configItemWarehouseService.itemQaList("warehouse_qa_audit");
                    for (WarehouseQaAudit qaAudit : qaList) {
                        qaAudit.setWarehouseId(configItemWarehouseId);
                        qaAuditService.insert(qaAudit);
                    }
                }
            }
            if ("wplz_wprk".equals(flowInfoDto.getStepIdMark())){
                itemCirculatOrderDto.getCirculatOrder().setIssueSituation("1");
                baseDao.updateById(itemCirculatOrderDto.getCirculatOrder());
            }
            workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
        }
        return true;
        return configItemWarehouseId;
    }

    public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderid) {
    public ItemCirculatOrderDto getDto(Long projectId, Long circulatOrderId) {
        ItemCirculatOrderDto data = new ItemCirculatOrderDto();
        if (circulatOrderid != null) {
            data.setId(circulatOrderid);
            ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
        if (circulatOrderId != null) {
            data.setId(circulatOrderId);
            ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderId);
            data.setCirculatOrder(itemCirculatOrder);
            if (projectId == null) {
                projectId = itemCirculatOrder.getProjectId();
            }

            data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderid));
            data.setTestAgencyInfo(testAgencyInfoService.get(circulatOrderId));

            List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderid);
            List<ItemCirculatOrderTechnical> technicalList = technicalService.getList(circulatOrderId);
            data.setTechnicalList(technicalList);

        } else {
@@ -176,7 +273,7 @@
        }
        if (data.getTestAgencyInfo() == null)
            data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
        if (circulatOrderid != null) {
        if (circulatOrderId != null) {
            for (ItemCirculatOrderTechnical technical : data.getTechnicalList()) {
                Long technicalId = technical.getId();
                OssDto ossDto = sysOssConfigService.getOssByBusiType(technicalId, "circulat_order");
@@ -192,12 +289,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 +312,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);