项目表

wente

2023-11-30 ddc3c5f70ed391c55dc83cc9d9e9c6d1fa672de5

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

@@ -6,6 +6,7 @@
import com.zt.core.sys.dto.DictLeafDto;
import com.zt.life.export.dto.WordFile;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderDao;
import com.zt.life.modules.itemCirculatOrder.dao.ItemCirculatOrderTechnicalDao;
import com.zt.life.modules.itemCirculatOrder.dto.ItemCirculatOrderDto;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrder;
import com.zt.life.modules.itemCirculatOrder.model.ItemCirculatOrderTechnical;
@@ -14,12 +15,16 @@
import com.zt.life.modules.project.service.ProjectService;
import com.zt.life.modules.project.service.SoftwareTestOrderService;
import com.zt.life.modules.sysBaseInfo.service.TestAgencyInfoService;
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.service.SysOssService;
import com.zt.modules.workflow.dto.FlowInfoDto;
import com.zt.modules.workflow.service.WorkflowService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.zt.common.db.query.QueryFilter;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -35,11 +40,11 @@
/**
 * item_circulat_order
 *
 * @author zt generator 
 * @author zt generator
 * @since 1.0.0 2023-11-22
 */
@Service
public class ItemCirculatOrderService  extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
public class ItemCirculatOrderService extends BaseService<ItemCirculatOrderDao, ItemCirculatOrder> {
    @Autowired
    private SysOssConfigService sysOssConfigService;

@@ -59,7 +64,8 @@
    private ItemCirculatOrderTechnicalService technicalService;

    @Autowired
    private SoftwareTestOrderService softwareTestOrderService;
    private WorkflowService workflowService;

    /**
     * 分页查询
     *
@@ -86,7 +92,7 @@
        else {
            Map<String, String> map = new HashMap<>();
            map.put("funCode", "item_circulat_order");
            map.put("projectId",itemCirculatOrderDto.getProjectId().toString());
            map.put("projectId", itemCirculatOrderDto.getProjectId().toString());
            itemCirculatOrderDto.getCirculatOrder().setProjectId(itemCirculatOrderDto.getProjectId());
            itemCirculatOrderDto.getCirculatOrder().setCode(sysCodeRuleService.getNewCode(map));
            baseDao.insert(itemCirculatOrderDto.getCirculatOrder());
@@ -101,6 +107,7 @@
                circulatOrderTechnical.setCirculatOrderId(circulatOrderid);
                technicalService.insert(circulatOrderTechnical);
            }
            sysOssConfigService.updateOss(circulatOrderTechnical.getId(), circulatOrderTechnical.getFiles());// 保存附件
        }

        if (itemCirculatOrderDto.getTestAgencyInfo().getId() == 10000) {
@@ -109,7 +116,16 @@
        } else {
            testAgencyInfoService.update(itemCirculatOrderDto.getTestAgencyInfo());
        }
        sysOssConfigService.updateOss(itemCirculatOrderDto.getId(), itemCirculatOrderDto.getFiles());// 保存附件

        Long bizId = itemCirculatOrderDto.getCirculatOrder().getId();
        FlowInfoDto flowInfoDto = itemCirculatOrderDto.getFlowInfoDto();

        if (flowInfoDto != null && "tj,bl".contains(flowInfoDto.getSubmitType())) {
            if ("tj".equals(flowInfoDto.getSubmitType())) {
                workflowService.startFlow(flowInfoDto.getFlowCode(), bizId);
            }
            workflowService.approvePass(flowInfoDto.getFlowCode(), bizId, flowInfoDto.getStepIdMark());
        }
        return true;
    }

@@ -119,8 +135,9 @@
            data.setId(circulatOrderid);
            ItemCirculatOrder itemCirculatOrder = this.get(circulatOrderid);
            data.setCirculatOrder(itemCirculatOrder);

            projectId = itemCirculatOrder.getProjectId();
            if (projectId==null){
                projectId = itemCirculatOrder.getProjectId();
            }

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

@@ -128,12 +145,11 @@
            data.setTechnicalList(technicalList);

        } else {
            ItemCirculatOrder itemCirculatOrder =new ItemCirculatOrder();
            ItemCirculatOrder itemCirculatOrder = new ItemCirculatOrder();
            data.setCirculatOrder(itemCirculatOrder);
            List<?> resultList = baseDao.itemList(projectId);
            List<?> resultList = technicalService.itemList(projectId);
            List<?> technicalList = resultList;
            data.setTechnicalList((List<ItemCirculatOrderTechnical>) technicalList);

        }

        if (projectId != null) {