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

gkaqv2/trunk/modules/frame/src/main/java/com/xt/js/gkaq/frame/mappers/TaskModelMapper.java

@@ -1,8 +1,18 @@
 package com.xt.js.gkaq.frame.mappers;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseMapper;
 import com.xt.js.gkaq.frame.model.TaskModel;
 
 public interface TaskModelMapper extends BaseMapper<TaskModel> {
     TaskModel selectByTaskId(String taskId);
+
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    List<TaskModel> selectAllByCond(TaskModel model);
 }

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

@@ -1,8 +1,17 @@
 package com.xt.js.gkaq.frame.service;
 
+import java.util.List;
+
 import com.xt.js.gkaq.common.BaseUUIDModelService;
 import com.xt.js.gkaq.frame.model.TaskModel;
 
 public interface TaskModelService extends BaseUUIDModelService<TaskModel> {
     TaskModel findByTaskId(String taskId);
+    /**
+     * ¸ù¾ÝÌõ¼þ²éѯÊý¾Ý¼¯ºÏ
+     * 
+     * @param model
+     * @return
+     */
+    public List<TaskModel> findAllByCond(TaskModel model);
 }

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

@@ -1,5 +1,7 @@
 package com.xt.js.gkaq.frame.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,4 +26,9 @@ public class TaskModelServiceImpl extends BaseUUIDModelServiceImpl<TaskModel> im
         return taskModelMapper.selectByTaskId(taskId);
     }
 
+    @Override
+    public List<TaskModel> findAllByCond(TaskModel model) {
+        return taskModelMapper.selectAllByCond(model);
+    }
+
 }

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

@@ -41,6 +41,7 @@ public class ActivitiUtils {
      * @return
      */
     public static GroupEntity toActivitiGroup(RoleModel role) {
+        // TODO ¿¼ÂǽÇÉ«¡¢·Ö×é¡¢×éÖ¯
         GroupEntity groupEntity = new GroupEntity();
         groupEntity.setRevision(1);
         groupEntity.setType("assignment");

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

@@ -65,6 +65,7 @@ public class MyGroupEntityManager extends GroupEntityManager {
 
     @Override
     public List<Group> findGroupsByUser(String userId) {
+        // TODO ¿¼ÂǽÇÉ«¡¢·Ö×é¡¢×éÖ¯
         // Group List
         List<Group> groupList = new ArrayList<Group>();
         List<RoleModel> roles = roleService.findByUserId(userId);

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

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import org.activiti.engine.task.Task;
 
+import com.xt.js.gkaq.common.SinglePageRequest;
 import com.xt.js.gkaq.frame.model.TaskModel;
 import com.yuanxd.tools.io.http.JsonResult;
 

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

@@ -1,6 +1,5 @@
 package com.xt.js.gkaq.frame.wf.impl;
 
-import java.awt.print.Pageable;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -20,8 +19,6 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.history.HistoricVariableInstance;
-import org.activiti.engine.impl.Page;
-import org.activiti.engine.impl.persistence.entity.UserEntity;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.IdentityLink;
@@ -35,7 +32,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import com.xt.js.gkaq.common.BaseUUIDModel;
-import com.xt.js.gkaq.common.Constants;
 import com.xt.js.gkaq.common.IdGenerator;
 import com.xt.js.gkaq.common.SinglePageRequest;
 import com.xt.js.gkaq.common.UUIDGenerator;
@@ -99,7 +95,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
     /** IDÖ÷¼üÉú³ÉÆ÷ */
     protected IdGenerator idGenerator = new UUIDGenerator();
 
-    @Autowired
+//    @Autowired
     private JdbcTemplate jdbcTemplate;
 
     @Override
@@ -600,17 +596,18 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         ManagementService ms = processEngine.getManagementService();
         sqlBuffer.append(ms.getTableName(Task.class));
         sqlBuffer.append(" T WHERE T .SUSPENSION_STATE_ = 1  ");
-        String workFlowCode = "";
+//        String workFlowCode = "";
         if (!StringUtils.isEmpty(busKey)) {
-            if (!StringUtils.isEmpty(busKey)) {
-                if (StringUtils.isEmpty(workFlowCode) || workFlowCode.indexOf("'" + busKey + "'") >= 0)
-                    workFlowCode = "'" + busKey + "'";
-                else workFlowCode = "NULL";
-            }
+//            if (!StringUtils.isEmpty(busKey)) {
+//                if (StringUtils.isEmpty(workFlowCode) || workFlowCode.indexOf("'" + busKey + "'") >= 0)
+//                    workFlowCode = "'" + busKey + "'";
+//                else workFlowCode = "NULL";
+//            }
             sqlBuffer.append(" AND EXISTS(SELECT 1 FROM ");
             sqlBuffer.append(ms.getTableName(ProcessDefinition.class));
             sqlBuffer.append(" P WHERE P.ID_=T.PROC_DEF_ID_ AND P.KEY_ IN (");
-            sqlBuffer.append(workFlowCode);
+//            sqlBuffer.append(workFlowCode);
+            sqlBuffer.append("'").append(busKey).append("'");
             sqlBuffer.append(")) ");
         }
         if (begin != null) sqlBuffer.append(" AND T.CREATE_TIME_ >= #{begin} ");
@@ -619,6 +616,7 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
         sqlBuffer.append("OR (T.ASSIGNEE_ IS NULL AND EXISTS (SELECT 1 FROM ACT_RU_IDENTITYLINK ");
         sqlBuffer.append(" I WHERE I.TYPE_ = 'candidate' AND I.TASK_ID_ = T .ID_ ");
         sqlBuffer.append("AND (I.USER_ID_ = #{userId} OR I.GROUP_ID_ IN ");
+        // TODO
         sqlBuffer.append("(SELECT r.ROLE_TYPE FROM T_YJPT_ROLE_USER ru,T_YJPT_ROLE r ");
         sqlBuffer.append("WHERE r.ID=ru.ROLEID AND ru.USERID =#{userId} ))");
         sqlBuffer.append(
@@ -761,12 +759,6 @@ public class WorkflowMangerServiceImpl implements WorkflowMangerService {
     }
 
     @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!");
     }

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

@@ -100,4 +100,22 @@
     from AQ_BASIC_FRAME_TASK
     where TASK_ID = #{taskId,jdbcType=VARCHAR}
   </select>
+  <select id="selectAllByCond" resultMap="BaseResultMap" parameterType="com.xt.js.gkaq.frame.model.TaskModel" >
+    select ID, TASK_ID, BUS_ID, STEP, START_TIME, START_USER, CURR_NAME, RUNNER, RUN_TIME, 
+    AUDIT_TIME, AUDIT_MSG, AUDIT_RESULT, QYLB, SSQY, BUS_KEY, AUDIT_USER, TASK_KEY, ROLE_CODE, 
+    AUDIT_USERNAME, SZD, CREATE_TIME, UPDATE_TIME, CREATE_USER, UPDATE_USER, STATE
+    from AQ_BASIC_FRAME_TASK
+    <where>
+	    <if test="taskKey != null and taskKey != ''">
+	        and TASK_KEY = #{taskKey,jdbcType=VARCHAR}
+	    </if>
+	    <if test="createTime != null">
+	        and START_TIME &gt;= #{createTime,jdbcType=TIMESTAMP}
+	    </if>
+	    <if test="updateTime != null">
+	        and START_TIME &lt;= #{updateTime,jdbcType=TIMESTAMP}
+	    </if>
+    </where>
+    order by CREATE_TIME desc
+  </select>
 </mapper>