chitanda 发布系统代码

app_CRM/src/components/app-mpicker/app-mpicker.vue

@@ -246,16 +246,7 @@ export default class AppMpicker extends Vue {
                 if (index >= 0) {
                     const item = this.items[index];
                     const params = { [this.deKeyField]: item[this.deKeyField], [this.deMajorField]: item[this.deMajorField] };
-                    if (isExist(this.extraFillParams)) {
-                        for (const key in this.extraFillParams) {
-                            if (this.extraFillParams.hasOwnProperty(key)) {
-                                const self = this.extraFillParams[key];
-                                if (isExist(item[self.key])) {
-                                    Object.assign(params, { [self.value]: item[self.key]});
-                                }
-                            }
-                        }
-                    }
+                    this.fillExtraValue(params, item);
                     val.push(params);
                 } else {
                     index = this.selectItems.findIndex((item: any) => Object.is(item[this.deKeyField], select));
@@ -355,16 +346,7 @@ export default class AppMpicker extends Vue {
                         let index = this.items.findIndex((item) => Object.is(item[this.deKeyField], select[this.deKeyField]));
                         if (index < 0) {
                             const params = { [this.deMajorField]: select[this.deMajorField], [this.deKeyField]: select[this.deKeyField] }
-                            if (isExist(this.extraFillParams)) {
-                                for (const key in this.extraFillParams) {
-                                    if (this.extraFillParams.hasOwnProperty(key)) {
-                                        const self = this.extraFillParams[key];
-                                        if (isExist(select[self.key])) {
-                                            Object.assign(params, { [self.value]: select[self.key]});
-                                        }
-                                    }
-                                }
-                            }
+                            this.fillExtraValue(params, select);
                             this.items.push(params);
                         }
                     });
@@ -387,7 +369,9 @@ export default class AppMpicker extends Vue {
         let result = [];
         if(this.deKeyField !== "srfkey" || this.deMajorField !== "srfmajortext"){
             value.forEach((item: any) => {
-                result.push({[this.deMajorField]: item.srfmajortext, [this.deKeyField]: item.srfkey});
+                const params = {[this.deMajorField]: item.srfmajortext, [this.deKeyField]: item.srfkey};
+                this.fillExtraValue(params, item);
+                result.push(params);
             });
         }else{
             result = value;
@@ -405,7 +389,9 @@ export default class AppMpicker extends Vue {
         let result = [];
         if(this.deKeyField !== "srfkey" || this.deMajorField !== "srfmajortext"){
             value.forEach((item: any) => {
-                result.push({srfmajortext : item[this.deMajorField], srfkey : item[this.deKeyField]});
+                const params = {srfmajortext : item[this.deMajorField], srfkey : item[this.deKeyField]};
+                this.fillExtraValue(params, item);
+                result.push(params);
             });
         }else{
             result = value;
@@ -413,6 +399,25 @@ export default class AppMpicker extends Vue {
         return result;
     }
 
+    /**
+     * 填充额外参数
+     *
+     * @param {*} params 
+     * @param {*} item 
+     * @memberof AppMpicker
+     */
+    public fillExtraValue(params: any, item: any): void {
+        if (isExist(this.extraFillParams)) {
+            for (const key in this.extraFillParams) {
+                if (this.extraFillParams.hasOwnProperty(key)) {
+                    const self = this.extraFillParams[key];
+                    if (isExist(item[self.key])) {
+                        Object.assign(params, { [self.value]: item[self.key]});
+                    }
+                }
+            }
+        }
+    }
 
 }
 </script>

app_CRM/src/service/incident/active-logic-base.ts

+import IncidentService from '@/service/incident/incident-service';
+import { Verify } from '@/utils/verify/verify';
+
+
+/**
+ * 重新激活
+ *
+ * @export
+ * @class ActiveLogicBase
+ */
+export default class ActiveLogicBase {
+
+    /**
+     * 名称
+     * 
+     * @memberof  ActiveLogicBase
+     */
+    private name:string ="Active";
+
+    /**
+     * 唯一标识
+     * 
+     * @memberof  ActiveLogicBase
+     */
+    private id:string = "111CBE02-6C43-4707-8AFF-2BC47BC50E83";
+
+    /**
+     * 默认参数名称
+     * 
+     * @memberof  ActiveLogicBase
+     */
+    private defaultParamName:string = "Default";
+
+    /**
+     * 参数集合
+     * 
+     * @memberof  ActiveLogicBase
+     */
+    private paramsMap:Map<string,any> = new Map();
+
+    /**
+     * Creates an instance of  ActiveLogicBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ActiveLogicBase
+     */
+    constructor(opts: any = {}) {
+        this.initParams(opts);
+    }
+
+    /**
+     * 初始化参数集合
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ActiveLogicBase
+     */
+    public initParams(opts:any){
+        this.paramsMap.set('Default',opts);
+    }
+
+
+    /**
+     * 计算0节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute0Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 计算1节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute1Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 执行逻辑
+     * 
+     * @param context 应用上下文
+     * @param params 传入参数
+     */
+    public onExecute(context:any,params:any,isloading:boolean){
+        return this.executeBegin(context,params,isloading);
+    }
+
+
+    /**
+    * 准备参数
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executePrepareparam1(context:any,params:any,isloading:boolean){
+        // 准备参数节点
+    let tempDstParam0Context:any = this.paramsMap.get('Default').context?this.paramsMap.get('Default').context:{};
+    let tempDstParam0Data:any = this.paramsMap.get('Default').data?this.paramsMap.get('Default').data:{};
+    Object.assign(tempDstParam0Data,{statecode:"0"});
+    this.paramsMap.set('Default',{data:tempDstParam0Data,context:tempDstParam0Context});
+        if(this.compute1Cond(params)){
+            return this.executeDeaction1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 开始
+    * 
+    * @param params 传入参数
+    */
+    private async executeBegin(context:any,params:any,isloading:boolean){
+        //开始节点
+        if(this.compute0Cond(params)){
+            return this.executePrepareparam1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 更新案例状态
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executeDeaction1(context:any,params:any,isloading:boolean){
+        // 行为处理节点
+        let result: any;
+        let actionParam:any = this.paramsMap.get('Default');
+        const targetService:IncidentService = new IncidentService();
+        if (targetService['Update'] && targetService['Update'] instanceof Function) {
+            result = await targetService['Update'](actionParam.context,actionParam.data, false);
+        }
+        if(result && result.status == 200){
+            Object.assign(actionParam.data,result.data);
+        return this.paramsMap.get(this.defaultParamName).data;
+        }
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/service/incident/active-logic.ts

+import { Http,Util } from '@/utils';
+import ActiveLogicBase from './active-logic-base';
+
+/**
+ * 重新激活
+ *
+ * @export
+ * @class ActiveLogic
+ */
+export default class ActiveLogic extends ActiveLogicBase{
+
+    /**
+     * Creates an instance of  ActiveLogic
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ActiveLogic
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_CRM/src/service/incident/cancel-logic-base.ts

+import IncidentService from '@/service/incident/incident-service';
+import { Verify } from '@/utils/verify/verify';
+
+
+/**
+ * 取消案例
+ *
+ * @export
+ * @class CancelLogicBase
+ */
+export default class CancelLogicBase {
+
+    /**
+     * 名称
+     * 
+     * @memberof  CancelLogicBase
+     */
+    private name:string ="Cancel";
+
+    /**
+     * 唯一标识
+     * 
+     * @memberof  CancelLogicBase
+     */
+    private id:string = "5557E4DD-1650-42B6-A5D5-9292CBEE3342";
+
+    /**
+     * 默认参数名称
+     * 
+     * @memberof  CancelLogicBase
+     */
+    private defaultParamName:string = "Default";
+
+    /**
+     * 参数集合
+     * 
+     * @memberof  CancelLogicBase
+     */
+    private paramsMap:Map<string,any> = new Map();
+
+    /**
+     * Creates an instance of  CancelLogicBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  CancelLogicBase
+     */
+    constructor(opts: any = {}) {
+        this.initParams(opts);
+    }
+
+    /**
+     * 初始化参数集合
+     * 
+     * @param {*} [opts={}]
+     * @memberof  CancelLogicBase
+     */
+    public initParams(opts:any){
+        this.paramsMap.set('Default',opts);
+    }
+
+
+    /**
+     * 计算0节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute0Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 计算1节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute1Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 执行逻辑
+     * 
+     * @param context 应用上下文
+     * @param params 传入参数
+     */
+    public onExecute(context:any,params:any,isloading:boolean){
+        return this.executeBegin(context,params,isloading);
+    }
+
+
+    /**
+    * 开始
+    * 
+    * @param params 传入参数
+    */
+    private async executeBegin(context:any,params:any,isloading:boolean){
+        //开始节点
+        if(this.compute1Cond(params)){
+            return this.executePrepareparam1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 准备参数
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executePrepareparam1(context:any,params:any,isloading:boolean){
+        // 准备参数节点
+    let tempDstParam0Context:any = this.paramsMap.get('Default').context?this.paramsMap.get('Default').context:{};
+    let tempDstParam0Data:any = this.paramsMap.get('Default').data?this.paramsMap.get('Default').data:{};
+    Object.assign(tempDstParam0Data,{statecode:"2"});
+    this.paramsMap.set('Default',{data:tempDstParam0Data,context:tempDstParam0Context});
+        if(this.compute0Cond(params)){
+            return this.executeDeaction1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 更新案例状态
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executeDeaction1(context:any,params:any,isloading:boolean){
+        // 行为处理节点
+        let result: any;
+        let actionParam:any = this.paramsMap.get('Default');
+        const targetService:IncidentService = new IncidentService();
+        if (targetService['Update'] && targetService['Update'] instanceof Function) {
+            result = await targetService['Update'](actionParam.context,actionParam.data, false);
+        }
+        if(result && result.status == 200){
+            Object.assign(actionParam.data,result.data);
+        return this.paramsMap.get(this.defaultParamName).data;
+        }
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/service/incident/cancel-logic.ts

+import { Http,Util } from '@/utils';
+import CancelLogicBase from './cancel-logic-base';
+
+/**
+ * 取消案例
+ *
+ * @export
+ * @class CancelLogic
+ */
+export default class CancelLogic extends CancelLogicBase{
+
+    /**
+     * Creates an instance of  CancelLogic
+     * 
+     * @param {*} [opts={}]
+     * @memberof  CancelLogic
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

app_CRM/src/service/incident/incident-service-base.ts

 import { Http,Util } from '@/utils';
 import EntityService from '../entity-service';
+import ActiveLogic from '@/service/incident/active-logic';
+import CancelLogic from '@/service/incident/cancel-logic';
+import ResolveLogic from '@/service/incident/resolve-logic';
 
 
 
@@ -166,6 +169,36 @@ export default class IncidentServiceBase extends EntityService {
         return res;
     }
 
+    /**
+     * Active接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async Active(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let appLogic:ActiveLogic = new ActiveLogic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(data))});
+        const result = await appLogic.onExecute(context,data,isloading?true:false);
+        return {status:200,data:result};
+    }
+
+    /**
+     * Cancel接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async Cancel(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let appLogic:CancelLogic = new CancelLogic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(data))});
+        const result = await appLogic.onExecute(context,data,isloading?true:false);
+        return {status:200,data:result};
+    }
+
     /**
      * CheckKey接口方法
      *
@@ -179,6 +212,21 @@ export default class IncidentServiceBase extends EntityService {
             return Http.getInstance().post(`/incidents/${context.incident}/checkkey`,data,isloading);
     }
 
+    /**
+     * Resolve接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async Resolve(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let appLogic:ResolveLogic = new ResolveLogic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(data))});
+        const result = await appLogic.onExecute(context,data,isloading?true:false);
+        return {status:200,data:result};
+    }
+
     /**
      * Save接口方法
      *
@@ -225,6 +273,20 @@ export default class IncidentServiceBase extends EntityService {
         return Http.getInstance().get(`/incidents/fetchbyparentkey`,tempData,isloading);
     }
 
+    /**
+     * FetchCancel接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async FetchCancel(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/incidents/fetchcancel`,tempData,isloading);
+    }
+
     /**
      * FetchDefault接口方法
      *
@@ -238,4 +300,32 @@ export default class IncidentServiceBase extends EntityService {
         let tempData:any = JSON.parse(JSON.stringify(data));
         return Http.getInstance().get(`/incidents/fetchdefault`,tempData,isloading);
     }
+
+    /**
+     * FetchEffective接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async FetchEffective(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/incidents/fetcheffective`,tempData,isloading);
+    }
+
+    /**
+     * FetchResolved接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof IncidentServiceBase
+     */
+    public async FetchResolved(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return Http.getInstance().get(`/incidents/fetchresolved`,tempData,isloading);
+    }
 }
\ No newline at end of file

app_CRM/src/service/incident/resolve-logic-base.ts

+import IncidentService from '@/service/incident/incident-service';
+import { Verify } from '@/utils/verify/verify';
+
+
+/**
+ * 解决案例
+ *
+ * @export
+ * @class ResolveLogicBase
+ */
+export default class ResolveLogicBase {
+
+    /**
+     * 名称
+     * 
+     * @memberof  ResolveLogicBase
+     */
+    private name:string ="Resolve";
+
+    /**
+     * 唯一标识
+     * 
+     * @memberof  ResolveLogicBase
+     */
+    private id:string = "D4E611FE-33A7-4E2B-9C69-39C61428C926";
+
+    /**
+     * 默认参数名称
+     * 
+     * @memberof  ResolveLogicBase
+     */
+    private defaultParamName:string = "Default";
+
+    /**
+     * 参数集合
+     * 
+     * @memberof  ResolveLogicBase
+     */
+    private paramsMap:Map<string,any> = new Map();
+
+    /**
+     * Creates an instance of  ResolveLogicBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ResolveLogicBase
+     */
+    constructor(opts: any = {}) {
+        this.initParams(opts);
+    }
+
+    /**
+     * 初始化参数集合
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ResolveLogicBase
+     */
+    public initParams(opts:any){
+        this.paramsMap.set('Default',opts);
+    }
+
+
+    /**
+     * 计算0节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute0Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 计算1节点结果
+     * 
+     * @param params 传入参数
+     */
+    public compute1Cond(params:any):boolean{
+        return true;
+    }
+
+    /**
+     * 执行逻辑
+     * 
+     * @param context 应用上下文
+     * @param params 传入参数
+     */
+    public onExecute(context:any,params:any,isloading:boolean){
+        return this.executeBegin(context,params,isloading);
+    }
+
+
+    /**
+    * 开始
+    * 
+    * @param params 传入参数
+    */
+    private async executeBegin(context:any,params:any,isloading:boolean){
+        //开始节点
+        if(this.compute1Cond(params)){
+            return this.executePrepareparam1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 准备参数
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executePrepareparam1(context:any,params:any,isloading:boolean){
+        // 准备参数节点
+    let tempDstParam0Context:any = this.paramsMap.get('Default').context?this.paramsMap.get('Default').context:{};
+    let tempDstParam0Data:any = this.paramsMap.get('Default').data?this.paramsMap.get('Default').data:{};
+    Object.assign(tempDstParam0Data,{statecode:"1"});
+    this.paramsMap.set('Default',{data:tempDstParam0Data,context:tempDstParam0Context});
+        if(this.compute0Cond(params)){
+            return this.executeDeaction1(context,params,isloading);   
+        }
+    }
+
+    /**
+    * 更新案例状态
+    * 
+    * @param context 应用上下文
+    * @param params 传入参数
+    */
+    private async executeDeaction1(context:any,params:any,isloading:boolean){
+        // 行为处理节点
+        let result: any;
+        let actionParam:any = this.paramsMap.get('Default');
+        const targetService:IncidentService = new IncidentService();
+        if (targetService['Update'] && targetService['Update'] instanceof Function) {
+            result = await targetService['Update'](actionParam.context,actionParam.data, false);
+        }
+        if(result && result.status == 200){
+            Object.assign(actionParam.data,result.data);
+        return this.paramsMap.get(this.defaultParamName).data;
+        }
+    }
+
+
+}
\ No newline at end of file

app_CRM/src/service/incident/resolve-logic.ts

+import { Http,Util } from '@/utils';
+import ResolveLogicBase from './resolve-logic-base';
+
+/**
+ * 解决案例
+ *
+ * @export
+ * @class ResolveLogic
+ */
+export default class ResolveLogic extends ResolveLogicBase{
+
+    /**
+     * Creates an instance of  ResolveLogic
+     * 
+     * @param {*} [opts={}]
+     * @memberof  ResolveLogic
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+}
\ No newline at end of file

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/mapper/IncidentMapper.java

@@ -20,7 +20,10 @@ import com.alibaba.fastjson.JSONObject;
 public interface IncidentMapper extends BaseMapper<Incident>{
 
     Page<Incident> searchByParentKey(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
+    Page<Incident> searchCancel(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
     Page<Incident> searchDefault(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
+    Page<Incident> searchEffective(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
+    Page<Incident> searchResolved(IPage page, @Param("srf") IncidentSearchContext context, @Param("ew") Wrapper<Incident> wrapper) ;
     @Override
     Incident selectById(Serializable id);
     @Override

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/IIncidentService.java

@@ -33,11 +33,17 @@ public interface IIncidentService extends IService<Incident>{
     void removeBatch(Collection<String> idList) ;
     Incident get(String key) ;
     Incident getDraft(Incident et) ;
+    Incident active(Incident et) ;
+    Incident cancel(Incident et) ;
     boolean checkKey(Incident et) ;
+    Incident resolve(Incident et) ;
     boolean save(Incident et) ;
     void saveBatch(List<Incident> list) ;
     Page<Incident> searchByParentKey(IncidentSearchContext context) ;
+    Page<Incident> searchCancel(IncidentSearchContext context) ;
     Page<Incident> searchDefault(IncidentSearchContext context) ;
+    Page<Incident> searchEffective(IncidentSearchContext context) ;
+    Page<Incident> searchResolved(IncidentSearchContext context) ;
     List<Incident> selectByPrimarycontactid(String contactid) ;
     void removeByPrimarycontactid(String contactid) ;
     List<Incident> selectByResponsiblecontactid(String contactid) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/impl/IncidentServiceImpl.java

@@ -83,6 +83,18 @@ public class IncidentServiceImpl extends ServiceImpl<IncidentMapper, Incident> i
     @Lazy
     protected cn.ibizlab.businesscentral.core.base.service.ITransactionCurrencyService transactioncurrencyService;
 
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.service.service.logic.IIncidentActiveLogic activeLogic;
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.service.service.logic.IIncidentCancelLogic cancelLogic;
+
+    @Autowired
+    @Lazy
+    protected cn.ibizlab.businesscentral.core.service.service.logic.IIncidentResolveLogic resolveLogic;
+
     protected int batchSize = 500;
 
     @Override
@@ -148,10 +160,31 @@ public class IncidentServiceImpl extends ServiceImpl<IncidentMapper, Incident> i
         return et;
     }
 
+    @Override
+    @Transactional
+    public Incident active(Incident et) {
+        activeLogic.execute(et);
+         return et ;
+    }
+
+    @Override
+    @Transactional
+    public Incident cancel(Incident et) {
+        cancelLogic.execute(et);
+         return et ;
+    }
+
     @Override
     public boolean checkKey(Incident et) {
         return (!ObjectUtils.isEmpty(et.getIncidentid()))&&(!Objects.isNull(this.getById(et.getIncidentid())));
     }
+    @Override
+    @Transactional
+    public Incident resolve(Incident et) {
+        resolveLogic.execute(et);
+         return et ;
+    }
+
     @Override
     @Transactional
     public boolean save(Incident et) {
@@ -336,6 +369,15 @@ public class IncidentServiceImpl extends ServiceImpl<IncidentMapper, Incident> i
         return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 已取消
+     */
+    @Override
+    public Page<Incident> searchCancel(IncidentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Incident> pages=baseMapper.searchCancel(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
     /**
      * 查询集合 DEFAULT
      */
@@ -345,6 +387,24 @@ public class IncidentServiceImpl extends ServiceImpl<IncidentMapper, Incident> i
         return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
     }
 
+    /**
+     * 查询集合 有效
+     */
+    @Override
+    public Page<Incident> searchEffective(IncidentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Incident> pages=baseMapper.searchEffective(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
+    /**
+     * 查询集合 已解决
+     */
+    @Override
+    public Page<Incident> searchResolved(IncidentSearchContext context) {
+        com.baomidou.mybatisplus.extension.plugins.pagination.Page<Incident> pages=baseMapper.searchResolved(context.getPages(),context,context.getSelectCond());
+        return new PageImpl<Incident>(pages.getRecords(), context.getPageable(), pages.getTotal());
+    }
+
 
 
     /**

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/service/service/logic/IIncidentActiveLogic.java

+package cn.ibizlab.businesscentral.core.service.service.logic;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.HashMap;
+
+import cn.ibizlab.businesscentral.core.service.domain.Incident;
+
+/**
+ * 关系型数据实体[Active] 对象
+ */
+public interface IIncidentActiveLogic {
+
+    void execute(Incident incident ) ;
+
+}