Reverse 1260

git-svn-id: https://192.168.57.71/svn/jsgkj@1372 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/ButtonServiceImpl.java

@@ -26,6 +26,7 @@ public class ButtonServiceImpl extends BaseUUIDModelServiceImpl<ButtonModel> imp
         return mapper.deleteByMenu(menu);
     }
 
+    @Override
     public List<ButtonModel> selectAllByUser(GroupModelDto dto) {
         return mapper.selectAllByUser(dto);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/MenuServiceImpl.java

@@ -37,14 +37,17 @@ public class MenuServiceImpl extends BaseUUIDModelServiceImpl<MenuModel> impleme
         return mapper.selectAllByPid(pid);
     }
 
+    @Override
     public List<MenuModel> findAllByCond(MenuModel model) {
         return mapper.selectAllByCond(model);
     }
 
+    @Override
     public List<MenuModel> findAllBtnByCond(MenuModel model) {
         return mapper.selectAllBtnByCond(model);
     }
 
+    @Override
     public List<MenuModel> selectAllByUser(GroupModelDto dto) {
         return mapper.selectAllByUser(dto);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/TaskModelServiceImpl.java

@@ -19,6 +19,7 @@ public class TaskModelServiceImpl extends BaseUUIDModelServiceImpl<TaskModel> im
         return taskModelMapper;
     }
 
+    @Override
     public TaskModel findByTaskId(String taskId) {
         return taskModelMapper.selectByTaskId(taskId);
     }

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/service/impl/WFPropServiceImpl.java

@@ -28,6 +28,7 @@ public class WFPropServiceImpl extends BaseUUIDModelServiceImpl<WfPropModel> imp
         return mapper;
     }
 
+    @Override
     public boolean checkProp(String wfKey, String activity, String propName, String value) {
         List<WfPropModel> props = mapper.selectByCondition(wfKey, activity, propName);
         if (props != null && props.size() > 0) {

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/wf/impl/WorkflowMangerServiceImpl.java

@@ -102,6 +102,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
+    @Override
     public void autoComplete(WorkFlowParam param, String processInstanceId, Map<String, Object> variables) {
         List<Task> taskList = getProcessActiveTasks(processInstanceId);
         if (null == taskList) { return; }
@@ -259,6 +260,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         return no.toString();
     }
 
+    @Override
     public String create(WorkFlowParam param, Map<String, Object> variables, String processDefinitionKey) {
         // 流程定义key存在判断
         Assert.hasLength(processDefinitionKey);
@@ -321,6 +323,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         return variables;
     }
 
+    @Override
     public Object getProcessInstanceVariables(String busId, String processDefinitionKey, String variableName) {
         String businessKey = processDefinitionKey + BUSKEYSEP + busId;
         HistoricProcessInstance pi = historyService.createHistoricProcessInstanceQuery()
@@ -486,6 +489,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         return currBz;
     }
 
+    @Override
     public Task getTaskByTaskId(String taskId) {
         return taskService.createTaskQuery().taskId(taskId).singleResult();
     }
@@ -525,6 +529,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
      * 签收处理<br>
      * {@inheritDoc}
      */
+    @Override
     public void claim(String taskId, String userId) {
         if (!StringUtils.hasLength(userId)) { throw new ActivitiException("user.is.null"); }
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
@@ -755,15 +760,18 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         return processDefinition;
     }
 
+    @Override
     public JsonResult todoList(com.xt.js.gkaq.frame.wf.SinglePageRequest pageRequest, String userid, String busKey,
             Date begin, Date end) {
         throw new IllegalArgumentException("method not supported!");
     }
 
+    @Override
     public List<TaskModel> doneList(String busKey, Long userid) {
         throw new IllegalArgumentException("method not supported!");
     }
 
+    @Override
     public List<TaskModel> doneList(Long runnerId) {
         throw new IllegalArgumentException("method not supported!");
     }

gkaqv2/trunk/modules/frame/src/main/resources/com/xt/js/gkaq/frame/mappers/CodeModelMapper.xml

@@ -76,14 +76,11 @@
 	        and P.CODE = #{pcode,jdbcType=VARCHAR}
 	    </if>
 	    <if test="code != null and code != ''">
-	        and C.CODE like #{code,jdbcType=VARCHAR} 
+	        and C.CODE like #{code,jdbcType=VARCHAR}
 	    </if>
 	    <if test="text != null and text != ''">
 	        and C.TEXT like #{text,jdbcType=VARCHAR}
 	    </if>
-	    <if test="ptext != null and ptext != ''">
-	    	and C.PCODE = #{ptext,jdbcType=VARCHAR} 
-	    </if>
     </where>
     order by C.PCODE desc, C.SORTNO
   </select>