diff --git a/.gitignore b/.gitignore index 09ec36308..e3c9eced6 100644 --- a/.gitignore +++ b/.gitignore @@ -50,4 +50,5 @@ rebel.xml application-my.yaml +application-local.yaml /yudao-ui-app/unpackage/ diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java similarity index 95% rename from yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java rename to yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java index f2122eca3..c50405389 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extContract/ExtContractMapper.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.cms.dal.mysql.extcontract; +package cn.iocoder.yudao.module.cms.dal.mysql.extContract; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java index 54234cbe4..dbb983b1f 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java @@ -2,14 +2,10 @@ package cn.iocoder.yudao.module.cms.service.contract; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceRespDTO; -import cn.iocoder.yudao.module.bpm.api.task.dto.BpmTaskRespDTO; import cn.iocoder.yudao.module.cms.dal.dataobject.contractHistory.ContractHistoryDO; import cn.iocoder.yudao.module.cms.dal.mysql.contract.ContractMapper; import cn.iocoder.yudao.module.cms.dal.mysql.contractHistory.ContractHistoryMapper; -import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum; -import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum; -import cn.iocoder.yudao.module.pms.api.ProjectApi; +import cn.iocoder.yudao.module.pms.api.project.ProjectApi; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; @@ -50,8 +46,6 @@ public class ContractServiceImpl implements ContractService { */ public static String VERSION = "1"; - - @Resource private ContractMapper contractMapper; @@ -67,9 +61,6 @@ public class ContractServiceImpl implements ContractService { @Resource private ContractHistoryMapper contractHistoryMapper; - @Resource - private BpmProcessInstanceApi bpmProcessInstanceApi; - @Override public Long createContract(Long loginUserId, ContractSaveReqVO createReqVO) { @@ -92,6 +83,7 @@ public class ContractServiceImpl implements ContractService { ProjectDetailRespDTO projectDetail = projectApi.getProjectDetailById(projectId); + //todo 待提取 String code = createReqVO.getCode(); String trackingDep = createReqVO.getTrackingDep(); String projectManager = createReqVO.getProjectManager(); @@ -232,11 +224,6 @@ public class ContractServiceImpl implements ContractService { contractRespVO.setTrackingDep(projectDetail.getTrackingDepName()); contractRespVO.setProjectManager(projectDetail.getProjectManagerName()); - // TODO 枚举优化 - contractRespVO.setType(ContractTypeEnum.getNoByCode(contractRespVO.getType())); - contractRespVO.setStatus(ContractStatusEnum.getNoByCode(contractRespVO.getStatus())); - contractRespVO.setCountType(ContractStatusEnum.getNoByCode(contractRespVO.getCountType())); - contractRespVO.setSource(ContractStatusEnum.getNoByCode(contractRespVO.getSource())); //分包合同商议提示 TODO 待优化 // ExtContractDO extContractDO = extContractMapper.selectOne("project_id", projectId); // LocalDateTime reminderTime = extContractDO.getReminderTime(); @@ -278,36 +265,6 @@ public class ContractServiceImpl implements ContractService { return pageResult; } - - @Override - public ContractProcessInstanceRespVO getContractProcess(Long id) { - validateContractExists(id); - //去历史里面找 - ContractHistoryDO contractHistory = contractHistoryMapper.selectOne("contract_id", id); - if (contractHistory == null) { - throw exception(CONTRACT_NOT_EXISTS); - } - //拿到历史之后 找到process_instance_id 和 status - String processInstanceId = contractHistory.getProcessInstanceId(); - String processStatus = contractHistory.getProcessStatus(); - //与当前流程里的进行比较 - String status = String.valueOf(bpmProcessInstanceApi.getProcessInstance(processInstanceId).getStatus()); - - //如果不相等 - if (!status.equals(processStatus)){ - //更新当前合同对应历史表里面的状态 - contractHistory.setProcessStatus(status); - contractHistoryMapper.updateById(contractHistory); - } - //返回给前端必要的数据 当前流程里面对应的数据 - BpmProcessInstanceRespDTO processInstance = bpmProcessInstanceApi.getProcessInstance(processInstanceId); - List tasks = bpmProcessInstanceApi.getTask(processInstanceId); - List taskList = BeanUtils.toBean(tasks, BpmProcessInstanceRespDTO.Task.class); - processInstance.setTasks(taskList); - - return BeanUtils.toBean(processInstance, ContractProcessInstanceRespVO.class); - } - @Override public BigDecimal getProvisionalSettlementById(Long id) { ContractDO contractDO = contractMapper.selectById(id); diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java index 2d59fee32..83100fe39 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contractHistory/ContractHistoryServiceImpl.java @@ -4,7 +4,7 @@ import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO; import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum; import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum; import cn.iocoder.yudao.module.cms.service.contract.ContractService; -import cn.iocoder.yudao.module.pms.api.ProjectApi; +import cn.iocoder.yudao.module.pms.api.project.ProjectApi; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java index c51e24470..a0279df8a 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontracthistory/ExtContractHistoryServiceImpl.java @@ -6,7 +6,7 @@ import cn.iocoder.yudao.module.cms.enums.ChargingStandardEnum; import cn.iocoder.yudao.module.cms.enums.ContractStatusEnum; import cn.iocoder.yudao.module.cms.enums.ContractTypeEnum; import cn.iocoder.yudao.module.cms.service.extContract.ExtContractService; -import cn.iocoder.yudao.module.pms.api.ProjectApi; +import cn.iocoder.yudao.module.pms.api.project.ProjectApi; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectDetailRespDTO; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java index acbf163d5..b90d68d0e 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontract/OutsContractServiceImpl.java @@ -17,7 +17,7 @@ import cn.iocoder.yudao.module.cms.dal.mysql.outscontract.OutsContractMapper; import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHistoryMapper; import cn.iocoder.yudao.module.cms.enums.*; import cn.iocoder.yudao.module.cms.service.contract.ContractService; -import cn.iocoder.yudao.module.pms.api.ProjectApi; +import cn.iocoder.yudao.module.pms.api.project.ProjectApi; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import jakarta.annotation.Resource; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java index 27d3a7ec8..9923a2ddf 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/outscontracthistory/OutsContractHistoryServiceImpl.java @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.cms.dal.mysql.outscontracthistory.OutsContractHis import cn.iocoder.yudao.module.cms.enums.CountTypeEnum; import cn.iocoder.yudao.module.cms.enums.OutsContractMajorEnum; import cn.iocoder.yudao.module.cms.service.contract.ContractService; -import cn.iocoder.yudao.module.pms.api.ProjectApi; +import cn.iocoder.yudao.module.pms.api.project.ProjectApi; import cn.iocoder.yudao.module.pms.api.project.dto.ProjectRespDTO; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml index a122ca19f..85486ea5f 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/resources/mapper/extContract/ExtContractMapper.xml @@ -1,6 +1,6 @@ - + + + \ No newline at end of file diff --git a/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/budgethistory/BudgetHistoryMapper.xml b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/budgethistory/BudgetHistoryMapper.xml new file mode 100644 index 000000000..e0c46a655 --- /dev/null +++ b/yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/budgethistory/BudgetHistoryMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file diff --git a/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/ContractHistoryForm.vue b/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/ContractHistoryForm.vue index 990199991..0ac5bcce9 100644 --- a/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/ContractHistoryForm.vue +++ b/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/ContractHistoryForm.vue @@ -77,7 +77,7 @@ - + @@ -110,7 +110,7 @@ - + diff --git a/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/index.vue b/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/index.vue index 607c9987c..d72a12619 100644 --- a/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/index.vue +++ b/yudao-ui/yudao-ui-admin-vue3-ContractHistory/src/views/cms/contracthistory/index.vue @@ -128,15 +128,6 @@ class="!w-240px" /> - - - - - - - + @@ -135,7 +135,7 @@ - + diff --git a/yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/index.vue b/yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/index.vue index 16737fea9..a04b76dd7 100644 --- a/yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/index.vue +++ b/yudao-ui/yudao-ui-admin-vue3-ExtContract/src/views/cms-ext/extcontract/index.vue @@ -171,15 +171,6 @@ class="!w-240px" /> - - - - - - - + diff --git a/yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue b/yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue index df3f8a0e0..01ccd5b0e 100644 --- a/yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue +++ b/yudao-ui/yudao-ui-admin-vue3-contract/src/views/cms/contract/index.vue @@ -119,15 +119,6 @@ class="!w-240px" /> - - -