Merge branch 'matser' of http://119.23.210.103:3000/wy/zdqy_ibps into matser

ibps-base-root/modules/base-cloud/src/main/java/com/lc/ibps/cloud/entity/APIRequest.java

@@ -31,6 +31,12 @@ public class APIRequest implements Serializable {
 	 * serialVersionUID:
 	 */
 	private static final long serialVersionUID = -2647543499875978629L;
+
+	/**
+	 * customs:自定义参数对象，不会走封装的逻辑
+	 */
+	@ApiModelProperty(required = false , value = "自定义查询参数对象")
+	private Map<String,Object> customs;
 	
 	/**
 	 * parameters:请求参数列表
@@ -52,7 +58,15 @@ public class APIRequest implements Serializable {
 	public APIRequest(int pageNo, int limit) {
 		this.requestPage = new APIRequestPage(pageNo, limit);
 	}
-	
+
+	public Map<String, Object> getCustoms() {
+		return customs;
+	}
+
+	public void setCustoms(Map<String, Object> customs) {
+		this.customs = customs;
+	}
+
 	public String getParameter(String key){
 		if(BeanUtils.isNotEmpty(parameters))
 		{

ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/handler/userTask/TaskActionSaveHandler.java

@@ -0,0 +1,41 @@
+package com.lc.ibps.bpmn.handler.userTask;
+
+import com.lc.ibps.base.core.util.string.StringUtil;
+import com.lc.ibps.bpmn.api.constant.NodeStatus;
+import com.lc.ibps.bpmn.api.plugin.define.ITaskActionHandlerDefine;
+import com.lc.ibps.bpmn.api.plugin.runtime.ITaskActionHandler;
+import com.lc.ibps.bpmn.api.plugin.session.TaskActionPluginSession;
+import com.lc.ibps.bpmn.cmd.IbpsTaskFinishCmd;
+import com.lc.ibps.bpmn.domain.BpmApprove;
+import com.lc.ibps.bpmn.persistence.entity.BpmApprovePo;
+import com.lc.ibps.bpmn.repository.BpmApproveRepository;
+
+import javax.annotation.Resource;
+
+public class TaskActionSaveHandler extends TaskActionNoneHandler implements ITaskActionHandler {
+
+    @Resource
+    private BpmApproveRepository bpmApproveRepository;
+
+    @Override
+    public Boolean execute(TaskActionPluginSession pluginSession, ITaskActionHandlerDefine pluginDefine) {
+        // just save opinion, no status changed.
+        handleOpinion(pluginSession);
+        return true;
+    }
+
+    private void handleOpinion(TaskActionPluginSession pluginSession){
+
+        IbpsTaskFinishCmd finishCmd = (IbpsTaskFinishCmd) pluginSession.getTaskFinishCmd();
+        if(StringUtil.isEmpty(finishCmd.getApprovalOpinion())){
+            finishCmd.setApprovalOpinion("");
+        }
+
+        BpmApprovePo bpmApprovePo = bpmApproveRepository.getByTaskId(
+                finishCmd.getTaskId(), NodeStatus.PENDING.getKey());
+        bpmApprovePo.setOpinion(finishCmd.getApprovalOpinion());
+
+        BpmApprove bpmApproveDomain = bpmApproveRepository.newInstance(bpmApprovePo);
+        bpmApproveDomain.update();
+    }
+}

ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/listener/TaskCompleteEventListener.java

@@ -127,11 +127,7 @@ public class TaskCompleteEventListener implements ApplicationListener<TaskComple
 		
 		// 更新执行数据
 		updateExec(delegateTask, bpmTask, actionCmd);
-		
-		// 更新流程实例
-		updateSubject(delegateTask,cmd);
 
-		
 		// 完成转办代理任务
 		BpmTaskChange bpmTaskChangeDomain = bpmTaskChangeRepository.newInstance();
 		bpmTaskChangeDomain.complete(delegateTask, actionCmd.getCurUser());
@@ -591,16 +587,4 @@ public class TaskCompleteEventListener implements ApplicationListener<TaskComple
 		bpmTaskDomain.delete(taskId);
 	}
 
-	private void updateSubject(BpmDelegateTask delegateTask, TaskFinishCmd cmd) {
-
-		String procInstId=String.valueOf(delegateTask.getVariable(BpmConstants.PROCESS_INST_ID));
-		BpmInstPo instance= bpmInstRepository.get(procInstId);
-
-		ProcInstCmd procInstCmd = new IbpsProcInstCmd() ;
-		procInstCmd.setBusData(cmd.getBusData());
-		procInstCmd.setCurUserName(cmd.getCurUserName());
-		procInstCmd.setBusinessKey(cmd.getBusinessKey());
-		((IbpsProcInstCmd) procInstCmd).setVariables(cmd.getVariables());
-		bpmProcInstService.saveSubject(instance,procInstCmd);
-	}
 }

ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/listener/TaskCreateEventListener.java

@@ -186,8 +186,6 @@ public class TaskCreateEventListener implements ApplicationListener<TaskCreateEv
 //
 //			}
 //		}).start();
-		//更新流程和任务的subject
-		updateSubject(delegateTask, taskCmd,instance);
 	}
 
 	/**
@@ -211,13 +209,4 @@ public class TaskCreateEventListener implements ApplicationListener<TaskCreateEv
 		BpmApprove bpmApproveDomain = bpmApproveRepository.newInstance(approvePo);
 		bpmApproveDomain.create();
 	}
-	private void updateSubject(BpmDelegateTask delegateTask, ActionCmd cmd, IBpmProcInst instance) {
-
-		ProcInstCmd procInstCmd = new IbpsProcInstCmd() ;
-		procInstCmd.setBusData(cmd.getBusData());
-		procInstCmd.setCurUserName(cmd.getCurUserName());
-		procInstCmd.setBusinessKey(cmd.getBusinessKey());
-		((IbpsProcInstCmd) procInstCmd).setVariables(cmd.getVariables());
-		bpmProcInstService.saveSubject(instance,procInstCmd);
-	}
 }

ibps-bpmn-root/modules/bpmn-biz/src/main/java/com/lc/ibps/bpmn/service/impl/BpmTaskActionServiceImpl.java

@@ -16,6 +16,9 @@ import java.util.concurrent.Future;
 
 import javax.annotation.Resource;
 
+import com.lc.ibps.bpmn.api.cmd.ProcInstCmd;
+import com.lc.ibps.bpmn.api.constant.NodeStatus;
+import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.event.Level;
@@ -171,6 +174,8 @@ public class BpmTaskActionServiceImpl implements BpmTaskActionService{
 			if(!StringValidator.isZeroEmpty(bpmTask.getTaskId())){
 				StopWatchUtil.stopAndStartNewLocal(localId, step, "getByTaskId");
 				task=natTaskService.getByTaskId(bpmTask.getTaskId());//TODO 性能略低
+				//update subject
+				updateSubject(cmd,task);
 			}
 			new Thread(() ->{
 				StopWatchUtil.stopAndStartNewLocal(localId, step, "publicDoNextEvent.prev");
@@ -629,4 +634,21 @@ public class BpmTaskActionServiceImpl implements BpmTaskActionService{
 		//TODO 设置任务代理
 	}
 
+	private void updateSubject( IbpsTaskFinishCmd cmd, BpmDelegateTask delegateTask ) {
+		IBpmProcInst inst = bpmInstService.getProcInst(cmd.getInstId());
+		ProcInstCmd procInstCmd = new IbpsProcInstCmd() ;
+		procInstCmd.setBusData(cmd.getBusData());
+		procInstCmd.setCurUserName(cmd.getCurUserName());
+		procInstCmd.setBusinessKey(cmd.getBusinessKey());
+		((IbpsProcInstCmd) procInstCmd).setVariables(cmd.getVariables());
+		bpmInstService.saveSubject(inst,procInstCmd);
+
+		// update bpmn variable for next task.
+		if(cmd.getActionName().equals(NodeStatus.SAVE.getKey())){
+			natTaskService.setVariable(cmd.getTaskId(), BpmConstants.SUBJECT, inst.getSubject());
+		}else {
+			cmd.getVariables().put(BpmConstants.SUBJECT, inst.getSubject());
+		}
+	}
+
 }

ibps-bpmn-root/modules/bpmn-biz/src/main/resources/conf/ibps-bpmn-task-handler.xml

@@ -30,5 +30,6 @@
 	<bean id="taskActionAssistHandler" class="com.lc.ibps.bpmn.handler.userTask.TaskActionAssistHandler"/>-->
 	<!-- 流程沟通处理器 
 	<bean id="taskActionCommuHandler" class="com.lc.ibps.bpmn.core.engine.task.handler.TaskActionCommuHandler"/> -->
-	
+	<!-- 保存处理器 -->
+	<bean id="taskActionSaveHandler" class="com.lc.ibps.bpmn.handler.userTask.TaskActionSaveHandler"/>
 </beans>

ibps-bpmn-root/modules/bpmn-biz/src/main/resources/conf/taskActionPlugins.xml

@@ -26,7 +26,7 @@
     
     <taskAction name="save" supportType="both" actionType="other" script="true" init="true">
         <description value="保存"/>
-        <handlerClass value="taskActionNoneHandler"/>
+        <handlerClass value="taskActionSaveHandler"/>
     </taskAction>
  
     <taskAction name="abandon" supportType="signtask" actionType="approve" script="true" init="false">

ibps-model-root/modules/org-model/src/main/resources/com/lc/ibps/org/party/persistence/mapping/DefaultPartyUser.map.xml

@@ -437,6 +437,9 @@
 			)
 		)
 		</if>
+		<if test="@o.Ognl@isNotEmpty(position)">
+			AND POSITIONS_ in(select id_ from ibps_party_entity where PATH_ like #{position} )
+		</if>
 		<if test="@o.Ognl@isNotEmpty(whereSql)">
 			AND ${whereSql}
 		</if>

ibps-provider-base-root/modules/provider-bpmn-api/src/main/java/com/lc/ibps/bpmn/vo/BpmActionSaveVo.java

@@ -24,11 +24,18 @@ public class BpmActionSaveVo extends BpmActionBaseVo {
 	
 	@ApiModelProperty(value = "表单数据", example = "表单提交的JSON格式数据，可以在表单预览界面找到对应格式。")
 	protected String data;
+	@ApiModelProperty(value = "意见")
+	protected String opinion;
 	public String getData() {
 		return data;
 	}
 	public void setData(String busData) {
 		this.data = busData;
 	}
-	
+	public String getOpinion() {
+		return opinion;
+	}
+	public void setOpinion(String opinion) {
+		this.opinion = opinion;
+	}
 }

ibps-provider-base-root/modules/provider-platform-api/src/main/java/com/lc/ibps/org/api/IPartyEmployeeService.java

@@ -59,8 +59,7 @@ public interface IPartyEmployeeService {
 	 */
 	@RequestMapping(value = "/query", method = RequestMethod.POST)
 	public APIResult<APIPageList<PartyEmployeePo>> query(
-			@RequestBody(required = true) APIRequest request,
-			@RequestParam(name = "position", required = false) String position);
+			@RequestBody(required = true) APIRequest request);
 	
 	/**
 	 * 

ibps-provider-root/modules/provider-bpmn/src/main/java/com/lc/ibps/bpmn/provider/BpmTaskProvider.java

@@ -2774,8 +2774,8 @@ public class BpmTaskProvider extends GenericProvider implements IBpmTaskService,
 					saveVo.getTaskId(), 
 					null,
 					NodeStatus.SAVE.getKey(), 
-					null, 
-					null, 
+					null,
+					saveVo.getOpinion(),
 					saveVo.getData(), 
 					null, 
 					null, 

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/aop/FlowDBLogAspect.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.lc.ibps.base.web.context.ContextUtil;
 import com.lc.ibps.cloud.utils.RequestUtil;
 import com.lc.ibps.sysdata.dao.UpdateDataTableDao;
+import com.lc.ibps.untils.LogAopUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -48,29 +49,19 @@ public class FlowDBLogAspect {
     @Around("execution(* com.lc.ibps.bpmn.api.*.*(..))")
     public Object around(ProceedingJoinPoint point) throws Throwable {
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        // 执行目标方法
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
-        Object result = point.proceed();
-        stopWatch.stop();
-
+        Object result = null;
+        try {
+            result = point.proceed();
+        } catch (Throwable throwable) {
+            updateDataTableDao.insertLog(LogAopUtil.logError(request, point, throwable));
+            throw throwable;
+        } finally {
+            stopWatch.stop();
+        }
         if (NAMES.contains(request.getRequestURI())){
-            List<Object> paramList = Stream.of(point.getArgs())
-                    .filter(args -> !(args instanceof ServletRequest))
-                    .filter(args -> !(args instanceof ServletResponse))
-                    .collect(Collectors.toList());
-            String printParamStr = paramList.size() == 1 ? JSONUtil.toJsonStr(paramList.get(0)) : JSONUtil.toJsonStr(paramList);
-            // 记录操作日志
-            Map<String,Object> map = new HashMap<>();
-            map.put("method_", point.getSignature().getName());
-            map.put("params_", printParamStr);
-            map.put("user_id_", ContextUtil.getCurrentUser().getUserId());
-            map.put("user_name_", ContextUtil.getCurrentUser().getFullname());
-            map.put("time_", stopWatch.getTotalTimeMillis());
-            map.put("ip_", RequestUtil.getIpAddr(request));
-            map.put("response_", JSONUtil.toJsonStr(result));
-            map.put("uri_", request.getRequestURI());
-            updateDataTableDao.insertLog(map);
+            updateDataTableDao.insertLog(LogAopUtil.log( request, point, result, stopWatch));
         }
         return result;
     }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/aop/IDataTemplateMsgAop.java

@@ -1,10 +1,8 @@
 package com.lc.ibps.aop;
 
 import cn.hutool.core.date.StopWatch;
-import cn.hutool.json.JSONUtil;
-import com.lc.ibps.base.web.context.ContextUtil;
-import com.lc.ibps.cloud.utils.RequestUtil;
 import com.lc.ibps.sysdata.dao.UpdateDataTableDao;
+import com.lc.ibps.untils.LogAopUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,15 +11,8 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Aspect
 @Component
@@ -35,31 +26,20 @@ public class IDataTemplateMsgAop {
     @Around("execution(* com.lc.ibps.form.api.IDataTemplateMgrService.*(..))")
     public Object around(ProceedingJoinPoint point) throws Throwable {
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        // 执行目标方法
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
-        Object result = point.proceed();
-        stopWatch.stop();
-
+        Object result = null;
+        try {
+            result = point.proceed();
+        } catch (Throwable throwable) {
+            updateDataTableDao.insertLog(LogAopUtil.logError(request, point, throwable));
+            throw throwable;
+        } finally {
+            stopWatch.stop();
+        }
         if ("removeFormData".equals(point.getSignature().getName())){
-            List<Object> paramList = Stream.of(point.getArgs())
-                    .filter(args -> !(args instanceof ServletRequest))
-                    .filter(args -> !(args instanceof ServletResponse))
-                    .collect(Collectors.toList());
-            String printParamStr = paramList.size() == 1 ? JSONUtil.toJsonStr(paramList.get(0)) : JSONUtil.toJsonStr(paramList);
-            // 记录操作日志
-            Map<String,Object> map = new HashMap<>();
-            map.put("method_", point.getSignature().getName());
-            map.put("params_", printParamStr);
-            map.put("user_id_", ContextUtil.getCurrentUser().getUserId());
-            map.put("user_name_", ContextUtil.getCurrentUser().getFullname());
-            map.put("time_", stopWatch.getTotalTimeMillis());
-            map.put("ip_", RequestUtil.getIpAddr(request));
-            map.put("response_", JSONUtil.toJsonStr(result));
-            map.put("uri_", request.getRequestURI());
-            updateDataTableDao.insertLog(map);
+            updateDataTableDao.insertLog(LogAopUtil.log( request, point, result, stopWatch));
         }
         return result;
     }
-
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/aop/UpdateDBLogAspect.java

@@ -1,10 +1,8 @@
 package com.lc.ibps.aop;
 
 import cn.hutool.core.date.StopWatch;
-import cn.hutool.json.JSONUtil;
-import com.lc.ibps.base.web.context.ContextUtil;
-import com.lc.ibps.cloud.utils.RequestUtil;
 import com.lc.ibps.sysdata.dao.UpdateDataTableDao;
+import com.lc.ibps.untils.LogAopUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -13,12 +11,10 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.io.StringWriter;
+import java.util.Arrays;
+import java.util.Objects;
 
 
 @Aspect
@@ -35,29 +31,19 @@ public class UpdateDBLogAspect {
     @Around("execution(* com.lc.ibps.sysdata.controller.UpdateDataTableController.*(..))")
     public Object around(ProceedingJoinPoint point) throws Throwable {
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        String methodName = point.getSignature().getName();
-        // 执行目标方法
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
-        Object result = point.proceed();
-        stopWatch.stop();
-        if (ifAddLog(methodName)){
-            List<Object> paramList = Stream.of(point.getArgs())
-                    .filter(args -> !(args instanceof ServletRequest))
-                    .filter(args -> !(args instanceof ServletResponse))
-                    .collect(Collectors.toList());
-            String printParamStr = paramList.size() == 1 ? JSONUtil.toJsonStr(paramList.get(0)) : JSONUtil.toJsonStr(paramList);
-            // 记录操作日志
-            Map<String,Object> map = new HashMap<>();
-            map.put("method_", methodName);
-            map.put("params_", printParamStr);
-            map.put("user_id_", ContextUtil.getCurrentUser().getUserId());
-            map.put("user_name_", ContextUtil.getCurrentUser().getFullname());
-            map.put("time_", stopWatch.getTotalTimeMillis());
-            map.put("ip_", RequestUtil.getIpAddr(request));
-            map.put("response_", JSONUtil.toJsonStr(result));
-            map.put("uri_", request.getRequestURI());
-            updateDataTableDao.insertLog(map);
+        Object result = null;
+        try {
+            result = point.proceed();
+        } catch (Throwable throwable) {
+            updateDataTableDao.insertLog(LogAopUtil.logError(request, point, throwable));
+            throw throwable;
+        } finally {
+            stopWatch.stop();
+        }
+        if (ifAddLog(point.getSignature().getName())){
+            updateDataTableDao.insertLog(LogAopUtil.log( request, point, result, stopWatch));
         }
         return result;
     }
@@ -65,7 +51,7 @@ public class UpdateDBLogAspect {
     public boolean ifAddLog(String methodName){
         String[] names = {"addDataContextTable","updateDataContextTable","updatesDatasContextTable",
                           "updatesBatchContextTable","batchDelete","deleteDataContextTable"};
-        return Arrays.stream(names).anyMatch(s -> s.equals(methodName));
+        return Arrays.asList(names).contains(methodName);
     }
 
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/dao/TzqxdsrwbMapper.java

@@ -1,29 +1,29 @@
 package com.lc.ibps.task.dao;
 
-//import com.lc.ibps.task.entity.Tzqxdsrwb;
+import com.lc.ibps.task.entity.Tzqxdsrwb;
 import org.apache.ibatis.annotations.Mapper;
-//import org.apache.ibatis.annotations.Param;
-//
-//import java.util.List;
-//
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 @Mapper
 public interface TzqxdsrwbMapper {
-//    int deleteByPrimaryKey(String id);
-//
-//    int insert(Tzqxdsrwb record);
-//
-//    int insertSelective(Tzqxdsrwb record);
-//
-//    Tzqxdsrwb selectByPrimaryKey(String id);
-//
-//    int updateByPrimaryKeySelective(Tzqxdsrwb record);
-//
-//    int updateByPrimaryKey(Tzqxdsrwb record);
-//
-//    List<Tzqxdsrwb> getTzqxdsrwb(String startSign);
-//
-//    List<Tzqxdsrwb> getTimingTaskTzqxdsrwb(@Param("dateSign") String dateSign);
-//
-//    int updateTimingTaskSign(@Param("id") String id);
-//
+    int deleteByPrimaryKey(String id);
+
+    int insert(Tzqxdsrwb record);
+
+    int insertSelective(Tzqxdsrwb record);
+
+    Tzqxdsrwb selectByPrimaryKey(String id);
+
+    int updateByPrimaryKeySelective(Tzqxdsrwb record);
+
+    int updateByPrimaryKey(Tzqxdsrwb record);
+
+    List<Tzqxdsrwb> getTzqxdsrwb(String startSign);
+
+    List<Tzqxdsrwb> getTimingTaskTzqxdsrwb(@Param("dateSign") String dateSign);
+
+    int updateTimingTaskSign(@Param("id") String id);
+
 }

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/server/CycleTaskServer.java

@@ -1,169 +1,106 @@
-//package com.lc.ibps.task.server;
-//
-//import com.lc.ibps.base.service.ServiceConfiguration;
-//import com.lc.ibps.cloud.config.AuthorizationConfig;
-//import com.lc.ibps.cloud.redis.utils.RedisUtil;
-//import com.lc.ibps.mobile.controller.MobileSystemController;
-//import com.lc.ibps.task.services.CycleTaskService;
-//import com.lc.ibps.untils.DateUntil;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.scheduling.annotation.Async;
-//import org.springframework.scheduling.annotation.Scheduled;
-//import org.springframework.stereotype.Component;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//
-///***
-// *   周期性任务服务
-// *
-// *  * @author  ht
-// */
-//
-//
-////@Component
-//
-//@Component
-//@Slf4j
-//public class CycleTaskServer {
-//
-//    private static ServiceConfiguration SpringContextUtils;
-//    private static MobileSystemController JwtUtil;
-//
-//    private AuthorizationConfig   authorizationConfig;
-//    @Resource
-//    private CycleTaskService cycleTaskService;
-//
-//    //  日期定时 执行一次
-//    //@Scheduled(cron="0 10 5 1/1 * ? ")
-//    @Scheduled(cron="0/30 * * * * ?")
-//    public void timingTask(){
-//      //  UserTokenContext.setToken(getTemporaryToken());
-//
-//     //   authorizationConfig.getToken();
-//
-//        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
-//        String sign="日期定时";
-//        cycleTaskService.timingTaskProcess();
-//
-//    //  2.使用完删除Token，避免性能
-//   //     UserTokenContext.remove();
-//
-//        log.info("每日--日期定时:"+DateUntil.getNow().toString() );
-//    };
-//
-//     @Scheduled(cron="0 10 2 1/1 * ? ")
-//  // @Scheduled(cron="0/30 * * * * ? ")
-//    public void dayTask(){
-//        log.info("每日--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每日";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每日--周期任务结束:"+DateUntil.getNow().toString() );
-//     };
-//
-//    //   每周执行一次
-//    @Scheduled(cron="0 15 2 ? * MON")
-//    public void weekTask(){
-//        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每周";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每周--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//
-//    //   两周执行一次
-//    @Scheduled(cron="0 15 2 ? * MON")
-//    public void twoWeekTask(){
-//        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
-//        Integer week= DateUntil.getWeek();
-//        if(week%2==0) {
-//            //  2周处理
-//            String sign = "每二周";
-//            cycleTaskService.startProcess(sign);
-//        }
-//        log.info("每二周--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//    //   每月执行一次
-//    @Scheduled(cron="0 0 2 1 * ?")
-//    public void monthTask(){
-//        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每月";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每月--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//    //   每季执行一次
-//    @Scheduled(cron="0 0 3 1 * ?")
-//    public void seasonTask(){
-//        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
-//        Integer month=DateUntil.getMonth();
-//        if(month%3==0) {
-//            //  季度处理
-//            String sign = "季度";
-//            cycleTaskService.startProcess(sign);
-//        }
-//        log.info("季度--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//    //   每半年执一次
-//    @Scheduled(cron="0 0 3 1 * ?")
-//    public void halfYearTask(){
-//        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
-//        Integer month=DateUntil.getMonth();
-//        if(month%6==0) {
-//            //  半年处理
-//            String sign = "每半年";
-//            cycleTaskService.startProcess(sign);
-//        }
-//        log.info("每半年--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//
-////    //   每年执一次
-//    @Scheduled(cron="0 15 4 1 1 * ")
-//    public void yearTask(){
-//        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每年";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每年--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//
-//    //   每日上午8点
-//    @Scheduled(cron="0 0 8 * * ?")
-//    public void dailyAt8Am(){
-//        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每日上午8点";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-////  每日下午2点
-//    @Scheduled(cron="0 0 14 * * ?")
-//    public void dailyAt2Pm(){
-//        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="每日下午2点";
-//        cycleTaskService.startProcess(sign);
-//        log.info("每日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-////  工作日上午8点
-//    @Scheduled(cron="0 0 8 ? * MON-FRI")
-//    public void weekdaysAt8am(){
-//        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="工作日上午8点";
-//        cycleTaskService.startProcess(sign);
-//        log.info("工作日上午8点--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-////工作日下午2点
-//    @Scheduled(cron="0 0 14 ? * MON-FRI")
-//    public void weekdaysAt2Pm(){
-//        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="工作日下午2点";
-//        cycleTaskService.startProcess(sign);
-//        log.info("工作日下午2点--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//// 工作日3点
-//    @Scheduled(cron="0 0 3 ? * MON-FRI")
-//    public void workingDay(){
-//        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
-//        String sign="工作日3点";
-//        cycleTaskService.startProcess(sign);
-//        log.info("工作日3点--周期任务开始:"+DateUntil.getNow().toString() );
-//    };
-//
-//
-//}
+package com.lc.ibps.task.server;
+
+import com.lc.ibps.task.services.CycleTaskService;
+import com.lc.ibps.untils.DateUntil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/***
+ *   周期性任务服务
+ *
+ *  * @author  ht
+ */
+
+
+@Component
+@Slf4j
+public class CycleTaskServer {
+
+    @Resource
+    private CycleTaskService cycleTaskService;
+
+    // 秒   分    时   日   月    周   年（可选）
+    // 0    1    1    1    *    ?    *
+
+    @Scheduled(cron="0 0 1 1/1 * ? ")
+    public void dayTask(){
+        // 每天凌晨1点执行一次
+        cycleTaskService.startProcess("每日");
+    }
+
+    @Scheduled(cron="0 0 1 ? * MON")
+    public void weekTask(){
+        // 每周执行一次  每个星期一凌晨1点执行
+        cycleTaskService.startProcess("每周");
+    }
+
+    //   两周执行一次
+    @Scheduled(cron="0 15 2 ? * MON")
+    public void twoWeekTask(){
+        Integer week= DateUntil.getWeek();
+        if(week%2==0) {
+            //  2周处理
+            cycleTaskService.startProcess("每二周");
+        }
+    }
+
+    @Scheduled(cron="0 1 1 1 * ?")
+    public void monthTask(){
+        //   每月执行一次  每月一号凌晨1点执行
+        cycleTaskService.startProcess("每月");
+    }
+
+    @Scheduled(cron="0 0 0 1 1,4,7,10 ?")
+    public void seasonTask(){
+        // 因为季度周期为3个月，所以可以将月份设置为1/4/7/10
+        // 每季度执行一次   每个季度的1日0点0分执行
+        cycleTaskService.startProcess("季度");
+    }
+
+    @Scheduled(cron="0 0 0 1 */6 *")
+    public void halfYearTask(){
+        //   每半年执一次
+        cycleTaskService.startProcess("每半年");
+    }
+
+    @Scheduled(cron="0 0 0 1 1 * ")
+    public void yearTask(){
+        //  每年执一次  每年的1月1日凌晨0点执行
+        cycleTaskService.startProcess("每年");
+    }
+
+    @Scheduled(cron="0 0 8 * * ?")
+    public void dailyAt8Am(){
+        //   每日上午8点
+        cycleTaskService.startProcess("每日上午8点");
+    }
+
+    @Scheduled(cron="0 0 14 * * ?")
+    public void dailyAt2Pm(){
+        //  每日下午2点
+        cycleTaskService.startProcess("每日下午2点");
+    }
+
+    @Scheduled(cron="0 0 8 ? * MON-FRI")
+    public void weekdaysAt8am(){
+        //  工作日上午8点
+        cycleTaskService.startProcess("工作日上午8点");
+    }
+
+    @Scheduled(cron="0 0 14 ? * MON-FRI")
+    public void weekdaysAt2Pm(){
+        //工作日下午2点
+        cycleTaskService.startProcess("工作日下午2点");
+    }
+
+    @Scheduled(cron="0 0 3 ? * MON-FRI")
+    public void workingDay(){
+        // 工作日3点
+        cycleTaskService.startProcess("工作日3点");
+    }
+
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/services/CycleTaskService.java

@@ -1,26 +1,26 @@
-//package com.lc.ibps.task.services;
-//
-//import com.lc.ibps.task.entity.Tzqxdsrwb;
-//
-///***
-// *  周期性任务服务接口
-// */
-//public interface CycleTaskService {
-//
-//    //  每日执行一次
-//    //   每周执行一次
-//    //   两周执行一次
-//    //   每月执行一次
-//    //   每季执行一次
-//    //   每半年执一次
-//    //   每年执一次
-//    //  根据 id 起动流程
-//    void testTask(String id);
-//
-//    void startProcess(String startSign);
-//     //   定时任务执行
-//    void timingTaskProcess();
-//     //   起动任务
-//    void startProcessTask(Tzqxdsrwb varTzqxdsrwb);
-//
-//}
+package com.lc.ibps.task.services;
+
+import com.lc.ibps.task.entity.Tzqxdsrwb;
+
+/***
+ *  周期性任务服务接口
+ */
+public interface CycleTaskService {
+
+    //  每日执行一次
+    //   每周执行一次
+    //   两周执行一次
+    //   每月执行一次
+    //   每季执行一次
+    //   每半年执一次
+    //   每年执一次
+    //  根据 id 起动流程
+    void testTask(String id);
+
+    void startProcess(String startSign);
+     //   定时任务执行
+    void timingTaskProcess();
+     //   起动任务
+    void startProcessTask(Tzqxdsrwb varTzqxdsrwb);
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/services/FeignHeaderInterceptor.java

@@ -1,10 +1,8 @@
 package com.lc.ibps.task.services;
 
 import com.lc.ibps.cloud.config.AuthorizationConfig;
-import com.lc.ibps.wx.entity.Token;
 import feign.RequestInterceptor;
 import feign.RequestTemplate;
-import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/task/services/impl/CycleTaskServiceImpl.java

@@ -1,96 +1,94 @@
-//package com.lc.ibps.task.services.impl;
-//
-//import com.lc.ibps.bpmn.api.model.inst.IBpmProcInst;
-//import com.lc.ibps.bpmn.api.service.BpmProcInstService;
-//import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
-//import com.lc.ibps.bpmn.provider.BpmInstProvider;
-//import com.lc.ibps.cloud.entity.APIRequest;
-//import com.lc.ibps.cloud.entity.APIResult;
-//import com.lc.ibps.task.dao.TzqxdsrwbMapper;
-//import com.lc.ibps.task.entity.Tzqxdsrwb;
-//import com.lc.ibps.task.services.CycleTaskService;
-//import com.lc.ibps.untils.DateUntil;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Service;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//
-//import static jodd.util.ThreadUtil.sleep;
-//
-//@Service
-//@Slf4j
-//public class CycleTaskServiceImpl implements CycleTaskService {
-//    @Resource
-//    private BpmProcInstService bpmProcInstService;
-//
-//    @Autowired
-//    private TzqxdsrwbMapper tzqxdsrwbMapper;
-//
-//    @Autowired
-//    private BpmInstProvider pmInstProvider;
-//    //  起动周期性任务流程
-//    @Override
-//    public void testTask(String id){
-//        Tzqxdsrwb tzqxdsrwb= tzqxdsrwbMapper.selectByPrimaryKey(id);
-//        startProcessTask(tzqxdsrwb);
-//    }
-//
-//    //  起动周期性任务流程
-//    @Override
-//    public void startProcess(String startSign) {
-//       List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTzqxdsrwb(startSign);
-//       if(dataList!=null&&dataList.size()>0){
-//           for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
-//               startProcessTask(tzqxdsrwbTemp);
-//           }
-//       }
-//    }
-//    //  日期定时任务
-//    @Override
-//    public void timingTaskProcess() {
-//        String dateSign=DateUntil.getFormatNow();
-//        List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTimingTaskTzqxdsrwb(dateSign);
-//        if(dataList!=null&&dataList.size()>0){
-//            for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
-//                startProcessTask(tzqxdsrwbTemp);
-//                updateTimingTask(tzqxdsrwbTemp);
-//            }
-//        }
-//    }
-//
-//    //   日期定时任务业务处理
-//    private void updateTimingTask(Tzqxdsrwb varTzqxdsrwb){
-//        if(varTzqxdsrwb==null||varTzqxdsrwb.getId().equals("")){
-//            return;
-//        }
-//        tzqxdsrwbMapper.updateTimingTaskSign(varTzqxdsrwb.getId());
-//    }
-//
-//    //   开始任务
-//    @Override
-//    public void startProcessTask(Tzqxdsrwb varTzqxdsrwb){
-//       try {
-//           //  线程等 10000
-//           Thread.sleep(20000);
-//           if (varTzqxdsrwb != null) {
-//               IbpsProcInstCmd cmd = null;
-//               APIRequest request = new APIRequest();
-//               request.addParameters("defId", varTzqxdsrwb.getLiuChengId());
-//               request.addParameters("version", "0");
-//               request.addParameters("data", varTzqxdsrwb.getChuShiShuJu());
-//               cmd = pmInstProvider.getStartCmd(request);
-//               cmd.setSubject(varTzqxdsrwb.getRenWuMingCheng());
-//               cmd.setCurUser("jinyuan");
-//               cmd.setCurUserName("张维敏");
-//               IBpmProcInst inst = bpmProcInstService.startProcInst(cmd);
-//               log.info(inst.toString());
-//               cmd.setCurUserName("张维敏");
-//           }
-//       } catch (Exception e){
-//           log.error("执行任务发生了错误："+e);
-//       }
-//    }
-//
-//}
+package com.lc.ibps.task.services.impl;
+
+import com.lc.ibps.bpmn.api.IBpmInstService;
+import com.lc.ibps.bpmn.api.model.inst.IBpmProcInst;
+import com.lc.ibps.bpmn.api.service.BpmProcInstService;
+import com.lc.ibps.bpmn.cmd.IbpsProcInstCmd;
+import com.lc.ibps.bpmn.provider.BpmInstProvider;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.task.dao.TzqxdsrwbMapper;
+import com.lc.ibps.task.entity.Tzqxdsrwb;
+import com.lc.ibps.task.services.CycleTaskService;
+import com.lc.ibps.untils.DateUntil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+public class CycleTaskServiceImpl implements CycleTaskService {
+    @Resource
+    private BpmProcInstService bpmProcInstService;
+
+    @Autowired
+    private TzqxdsrwbMapper tzqxdsrwbMapper;
+
+    @Autowired
+    private BpmInstProvider pmInstProvider;
+
+    //  起动周期性任务流程
+    @Override
+    public void testTask(String id){
+        Tzqxdsrwb tzqxdsrwb= tzqxdsrwbMapper.selectByPrimaryKey(id);
+        startProcessTask(tzqxdsrwb);
+    }
+
+    //  起动周期性任务流程
+    @Override
+    public void startProcess(String startSign) {
+        List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTzqxdsrwb(startSign);
+        if(dataList!=null&&dataList.size()>0){
+            for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
+                startProcessTask(tzqxdsrwbTemp);
+            }
+        }
+    }
+    //  日期定时任务
+    @Override
+    public void timingTaskProcess() {
+        String dateSign=DateUntil.getFormatNow();//获取当前日期
+        List<Tzqxdsrwb> dataList= tzqxdsrwbMapper.getTimingTaskTzqxdsrwb(dateSign);
+        if(dataList!=null&&dataList.size()>0){
+            for(Tzqxdsrwb tzqxdsrwbTemp:dataList){
+                startProcessTask(tzqxdsrwbTemp);
+                updateTimingTask(tzqxdsrwbTemp);
+            }
+        }
+    }
+
+    //   日期定时任务业务处理
+    private void updateTimingTask(Tzqxdsrwb varTzqxdsrwb){
+        if(varTzqxdsrwb==null|| "".equals(varTzqxdsrwb.getId())){
+            return;
+        }
+        tzqxdsrwbMapper.updateTimingTaskSign(varTzqxdsrwb.getId());
+    }
+
+    //   开始任务
+    @Override
+    public void startProcessTask(Tzqxdsrwb varTzqxdsrwb){
+        try {
+            //  线程等 10000
+            Thread.sleep(20000);
+            if (varTzqxdsrwb != null) {
+                IbpsProcInstCmd cmd = null;
+                APIRequest request = new APIRequest();
+                request.addParameters("defId", varTzqxdsrwb.getLiuChengId());
+                request.addParameters("version", "0");
+                request.addParameters("data", varTzqxdsrwb.getChuShiShuJu());
+                cmd = pmInstProvider.getStartCmd(request);
+                cmd.setSubject(varTzqxdsrwb.getRenWuMingCheng());
+                cmd.setCurUser(varTzqxdsrwb.getBianZhiRen());
+
+                IBpmProcInst inst = bpmProcInstService.startProcInst(cmd);
+                log.info(inst.toString());
+            }
+        } catch (Exception e){
+            log.error("执行定时任务发生了错误："+e);
+        }
+    }
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/untils/LogAopUtil.java

@@ -0,0 +1,65 @@
+package com.lc.ibps.untils;
+
+import cn.hutool.core.date.StopWatch;
+import cn.hutool.json.JSONUtil;
+import com.lc.ibps.base.web.context.ContextUtil;
+import com.lc.ibps.cloud.utils.RequestUtil;
+import org.aspectj.lang.ProceedingJoinPoint;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author gaozl
+ */
+public class LogAopUtil {
+
+
+    public static String filterParam(Object[] pointArgs){
+        List<Object> paramList = Stream.of(pointArgs)
+                .filter(args -> !(args instanceof ServletRequest))
+                .filter(args -> !(args instanceof ServletResponse))
+                .collect(Collectors.toList());
+        return paramList.size() == 1 ? JSONUtil.toJsonStr(paramList.get(0)) : JSONUtil.toJsonStr(paramList);
+    }
+
+    public static Map<String,Object> log(HttpServletRequest request, ProceedingJoinPoint point,Object result, StopWatch stopWatch) {
+        Map<String,Object> map = new HashMap<>();
+        map.put("method_", point.getSignature().getName());
+        map.put("params_", filterParam(point.getArgs()));
+        map.put("user_id_", ContextUtil.getCurrentUser().getUserId());
+        map.put("user_name_", ContextUtil.getCurrentUser().getFullname());
+        map.put("time_", stopWatch.getTotalTimeMillis());
+        map.put("ip_", RequestUtil.getIpAddr(request));
+        map.put("response_", JSONUtil.toJsonStr(result));
+        map.put("uri_", request.getRequestURI());
+        map.put("type_", "正常日志");
+        return map;
+    }
+
+    public static Map<String,Object> logError(HttpServletRequest request, ProceedingJoinPoint point, Throwable throwable) {
+        // 记录操作日志
+        Map<String,Object> map = new HashMap<>();
+        map.put("method_", point.getSignature().getName());
+        map.put("params_", filterParam(point.getArgs()));
+        map.put("user_id_", ContextUtil.getCurrentUser().getUserId());
+        map.put("user_name_", ContextUtil.getCurrentUser().getFullname());
+        map.put("ip_", RequestUtil.getIpAddr(request));
+        map.put("uri_", request.getRequestURI());
+        map.put("type_", "报错日志");
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        throwable.printStackTrace(pw);
+        map.put("error_", sw.toString());
+        return map;
+    }
+
+}

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/wx/services/impl/wxServicesImpl.java

@@ -189,7 +189,7 @@ public class wxServicesImpl implements wxServices {
         request.addParameters("Q^NAME_^SL",map.get("name").toString());
         request.addParameters("Q^MOBILE_^SL",map.get("mobile").toString());
 
-        APIResult<APIPageList<PartyEmployeePo>> query = employeeServiceClient.query(request,"");
+        APIResult<APIPageList<PartyEmployeePo>> query = employeeServiceClient.query(request);
 
         List<PartyEmployeePo> result = query.getData().getDataResult();
         if (result==null || result.size()==0){ //未查询到数据

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/TzqxdsrwbMapper.xml

@@ -1,262 +1,262 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lc.ibps.task.dao.TzqxdsrwbMapper" >
-<!--  <resultMap id="BaseResultMap" type="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
-<!--    <id column="id_" property="id" jdbcType="VARCHAR" />-->
-<!--    <result column="tenant_id_" property="tenantId" jdbcType="VARCHAR" />-->
-<!--    <result column="ip_" property="ip" jdbcType="VARCHAR" />-->
-<!--    <result column="create_by_" property="createBy" jdbcType="VARCHAR" />-->
-<!--    <result column="create_time_" property="createTime" jdbcType="TIMESTAMP" />-->
-<!--    <result column="update_by_" property="updateBy" jdbcType="VARCHAR" />-->
-<!--    <result column="update_time_" property="updateTime" jdbcType="TIMESTAMP" />-->
-<!--    <result column="shi_fou_guo_shen_" property="shiFouGuoShen" jdbcType="VARCHAR" />-->
-<!--    <result column="bian_zhi_ren_" property="bianZhiRen" jdbcType="VARCHAR" />-->
-<!--    <result column="bian_zhi_bu_men_" property="bianZhiBuMen" jdbcType="VARCHAR" />-->
-<!--    <result column="bian_zhi_shi_jian" property="bianZhiShiJian" jdbcType="VARCHAR" />-->
-<!--    <result column="ren_wu_ming_cheng" property="renWuMingCheng" jdbcType="VARCHAR" />-->
-<!--    <result column="ren_wu_lei_bie_" property="renWuLeiBie" jdbcType="VARCHAR" />-->
-<!--    <result column="ren_wu_zhuang_tai" property="renWuZhuangTai" jdbcType="VARCHAR" />-->
-<!--    <result column="liu_cheng_id_" property="liuChengId" jdbcType="VARCHAR" />-->
-<!--    <result column="liu_cheng_ming_ch" property="liuChengMingCh" jdbcType="VARCHAR" />-->
-<!--    <result column="liu_cheng_ding_yi" property="liuChengDingYi" jdbcType="VARCHAR" />-->
-<!--    <result column="chu_shi_shu_ju_" property="chuShiShuJu" jdbcType="VARCHAR" />-->
-<!--    <result column="ren_wu_ri_qi_" property="renWuRiQi" jdbcType="VARCHAR" />-->
-<!--    <result column="zhi_xing_" property="zhiXing" jdbcType="VARCHAR" />-->
-<!--  </resultMap>-->
-<!--  <sql id="Base_Column_List" >-->
-<!--    id_, tenant_id_, ip_, create_by_, create_time_, update_by_, update_time_, shi_fou_guo_shen_, -->
-<!--    bian_zhi_ren_, bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, ren_wu_lei_bie_, -->
-<!--    ren_wu_zhuang_tai, liu_cheng_id_, liu_cheng_ming_ch, liu_cheng_ding_yi,chu_shi_shu_ju_,-->
-<!--    ren_wu_ri_qi_,zhi_xing_-->
-<!--  </sql>-->
-<!--  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >-->
-<!--    select -->
-<!--    <include refid="Base_Column_List" />-->
-<!--    from t_zqxdsrwb-->
-<!--    where id_ = #{id,jdbcType=VARCHAR}-->
-<!--  </select>-->
-<!--  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >-->
-<!--    delete from t_zqxdsrwb-->
-<!--    where id_ = #{id,jdbcType=VARCHAR}-->
-<!--  </delete>-->
-<!--  <insert id="insert" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
-<!--    insert into t_zqxdsrwb (id_, tenant_id_, ip_, -->
-<!--      create_by_, create_time_, update_by_, -->
-<!--      update_time_, shi_fou_guo_shen_, bian_zhi_ren_, -->
-<!--      bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, -->
-<!--      ren_wu_lei_bie_, ren_wu_zhuang_tai, liu_cheng_id_, -->
-<!--      liu_cheng_ming_ch, liu_cheng_ding_yi)-->
-<!--    values (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, -->
-<!--      #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, -->
-<!--      #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, -->
-<!--      #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{renWuMingCheng,jdbcType=VARCHAR}, -->
-<!--      #{renWuLeiBie,jdbcType=VARCHAR}, #{renWuZhuangTai,jdbcType=VARCHAR}, #{liuChengId,jdbcType=VARCHAR}, -->
-<!--      #{liuChengMingCh,jdbcType=VARCHAR}, #{liuChengDingYi,jdbcType=VARCHAR})-->
-<!--  </insert>-->
-<!--  <insert id="insertSelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
-<!--    insert into t_zqxdsrwb-->
-<!--    <trim prefix="(" suffix=")" suffixOverrides="," >-->
-<!--      <if test="id != null" >-->
-<!--        id_,-->
-<!--      </if>-->
-<!--      <if test="tenantId != null" >-->
-<!--        tenant_id_,-->
-<!--      </if>-->
-<!--      <if test="ip != null" >-->
-<!--        ip_,-->
-<!--      </if>-->
-<!--      <if test="createBy != null" >-->
-<!--        create_by_,-->
-<!--      </if>-->
-<!--      <if test="createTime != null" >-->
-<!--        create_time_,-->
-<!--      </if>-->
-<!--      <if test="updateBy != null" >-->
-<!--        update_by_,-->
-<!--      </if>-->
-<!--      <if test="updateTime != null" >-->
-<!--        update_time_,-->
-<!--      </if>-->
-<!--      <if test="shiFouGuoShen != null" >-->
-<!--        shi_fou_guo_shen_,-->
-<!--      </if>-->
-<!--      <if test="bianZhiRen != null" >-->
-<!--        bian_zhi_ren_,-->
-<!--      </if>-->
-<!--      <if test="bianZhiBuMen != null" >-->
-<!--        bian_zhi_bu_men_,-->
-<!--      </if>-->
-<!--      <if test="bianZhiShiJian != null" >-->
-<!--        bian_zhi_shi_jian,-->
-<!--      </if>-->
-<!--      <if test="renWuMingCheng != null" >-->
-<!--        ren_wu_ming_cheng,-->
-<!--      </if>-->
-<!--      <if test="renWuLeiBie != null" >-->
-<!--        ren_wu_lei_bie_,-->
-<!--      </if>-->
-<!--      <if test="renWuZhuangTai != null" >-->
-<!--        ren_wu_zhuang_tai,-->
-<!--      </if>-->
-<!--      <if test="liuChengId != null" >-->
-<!--        liu_cheng_id_,-->
-<!--      </if>-->
-<!--      <if test="liuChengMingCh != null" >-->
-<!--        liu_cheng_ming_ch,-->
-<!--      </if>-->
-<!--      <if test="liuChengDingYi != null" >-->
-<!--        liu_cheng_ding_yi,-->
-<!--      </if>-->
-<!--    </trim>-->
-<!--    <trim prefix="values (" suffix=")" suffixOverrides="," >-->
-<!--      <if test="id != null" >-->
-<!--        #{id,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="tenantId != null" >-->
-<!--        #{tenantId,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="ip != null" >-->
-<!--        #{ip,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="createBy != null" >-->
-<!--        #{createBy,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="createTime != null" >-->
-<!--        #{createTime,jdbcType=TIMESTAMP},-->
-<!--      </if>-->
-<!--      <if test="updateBy != null" >-->
-<!--        #{updateBy,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="updateTime != null" >-->
-<!--        #{updateTime,jdbcType=TIMESTAMP},-->
-<!--      </if>-->
-<!--      <if test="shiFouGuoShen != null" >-->
-<!--        #{shiFouGuoShen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiRen != null" >-->
-<!--        #{bianZhiRen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiBuMen != null" >-->
-<!--        #{bianZhiBuMen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiShiJian != null" >-->
-<!--        #{bianZhiShiJian,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuMingCheng != null" >-->
-<!--        #{renWuMingCheng,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuLeiBie != null" >-->
-<!--        #{renWuLeiBie,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuZhuangTai != null" >-->
-<!--        #{renWuZhuangTai,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengId != null" >-->
-<!--        #{liuChengId,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengMingCh != null" >-->
-<!--        #{liuChengMingCh,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengDingYi != null" >-->
-<!--        #{liuChengDingYi,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--    </trim>-->
-<!--  </insert>-->
-<!--  <update id="updateByPrimaryKeySelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
-<!--    update t_zqxdsrwb-->
-<!--    <set >-->
-<!--      <if test="tenantId != null" >-->
-<!--        tenant_id_ = #{tenantId,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="ip != null" >-->
-<!--        ip_ = #{ip,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="createBy != null" >-->
-<!--        create_by_ = #{createBy,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="createTime != null" >-->
-<!--        create_time_ = #{createTime,jdbcType=TIMESTAMP},-->
-<!--      </if>-->
-<!--      <if test="updateBy != null" >-->
-<!--        update_by_ = #{updateBy,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="updateTime != null" >-->
-<!--        update_time_ = #{updateTime,jdbcType=TIMESTAMP},-->
-<!--      </if>-->
-<!--      <if test="shiFouGuoShen != null" >-->
-<!--        shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiRen != null" >-->
-<!--        bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiBuMen != null" >-->
-<!--        bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="bianZhiShiJian != null" >-->
-<!--        bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuMingCheng != null" >-->
-<!--        ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuLeiBie != null" >-->
-<!--        ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="renWuZhuangTai != null" >-->
-<!--        ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengId != null" >-->
-<!--        liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengMingCh != null" >-->
-<!--        liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--      <if test="liuChengDingYi != null" >-->
-<!--        liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR},-->
-<!--      </if>-->
-<!--    </set>-->
-<!--    where id_ = #{id,jdbcType=VARCHAR}-->
-<!--  </update>-->
-<!--  <update id="updateByPrimaryKey" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >-->
-<!--    update t_zqxdsrwb-->
-<!--    set tenant_id_ = #{tenantId,jdbcType=VARCHAR},-->
-<!--      ip_ = #{ip,jdbcType=VARCHAR},-->
-<!--      create_by_ = #{createBy,jdbcType=VARCHAR},-->
-<!--      create_time_ = #{createTime,jdbcType=TIMESTAMP},-->
-<!--      update_by_ = #{updateBy,jdbcType=VARCHAR},-->
-<!--      update_time_ = #{updateTime,jdbcType=TIMESTAMP},-->
-<!--      shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},-->
-<!--      bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},-->
-<!--      bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},-->
-<!--      bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},-->
-<!--      ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},-->
-<!--      ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},-->
-<!--      ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},-->
-<!--      liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},-->
-<!--      liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},-->
-<!--      liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR}-->
-<!--    where id_ = #{id,jdbcType=VARCHAR}-->
-<!--  </update>-->
+    <resultMap id="BaseResultMap" type="com.lc.ibps.task.entity.Tzqxdsrwb" >
+        <id column="id_" property="id" jdbcType="VARCHAR" />
+        <result column="tenant_id_" property="tenantId" jdbcType="VARCHAR" />
+        <result column="ip_" property="ip" jdbcType="VARCHAR" />
+        <result column="create_by_" property="createBy" jdbcType="VARCHAR" />
+        <result column="create_time_" property="createTime" jdbcType="TIMESTAMP" />
+        <result column="update_by_" property="updateBy" jdbcType="VARCHAR" />
+        <result column="update_time_" property="updateTime" jdbcType="TIMESTAMP" />
+        <result column="shi_fou_guo_shen_" property="shiFouGuoShen" jdbcType="VARCHAR" />
+        <result column="bian_zhi_ren_" property="bianZhiRen" jdbcType="VARCHAR" />
+        <result column="bian_zhi_bu_men_" property="bianZhiBuMen" jdbcType="VARCHAR" />
+        <result column="bian_zhi_shi_jian" property="bianZhiShiJian" jdbcType="VARCHAR" />
+        <result column="ren_wu_ming_cheng" property="renWuMingCheng" jdbcType="VARCHAR" />
+        <result column="ren_wu_lei_bie_" property="renWuLeiBie" jdbcType="VARCHAR" />
+        <result column="ren_wu_zhuang_tai" property="renWuZhuangTai" jdbcType="VARCHAR" />
+        <result column="liu_cheng_id_" property="liuChengId" jdbcType="VARCHAR" />
+        <result column="liu_cheng_ming_ch" property="liuChengMingCh" jdbcType="VARCHAR" />
+        <result column="liu_cheng_ding_yi" property="liuChengDingYi" jdbcType="VARCHAR" />
+        <result column="chu_shi_shu_ju_" property="chuShiShuJu" jdbcType="VARCHAR" />
+        <result column="ren_wu_ri_qi_" property="renWuRiQi" jdbcType="VARCHAR" />
+        <result column="zhi_xing_" property="zhiXing" jdbcType="VARCHAR" />
+    </resultMap>
+    <sql id="Base_Column_List" >
+        id_, tenant_id_, ip_, create_by_, create_time_, update_by_, update_time_, shi_fou_guo_shen_,
+    bian_zhi_ren_, bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng, ren_wu_lei_bie_,
+    ren_wu_zhuang_tai, liu_cheng_id_, liu_cheng_ming_ch, liu_cheng_ding_yi,chu_shi_shu_ju_,
+    ren_wu_ri_qi_,zhi_xing_
+    </sql>
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from t_zqxdsrwb
+        where id_ = #{id,jdbcType=VARCHAR}
+    </select>
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+        delete from t_zqxdsrwb
+        where id_ = #{id,jdbcType=VARCHAR}
+    </delete>
+    <insert id="insert" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
+        insert into t_zqxdsrwb (id_, tenant_id_, ip_,
+                                create_by_, create_time_, update_by_,
+                                update_time_, shi_fou_guo_shen_, bian_zhi_ren_,
+                                bian_zhi_bu_men_, bian_zhi_shi_jian, ren_wu_ming_cheng,
+                                ren_wu_lei_bie_, ren_wu_zhuang_tai, liu_cheng_id_,
+                                liu_cheng_ming_ch, liu_cheng_ding_yi)
+        values (#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR},
+                #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR},
+                #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{renWuMingCheng,jdbcType=VARCHAR},
+                #{renWuLeiBie,jdbcType=VARCHAR}, #{renWuZhuangTai,jdbcType=VARCHAR}, #{liuChengId,jdbcType=VARCHAR},
+                #{liuChengMingCh,jdbcType=VARCHAR}, #{liuChengDingYi,jdbcType=VARCHAR})
+    </insert>
+    <insert id="insertSelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
+        insert into t_zqxdsrwb
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                id_,
+            </if>
+            <if test="tenantId != null" >
+                tenant_id_,
+            </if>
+            <if test="ip != null" >
+                ip_,
+            </if>
+            <if test="createBy != null" >
+                create_by_,
+            </if>
+            <if test="createTime != null" >
+                create_time_,
+            </if>
+            <if test="updateBy != null" >
+                update_by_,
+            </if>
+            <if test="updateTime != null" >
+                update_time_,
+            </if>
+            <if test="shiFouGuoShen != null" >
+                shi_fou_guo_shen_,
+            </if>
+            <if test="bianZhiRen != null" >
+                bian_zhi_ren_,
+            </if>
+            <if test="bianZhiBuMen != null" >
+                bian_zhi_bu_men_,
+            </if>
+            <if test="bianZhiShiJian != null" >
+                bian_zhi_shi_jian,
+            </if>
+            <if test="renWuMingCheng != null" >
+                ren_wu_ming_cheng,
+            </if>
+            <if test="renWuLeiBie != null" >
+                ren_wu_lei_bie_,
+            </if>
+            <if test="renWuZhuangTai != null" >
+                ren_wu_zhuang_tai,
+            </if>
+            <if test="liuChengId != null" >
+                liu_cheng_id_,
+            </if>
+            <if test="liuChengMingCh != null" >
+                liu_cheng_ming_ch,
+            </if>
+            <if test="liuChengDingYi != null" >
+                liu_cheng_ding_yi,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                #{id,jdbcType=VARCHAR},
+            </if>
+            <if test="tenantId != null" >
+                #{tenantId,jdbcType=VARCHAR},
+            </if>
+            <if test="ip != null" >
+                #{ip,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null" >
+                #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null" >
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null" >
+                #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null" >
+                #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="shiFouGuoShen != null" >
+                #{shiFouGuoShen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiRen != null" >
+                #{bianZhiRen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiBuMen != null" >
+                #{bianZhiBuMen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiShiJian != null" >
+                #{bianZhiShiJian,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuMingCheng != null" >
+                #{renWuMingCheng,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuLeiBie != null" >
+                #{renWuLeiBie,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuZhuangTai != null" >
+                #{renWuZhuangTai,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengId != null" >
+                #{liuChengId,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengMingCh != null" >
+                #{liuChengMingCh,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengDingYi != null" >
+                #{liuChengDingYi,jdbcType=VARCHAR},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
+        update t_zqxdsrwb
+        <set >
+            <if test="tenantId != null" >
+                tenant_id_ = #{tenantId,jdbcType=VARCHAR},
+            </if>
+            <if test="ip != null" >
+                ip_ = #{ip,jdbcType=VARCHAR},
+            </if>
+            <if test="createBy != null" >
+                create_by_ = #{createBy,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null" >
+                create_time_ = #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updateBy != null" >
+                update_by_ = #{updateBy,jdbcType=VARCHAR},
+            </if>
+            <if test="updateTime != null" >
+                update_time_ = #{updateTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="shiFouGuoShen != null" >
+                shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiRen != null" >
+                bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiBuMen != null" >
+                bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},
+            </if>
+            <if test="bianZhiShiJian != null" >
+                bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuMingCheng != null" >
+                ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuLeiBie != null" >
+                ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},
+            </if>
+            <if test="renWuZhuangTai != null" >
+                ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengId != null" >
+                liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengMingCh != null" >
+                liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},
+            </if>
+            <if test="liuChengDingYi != null" >
+                liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR},
+            </if>
+        </set>
+        where id_ = #{id,jdbcType=VARCHAR}
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.lc.ibps.task.entity.Tzqxdsrwb" >
+        update t_zqxdsrwb
+        set tenant_id_ = #{tenantId,jdbcType=VARCHAR},
+            ip_ = #{ip,jdbcType=VARCHAR},
+            create_by_ = #{createBy,jdbcType=VARCHAR},
+            create_time_ = #{createTime,jdbcType=TIMESTAMP},
+            update_by_ = #{updateBy,jdbcType=VARCHAR},
+            update_time_ = #{updateTime,jdbcType=TIMESTAMP},
+            shi_fou_guo_shen_ = #{shiFouGuoShen,jdbcType=VARCHAR},
+            bian_zhi_ren_ = #{bianZhiRen,jdbcType=VARCHAR},
+            bian_zhi_bu_men_ = #{bianZhiBuMen,jdbcType=VARCHAR},
+            bian_zhi_shi_jian = #{bianZhiShiJian,jdbcType=VARCHAR},
+            ren_wu_ming_cheng = #{renWuMingCheng,jdbcType=VARCHAR},
+            ren_wu_lei_bie_ = #{renWuLeiBie,jdbcType=VARCHAR},
+            ren_wu_zhuang_tai = #{renWuZhuangTai,jdbcType=VARCHAR},
+            liu_cheng_id_ = #{liuChengId,jdbcType=VARCHAR},
+            liu_cheng_ming_ch = #{liuChengMingCh,jdbcType=VARCHAR},
+            liu_cheng_ding_yi = #{liuChengDingYi,jdbcType=VARCHAR}
+        where id_ = #{id,jdbcType=VARCHAR}
+    </update>
 
 
-<!--  <select id="getTzqxdsrwb" resultMap="BaseResultMap" parameterType="java.lang.String" >-->
-<!--    select-->
-<!--    <include refid="Base_Column_List" />-->
-<!--    from t_zqxdsrwb-->
-<!--    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ = #{startSign,jdbcType=VARCHAR}-->
+    <select id="getTzqxdsrwb" resultMap="BaseResultMap" parameterType="java.lang.String" >
+        select
+        <include refid="Base_Column_List" />
+        from t_zqxdsrwb
+        where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ = #{startSign,jdbcType=VARCHAR}
 
