修改

jinlin

2023-12-07 547d68b874dc4bb51d6ac39cc0fec2c227028ef0

 modules/mainPart/src/main/java/com/zt/life/modules/testCheckOrder/service/TestCheckOrderService.java

@@ -17,6 +17,7 @@
import com.zt.life.sys.dto.OssDto;
import com.zt.modules.coderule.service.SysCodeRuleService;
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;
@@ -44,6 +45,9 @@

    @Autowired
    private SysCodeRuleService sysCodeRuleService;

    @Autowired
    private WorkflowService workflowService;


    /**
@@ -82,6 +86,7 @@

        } else {
            TestCheckOrder checkOrder = new TestCheckOrder();
            checkOrder.setPageCode(pageCode);
            data.setCheckOrder(checkOrder);
            List<TestCheckOrderList> checkOrderList = checkOrderListService.itemList(pageCode + "_check_item");
            data.setCheckOrderList(checkOrderList);
@@ -93,7 +98,7 @@
        return data;
    }

    public Boolean save(CheckOrderDto checkOrderDto) {
    public Long save(CheckOrderDto checkOrderDto) {
        Long checkId = checkOrderDto.getCheckOrder().getId();
        if (checkId != null)
            baseDao.updateById(checkOrderDto.getCheckOrder());
@@ -117,6 +122,16 @@
                checkOrderListService.insert(checkOrderList);
            }
        }
        return true;

        Long bizId = checkOrderDto.getCheckOrder().getId();
        FlowInfoDto flowInfoDto = checkOrderDto.getFlowInfoDto();

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