From c6a50fa79fc40e5ea5da6018e4200ad3d7dd028b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 3 Oct 2023 04:29:03 +0800 Subject: [PATCH] 2.0 --- .../com/xm/core/service/XmAttachmentService.java | 2 +- .../xm/core/service/XmBranchStateHisService.java | 4 +++- .../core/service/XmBranchTaskTypeStateService.java | 2 +- .../com/xm/core/service/XmBudgetLaborService.java | 2 +- .../com/xm/core/service/XmBudgetNlaborService.java | 2 +- .../java/com/xm/core/service/XmCollectService.java | 13 +++++-------- .../com/xm/core/service/XmCostNlaborService.java | 2 +- .../java/com/xm/core/service/XmEnvListService.java | 2 +- .../java/com/xm/core/service/XmFileService.java | 2 +- .../java/com/xm/core/service/XmFuncService.java | 2 +- .../java/com/xm/core/service/XmGroupService.java | 2 +- .../com/xm/core/service/XmGroupStateService.java | 2 +- .../com/xm/core/service/XmGroupUserService.java | 2 +- .../com/xm/core/service/XmIterationService.java | 2 +- .../xm/core/service/XmIterationStateHisService.java | 2 +- .../xm/core/service/XmIterationStateService.java | 2 +- .../com/xm/core/service/XmMenuCommentService.java | 2 +- .../com/xm/core/service/XmMenuOperQxService.java | 2 +- .../java/com/xm/core/service/XmMenuPlanService.java | 2 +- .../java/com/xm/core/service/XmMenuService.java | 2 +- .../com/xm/core/service/XmMenuStateService.java | 2 +- .../java/com/xm/core/service/XmMyFocusService.java | 2 +- .../core/service/XmProductProjectLinkService.java | 2 +- .../java/com/xm/core/service/XmProductService.java | 2 +- .../xm/core/service/XmProductStateHisService.java | 2 +- .../com/xm/core/service/XmProductStateService.java | 2 +- .../xm/core/service/XmProjectContractService.java | 2 +- .../com/xm/core/service/XmProjectKpiHisService.java | 2 +- .../com/xm/core/service/XmProjectKpiService.java | 2 +- .../java/com/xm/core/service/XmProjectService.java | 2 +- .../xm/core/service/XmProjectStateHisService.java | 2 +- .../com/xm/core/service/XmProjectStateService.java | 2 +- .../core/service/XmProjectTaskTypeStateService.java | 2 +- .../xm/core/service/XmQuestionHandleService.java | 2 +- .../java/com/xm/core/service/XmQuestionService.java | 2 +- .../com/xm/core/service/XmQuestionTagService.java | 2 +- .../java/com/xm/core/service/XmRecordService.java | 2 +- .../com/xm/core/service/XmRecordVisitService.java | 2 +- .../com/xm/core/service/XmRptConfigService.java | 2 +- .../java/com/xm/core/service/XmRptDataService.java | 2 +- .../com/xm/core/service/XmTaskBidOrderService.java | 2 +- .../java/com/xm/core/service/XmTaskEvalService.java | 2 +- .../com/xm/core/service/XmTaskExecuserService.java | 2 +- .../com/xm/core/service/XmTaskOrderService.java | 2 +- .../xm/core/service/XmTaskSbillDetailService.java | 2 +- .../com/xm/core/service/XmTaskSbillService.java | 2 +- .../java/com/xm/core/service/XmTaskService.java | 2 +- .../com/xm/core/service/XmTaskSkillService.java | 2 +- .../java/com/xm/core/service/XmTestCaseService.java | 2 +- .../com/xm/core/service/XmTestCasedbService.java | 2 +- .../com/xm/core/service/XmTestPlanCaseService.java | 2 +- .../java/com/xm/core/service/XmTestPlanService.java | 2 +- .../java/com/xm/core/service/XmWorkloadService.java | 2 +- 53 files changed, 59 insertions(+), 60 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java b/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java index e180ef97..1259ab62 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmAttachmentService.java @@ -12,7 +12,7 @@ import java.util.List; * 实体 XmAttachment 表 XM.xm_attachment 当前主键(包括多主键): id; ***/ @Service("xm.core.xmAttachmentService") -public class XmAttachmentService extends BaseService { +public class XmAttachmentService extends BaseService { public void insertOrUpdate(String originId,String originType, List attachmentList) { XmAttachment del = new XmAttachment(); diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java index e92788ae..578f155c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchStateHisService.java @@ -1,6 +1,8 @@ package com.xm.core.service; import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmBranchStateHis; +import com.xm.core.mapper.XmBranchStateHisMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -13,7 +15,7 @@ import java.util.Map; * 实体 XmBranchStateHis 表 xm_branch_state_his 当前主键(包括多主键): biz_date,branch_id; ***/ @Service("xm.core.xmBranchStateHisService") -public class XmBranchStateHisService extends BaseService { +public class XmBranchStateHisService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmBranchStateHisService.class); public List> listXmBranchFiveDayTaskCnt(Map xmBranchStateHis) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java index 943645a9..44569b14 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBranchTaskTypeStateService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmBranchTaskTypeState 表 XM.xm_branch_task_type_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmBranchTaskTypeStateService") -public class XmBranchTaskTypeStateService extends BaseService { +public class XmBranchTaskTypeStateService extends BaseService { public void loadProjectTaskTypeStateToXmBranchTaskTypeState(String branchId) { this.update("loadProjectTaskTypeStateToXmBranchTaskTypeState", branchId); diff --git a/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java b/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java index d8505daf..0a279c9e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBudgetLaborService.java @@ -13,7 +13,7 @@ import java.util.Map; * 实体 XmBudgetLabor 表 xm_budget_labor 当前主键(包括多主键): id; ***/ @Service("xm.core.xmBudgetLaborService") -public class XmBudgetLaborService extends BaseService { +public class XmBudgetLaborService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmBudgetLaborService.class); public List> listSum(Map xmBudgetLabor) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java b/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java index 2fb387d6..90d9b095 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmBudgetNlaborService.java @@ -13,7 +13,7 @@ import java.util.Map; * 实体 XmBudgetNlabor 表 xm_budget_nlabor 当前主键(包括多主键): id; ***/ @Service("xm.core.xmBudgetNlaborService") -public class XmBudgetNlaborService extends BaseService { +public class XmBudgetNlaborService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmBudgetNlaborService.class); public List> listSum(Map xmBudgetNlabor) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmCollectService.java b/xm-core/src/main/java/com/xm/core/service/XmCollectService.java index 5938a6db..3b531c29 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmCollectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmCollectService.java @@ -2,18 +2,15 @@ package com.xm.core.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.mdp.core.service.BaseService; +import com.xm.core.entity.XmCollect; +import com.xm.core.mapper.XmCollectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service; -import com.mdp.core.service.BaseService; -import static com.mdp.core.utils.BaseUtils.*; -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; -import com.xm.core.entity.XmCollect; -import com.xm.core.mapper.XmCollectMapper; +import java.util.List; +import java.util.Map; /** * @author maimeng-mdp code-gen * @since 2023-10-3 diff --git a/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java b/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java index fc5c87c5..72795c1e 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmCostNlaborService.java @@ -13,7 +13,7 @@ import java.util.Map; * 实体 XmCostNlabor 表 xm_cost_nlabor 当前主键(包括多主键): id; ***/ @Service("xm.core.xmCostNlaborService") -public class XmCostNlaborService extends BaseService { +public class XmCostNlaborService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmCostNlaborService.class); public List> listSum(Map xmCostNlabor) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java index 5aab39c2..9a3ab002 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmEnvListService.java @@ -19,7 +19,7 @@ import java.util.Map; * 实体 XmEnvList 表 XM.xm_env_list 当前主键(包括多主键): id; ***/ @Service("xm.core.xmEnvListService") -public class XmEnvListService extends BaseService { +public class XmEnvListService extends BaseService { public void addEnv(XmEnvList xmEnvList) { xmEnvList.setId(this.createKey("id")); diff --git a/xm-core/src/main/java/com/xm/core/service/XmFileService.java b/xm-core/src/main/java/com/xm/core/service/XmFileService.java index 62c0b4b4..b892cb33 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmFileService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmFileService.java @@ -23,7 +23,7 @@ import java.util.Map; * 实体 XmFile 表 XM.xm_file 当前主键(包括多主键): id; ***/ @Service("xm.core.xmFileService") -public class XmFileService extends BaseService { +public class XmFileService extends BaseService { final String Type = "文档"; diff --git a/xm-core/src/main/java/com/xm/core/service/XmFuncService.java b/xm-core/src/main/java/com/xm/core/service/XmFuncService.java index ec25152d..681f4d1f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmFuncService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmFuncService.java @@ -17,7 +17,7 @@ import java.util.stream.Collectors; * 实体 XmFunc 表 xm_func 当前主键(包括多主键): id; ***/ @Service("xm.core.xmFuncService") -public class XmFuncService extends BaseService { +public class XmFuncService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmFuncService.class); diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java index eb4f9623..17c84a19 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmGroupService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmGroupService.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * 实体 XmProjectGroup 表 XM.xm_group 当前主键(包括多主键): id; ***/ @Service("xm.core.xmGroupService") -public class XmGroupService extends BaseService { +public class XmGroupService extends BaseService { @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java index 0205c6c0..f910a935 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmGroupStateService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmProjectGroupState 表 XM.xm_group_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmGroupStateService") -public class XmGroupStateService extends BaseService { +public class XmGroupStateService extends BaseService { /** * 计算bug、task、测试案例、等数据 diff --git a/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java b/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java index f840af2b..44d60671 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmGroupUserService.java @@ -12,7 +12,7 @@ import java.util.List; * 实体 XmProjectGroupUser 表 XM.xm_group_user 当前主键(包括多主键): id; ***/ @Service("xm.core.xmGroupUserService") -public class XmGroupUserService extends BaseService { +public class XmGroupUserService extends BaseService { @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java index 23030063..4b63c11f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationService.java @@ -14,7 +14,7 @@ import java.util.Map; * 实体 XmIteration 表 XM.xm_iteration 当前主键(包括多主键): id; ***/ @Service("xm.core.xmIterationService") -public class XmIterationService extends BaseService { +public class XmIterationService extends BaseService { diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java index faf6199a..03f0eb41 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateHisService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 实体 XmIterationStateHis 表 xm_iteration_state_his 当前主键(包括多主键): iteration_id,biz_date; ***/ @Service("xm.core.xmIterationStateHisService") -public class XmIterationStateHisService extends BaseService { +public class XmIterationStateHisService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmIterationStateHisService.class); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java index 01b04865..b7e54706 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmIterationStateService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmIterationState 表 XM.xm_iteration_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmIterationStateService") -public class XmIterationStateService extends BaseService { +public class XmIterationStateService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java index 238e2f0c..766b58bc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuCommentService.java @@ -14,7 +14,7 @@ import java.util.Map; * 实体 XmMenuComment 表 xm_menu_comment 当前主键(包括多主键): id; ***/ @Service("xm.core.xmMenuCommentService") -public class XmMenuCommentService extends BaseService { +public class XmMenuCommentService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmMenuCommentService.class); diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java index b5ce5faa..ea34e705 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuOperQxService.java @@ -16,7 +16,7 @@ import java.util.List; * 实体 XmMenu 表 XM.xm_menu 当前主键(包括多主键): menu_id; ***/ @Service("xm.core.xmProductOperQxService") -public class XmMenuOperQxService extends BaseService { +public class XmMenuOperQxService extends BaseService { @Override diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java index 1d20ef2d..8faa46cc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java @@ -16,7 +16,7 @@ import java.util.*; * 实体 XmMenuPlan 表 XM.xm_menu_plan 当前主键(包括多主键): id; ***/ @Service("xm.core.xmMenuPlanService") -public class XmMenuPlanService extends BaseService { +public class XmMenuPlanService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index ea1f072d..a5223177 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; * 实体 XmMenu 表 XM.xm_menu 当前主键(包括多主键): menu_id; ***/ @Service("xm.core.xmMenuService") -public class XmMenuService extends BaseService { +public class XmMenuService extends BaseService { @Autowired XmMenuStateService xmMenuStateService; diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java index ba5ac5c4..8fe32f50 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 实体 XmMenuState 表 XM.xm_menu_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmMenuStateService") -public class XmMenuStateService extends BaseService { +public class XmMenuStateService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java index 62460f3f..4231556f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMyFocusService.java @@ -16,7 +16,7 @@ import java.util.Map; * 实体 XmMyFocus 表 XM.xm_my_focus 当前主键(包括多主键): id; ***/ @Service("xm.core.xmMyFocusService") -public class XmMyFocusService extends BaseService { +public class XmMyFocusService extends BaseService { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java b/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java index 8de34830..07a048e3 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductProjectLinkService.java @@ -13,7 +13,7 @@ import java.util.List; * 实体 XmProductProjectLink 表 XM.xm_product_project_link 当前主键(包括多主键): project_id; ***/ @Service("xm.core.xmProductProjectLinkService") -public class XmProductProjectLinkService extends BaseService { +public class XmProductProjectLinkService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmProductProjectLinkService.class); List selectListByIterationId(String iterationId){ diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java index 7ade8f61..ab9b340a 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductService.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; * 实体 XmProduct 表 XM.xm_product 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProductService") -public class XmProductService extends BaseService { +public class XmProductService extends BaseService { @Value("${mdp.platform-branch-id:platform-branch-001}") diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java index dbb4ca06..492ffef3 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateHisService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 实体 XmProductStateHis 表 xm_product_state_his 当前主键(包括多主键): product_id,biz_date; ***/ @Service("xm.core.xmProductStateHisService") -public class XmProductStateHisService extends BaseService { +public class XmProductStateHisService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmProductStateHisService.class); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java index 31ffbd55..be56956f 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProductStateService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmProductState 表 XM.xm_product_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProductStateService") -public class XmProductStateService extends BaseService { +public class XmProductStateService extends BaseService { /** * 计算bug、task、测试案例、等数据 diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java index 12394cfa..87940e96 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectContractService.java @@ -14,7 +14,7 @@ import java.util.Map; * 实体 XmProjectContract 表 XM.xm_project_contract 当前主键(包括多主键): ht_id; ***/ @Service("xm.core.xmProjectContractService") -public class XmProjectContractService extends BaseService { +public class XmProjectContractService extends BaseService { diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java index 3d7ab781..46474b48 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiHisService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmProjectKpiHis 表 XM.xm_project_kpi_his 当前主键(包括多主键): kpi_id; ***/ @Service("xm.core.xmProjectKpiHisService") -public class XmProjectKpiHisService extends BaseService { +public class XmProjectKpiHisService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java index 4fc21126..7eb98dd0 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectKpiService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 实体 XmProjectKpi 表 XM.xm_project_kpi 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectKpiService") -public class XmProjectKpiService extends BaseService { +public class XmProjectKpiService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index ae256deb..6c4a12b8 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -29,7 +29,7 @@ import java.util.*; * 实体 XmProject 表 XM.xm_project 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectService") -public class XmProjectService extends BaseService { +public class XmProjectService extends BaseService { @Value("${mdp.platform-branch-id:platform-branch-001}") diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java index bff428d0..7941edd9 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateHisService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmProjectStateHis 表 XM.xm_project_state_his 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectStateHisService") -public class XmProjectStateHisService extends BaseService { +public class XmProjectStateHisService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java index f30d872d..336c5476 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectStateService.java @@ -13,7 +13,7 @@ import java.util.Map; * 实体 XmProjectState 表 XM.xm_project_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectStateService") -public class XmProjectStateService extends BaseService { +public class XmProjectStateService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java index e425bc0a..2f721d67 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectTaskTypeStateService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmProjectTaskTypeState 表 XM.xm_project_task_type_state 当前主键(包括多主键): id; ***/ @Service("xm.core.xmProjectTaskTypeStateService") -public class XmProjectTaskTypeStateService extends BaseService { +public class XmProjectTaskTypeStateService extends BaseService { public void loadTasksToXmProjectTaskTypeState(String projectId) { this.update("loadTasksToXmProjectTaskTypeState", projectId); diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java index da18ac92..ad83501b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionHandleService.java @@ -13,7 +13,7 @@ import java.util.List; * 实体 XmQuestionHandle 表 XM.xm_question_handle 当前主键(包括多主键): id; ***/ @Service("xm.core.xmQuestionHandleService") -public class XmQuestionHandleService extends BaseService { +public class XmQuestionHandleService extends BaseService { @Async public void batchAddAsync(List handles) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index beb808fb..949b4a0d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java @@ -25,7 +25,7 @@ import java.util.Map; * 实体 XmQuestion 表 XM.xm_question 当前主键(包括多主键): id; ***/ @Service("xm.core.xmQuestionService") -public class XmQuestionService extends BaseService { +public class XmQuestionService extends BaseService { @Autowired XmAttachmentService xmAttachmentService; diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java index 6685fe24..9fef79dd 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmQuestionTagService.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Service; * 实体 XmQuestionTag 表 XM.xm_question_tag 当前主键(包括多主键): id; ***/ @Service("xm.core.xmQuestionTagService") -public class XmQuestionTagService extends BaseService { +public class XmQuestionTagService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java index ded71ea0..9a9e1653 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordService.java @@ -21,7 +21,7 @@ import java.util.List; * 实体 XmRecord 表 XM.xm_record 当前主键(包括多主键): id; ***/ @Service("xm.core.xmRecordService") -public class XmRecordService extends BaseService { +public class XmRecordService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java b/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java index 28e61690..fa75446b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRecordVisitService.java @@ -14,7 +14,7 @@ import java.util.*; * 实体 XmRecordVisit 表 xm_record_visit 当前主键(包括多主键): id; ***/ @Service("xm.core.xmRecordVisitService") -public class XmRecordVisitService extends BaseService { +public class XmRecordVisitService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmRecordVisitService.class); public void batchAddAndCalc(List datas) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java b/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java index 00f430c0..2dd05b68 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRptConfigService.java @@ -17,7 +17,7 @@ import com.xm.core.entity.XmRptConfig; * 实体 XmRptConfig 表 xm_rpt_config 当前主键(包括多主键): id; ***/ @Service("xm.core.xmRptConfigService") -public class XmRptConfigService extends BaseService { +public class XmRptConfigService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmRptConfigService.class); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java b/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java index 3a6096ff..993b1350 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmRptDataService.java @@ -17,7 +17,7 @@ import com.xm.core.entity.XmRptData; * 实体 XmRptData 表 xm_rpt_data 当前主键(包括多主键): id; ***/ @Service("xm.core.xmRptDataService") -public class XmRptDataService extends BaseService { +public class XmRptDataService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmRptDataService.class); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java index 3f214ec4..e5c98471 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskBidOrderService.java @@ -27,7 +27,7 @@ import java.util.List; * 实体 XmTaskBidOrder 表 xm_task_bid_order 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskBidOrderService") -public class XmTaskBidOrderService extends BaseService { +public class XmTaskBidOrderService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskBidOrderService.class); @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java index 9e984b38..4f26e528 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskEvalService.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * 实体 XmTaskEval 表 xm_task_eval 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskEvalService") -public class XmTaskEvalService extends BaseService { +public class XmTaskEvalService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskEvalService.class); public MyTotalEval getServiceProviderEval(User user) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java index b673aad5..632c2305 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskExecuserService.java @@ -24,7 +24,7 @@ import java.util.*; * 实体 XmTaskExecuser 表 XM.xm_task_execuser 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskExecuserService") -public class XmTaskExecuserService extends BaseService { +public class XmTaskExecuserService extends BaseService { /** 请在此类添加自定义函数 */ diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java index e2222149..28acdaa6 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskOrderService.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * 实体 XmTaskOrder 表 xm_task_order 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskOrderService") -public class XmTaskOrderService extends BaseService { +public class XmTaskOrderService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskOrderService.class); @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java index 0be8175e..a339f587 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillDetailService.java @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * 实体 XmTaskSbillDetail 表 xm_task_sbill_detail 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskSbillDetailService") -public class XmTaskSbillDetailService extends BaseService { +public class XmTaskSbillDetailService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskSbillDetailService.class); @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java index b615512d..e3cc573c 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSbillService.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 实体 XmTaskSbill 表 xm_task_sbill 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskSbillService") -public class XmTaskSbillService extends BaseService { +public class XmTaskSbillService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTaskSbillService.class); @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 5acb709b..1de77a35 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; * 实体 XmTask 表 XM.xm_task 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskService") -public class XmTaskService extends BaseService { +public class XmTaskService extends BaseService { final String TYPE = "任务"; diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java index 0a870d3d..9e5b2c16 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskSkillService.java @@ -13,7 +13,7 @@ import java.util.List; * 实体 XmTaskSkill 表 XM.xm_task_skill 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTaskSkillService") -public class XmTaskSkillService extends BaseService { +public class XmTaskSkillService extends BaseService { @Autowired diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java index 20cd0d73..11243e23 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCaseService.java @@ -12,7 +12,7 @@ import java.util.Map; * 实体 XmTestCase 表 XM.xm_test_case 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTestCaseService") -public class XmTestCaseService extends BaseService { +public class XmTestCaseService extends BaseService { public List> getXmTestCaseSort(Map xmTestCase) { return super.selectList("getXmTestCaseSort",xmTestCase); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java index 6c1e6847..c7b11227 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestCasedbService.java @@ -12,7 +12,7 @@ import java.util.List; * 实体 XmTestCasedb 表 xm_test_casedb 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTestCasedbService") -public class XmTestCasedbService extends BaseService { +public class XmTestCasedbService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTestCasedbService.class); public List getExistsPlanCasedbIds(List casedbIds) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java index 5911db02..6e77cc00 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanCaseService.java @@ -15,7 +15,7 @@ import java.util.Map; * 实体 XmTestPlanCase 表 xm_test_plan_case 当前主键(包括多主键): case_id,plan_id; ***/ @Service("xm.core.xmTestPlanCaseService") -public class XmTestPlanCaseService extends BaseService { +public class XmTestPlanCaseService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTestPlanCaseService.class); public List selectListByCaseIdsAndPlanId(String planId, List caseIds) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java index 738385de..b41b6514 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTestPlanService.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 实体 XmTestPlan 表 xm_test_plan 当前主键(包括多主键): id; ***/ @Service("xm.core.xmTestPlanService") -public class XmTestPlanService extends BaseService { +public class XmTestPlanService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmTestPlanService.class); public void calcXmTestPlan(String id) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java index 3a525d7b..d272236d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmWorkloadService.java @@ -16,7 +16,7 @@ import java.util.Map; * 实体 XmWorkload 表 xm_workload 当前主键(包括多主键): id; ***/ @Service("xm.core.xmWorkloadService") -public class XmWorkloadService extends BaseService { +public class XmWorkloadService extends BaseService { static Logger logger =LoggerFactory.getLogger(XmWorkloadService.class); @Autowired