-<!--  </select>-->
+    </select>
 
-<!--  <select id="getTimingTaskTzqxdsrwb" resultMap="BaseResultMap"  >-->
-<!--    select-->
-<!--    <include refid="Base_Column_List" />-->
-<!--    from t_zqxdsrwb-->
-<!--    where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ <![CDATA[ = ]]> '日期定时' and zhi_xing_ <![CDATA[ <> ]]> '已执行'-->
-<!--          and ren_wu_ri_qi_ <![CDATA[ = ]]> #{dateSign}-->
-<!--  </select>-->
+    <select id="getTimingTaskTzqxdsrwb" resultMap="BaseResultMap"  >
+        select
+        <include refid="Base_Column_List" />
+        from t_zqxdsrwb
+        where ren_wu_zhuang_tai <![CDATA[ = ]]> 1 and ren_wu_lei_bie_ <![CDATA[ = ]]> '日期定时' and zhi_xing_ <![CDATA[ <> ]]> '已执行'
+        and ren_wu_ri_qi_ <![CDATA[ = ]]> #{dateSign}
+    </select>
 
-<!-- <update id="updateTimingTaskSign" >-->
-<!--    update t_zqxdsrwb set zhi_xing_='已执行' where  id_=#{id}-->
-<!-- </update>-->
+    <update id="updateTimingTaskSign" >
+        update t_zqxdsrwb set zhi_xing_='已执行' where  id_=#{id}
+    </update>
 
 
 </mapper>

ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/klimsibps/mapping/UpdateDataTableMapper.xml

@@ -247,10 +247,10 @@
 
     <!--  添加操作日志   -->
     <insert  id="insertLog"  parameterType="java.util.Map">
-        INSERT INTO t_business_log (method_, params_, user_id_, user_name_, create_time_, time_, ip_, response_, uri_)
+        INSERT INTO t_business_log (method_, params_, user_id_, user_name_, create_time_, time_, ip_, response_, uri_ , type_ , error_)
          values
         (#{map.method_},#{map.params_},#{map.user_id_},#{map.user_name_},now(),
-         #{map.time_},#{map.ip_},#{map.response_},#{map.uri_})
+         #{map.time_},#{map.ip_},#{map.response_},#{map.uri_},#{map.type_},#{map.error_})
     </insert >
 
 </mapper>

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/org/provider/PartyEmployeeProvider.java

@@ -1,25 +1,5 @@
 package com.lc.ibps.org.provider;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.Resource;
-
-import com.lc.ibps.cloud.entity.*;
-import com.lc.ibps.org.party.persistence.entity.*;
-import org.apache.bcel.generic.I2F;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.event.Level;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-
 import com.lc.ibps.api.base.constants.StateEnum;
 import com.lc.ibps.api.base.query.QueryFilter;
 import com.lc.ibps.api.base.query.QueryOP;
@@ -38,6 +18,10 @@ import com.lc.ibps.base.core.util.JacksonUtil;
 import com.lc.ibps.base.core.util.string.StringUtil;
 import com.lc.ibps.base.framework.id.UniqueIdUtil;
 import com.lc.ibps.base.framework.request.signature.annotation.Signature;
+import com.lc.ibps.cloud.entity.APIPageList;
+import com.lc.ibps.cloud.entity.APIRequest;
+import com.lc.ibps.cloud.entity.APIRequestParameter;
+import com.lc.ibps.cloud.entity.APIResult;
 import com.lc.ibps.cloud.oauth.constants.RedisKey;
 import com.lc.ibps.cloud.provider.GenericProvider;
 import com.lc.ibps.cloud.redis.config.AppConfig;
@@ -56,38 +40,23 @@ import com.lc.ibps.org.party.builder.PartyParamsValidator;
 import com.lc.ibps.org.party.builder.PartyRoleBuilder;
 import com.lc.ibps.org.party.builder.PartyUserGroupBuilder;
 import com.lc.ibps.org.party.domain.PartyEmployee;
-import com.lc.ibps.org.party.persistence.entity.PartyAttrPo;
-import com.lc.ibps.org.party.persistence.entity.PartyEmployeePo;
-import com.lc.ibps.org.party.persistence.entity.PartyEntityPo;
-import com.lc.ibps.org.party.persistence.entity.PartyGroupPo;
-import com.lc.ibps.org.party.persistence.entity.PartyLevelPo;
-import com.lc.ibps.org.party.persistence.entity.PartyOrgPo;
-import com.lc.ibps.org.party.persistence.entity.PartyPositionPo;
-import com.lc.ibps.org.party.persistence.entity.PartyRelPo;
-import com.lc.ibps.org.party.persistence.entity.PartyRolePo;
-import com.lc.ibps.org.party.persistence.entity.PartyUserGroupPo;
-import com.lc.ibps.org.party.persistence.entity.PartyUserPo;
+import com.lc.ibps.org.party.persistence.entity.*;
 import com.lc.ibps.org.party.persistence.helper.PartyEmlpoyeeValidator;
 import com.lc.ibps.org.party.persistence.vo.PartyEmployeeVo;
-import com.lc.ibps.org.party.repository.DefaultPartyUserRepository;
-import com.lc.ibps.org.party.repository.PartyAttrRepository;
-import com.lc.ibps.org.party.repository.PartyEmployeeRepository;
-import com.lc.ibps.org.party.repository.PartyEntityRepository;
-import com.lc.ibps.org.party.repository.PartyGroupRepository;
-import com.lc.ibps.org.party.repository.PartyLevelRepository;
-import com.lc.ibps.org.party.repository.PartyOrgRepository;
-import com.lc.ibps.org.party.repository.PartyPositionRepository;
-import com.lc.ibps.org.party.repository.PartyRelRepository;
-import com.lc.ibps.org.party.repository.PartyRoleRepository;
-import com.lc.ibps.org.party.repository.PartyUserGroupRepository;
-import com.lc.ibps.org.party.repository.PartyUserRepository;
+import com.lc.ibps.org.party.repository.*;
 import com.lc.ibps.org.vo.IdKeyVo;
+import io.swagger.annotations.*;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.event.Level;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.Extension;
-import io.swagger.annotations.ExtensionProperty;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.Map.Entry;
 
 /**
  * 员工管理
@@ -144,21 +113,21 @@ public class PartyEmployeeProvider extends GenericProvider implements IPartyEmpl
 	@Override
 	public APIResult<APIPageList<PartyEmployeePo>> query(
 			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true)
-			@RequestBody(required = true) APIRequest request,
-			@RequestParam(name = "position", required = false) String position) {
+			@RequestBody(required = true) APIRequest request) {
 		APIResult<APIPageList<PartyEmployeePo>> result = new APIResult<>();
 		try {
 			List<PartyEmployeePo> list;
 			QueryFilter queryFilter = getQueryFilter(request);
-			if (StringUtil.isNotEmpty(position)){
-				queryFilter.addFilter("PATH_", "%" + position + "%" , QueryOP.LIKE);
+			if (request.getCustoms()!=null){
+				queryFilter.addFilter("PATH_", "%" + request.getCustoms().get("position") + "%" , QueryOP.LIKE);
+				partyEmployeeRepository.setQueryOrgPath();
 				list = partyEmployeeRepository.getEmployeeByPosition(queryFilter);
 			}else {
 				handleParams("query", request, queryFilter);
 				partyEmployeeRepository.setQueryOrgPath();
 				list = partyEmployeeRepository.query(queryFilter);
-				partyEmployeeRepository.removeQueryOrgPath();
 			}
+			partyEmployeeRepository.removeQueryOrgPath();
 			//List<PartyEmployeePo> data = partyEmployeeRepository.transferPoList(list);
 			//fillOrgName(data);
 			APIPageList<PartyEmployeePo> apiPageData = getAPIPageList(list);

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/org/provider/PartyUserProvider.java

@@ -181,6 +181,7 @@ public class PartyUserProvider extends GenericProvider implements IPartyUserServ
 			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true) 
 			@RequestBody(required = true) APIRequest request) {
 		APIResult<APIPageList<PartyUserPo>> result = new APIResult<>();
+
 		try {
 			QueryFilter queryFilter = getQueryFilter(request);
 			
@@ -213,6 +214,7 @@ public class PartyUserProvider extends GenericProvider implements IPartyUserServ
 			@ApiParam(name = "request", value = "传入查询请求json字符串", required = true) 
 			@RequestBody(required = true) APIRequest request) {
 		APIResult<APIPageList<PartyUserPo>> result = new APIResult<>();
+
 		try {
 			logger.debug("com.lc.ibps.org.provider.PartyUserProvider.query4Role()--->params={}",
 					BeanUtils.isNotEmpty(request.getParameters()) ? request.getParameters().toString() : "");
@@ -228,7 +230,9 @@ public class PartyUserProvider extends GenericProvider implements IPartyUserServ
 			} catch (Exception e) {
 				return result;
 			}
-
+			if (request.getCustoms()!=null){
+				queryFilter.addParamsFilter("position", "%" + request.getCustoms().get("position") + "%");
+			}
 			List<PartyUserPo> list = partyUserRepository.queryDialogUserByParam4Role(queryFilter, roleId);
 			APIPageList<PartyUserPo> pageList = getAPIPageList(list);
 			result.setData(pageList);