Преглед на файлове

fix: 大梦到mysql数据库迁移

liuc преди 5 месеца
родител
ревизия
3dc921b285

+ 1 - 1
bound-link-api/sa-flow-api/src/main/java/com/cloud/sa/api/AppEngineController.java

@@ -71,7 +71,7 @@ public class AppEngineController {
         }
         try {
             flowService.Submit(flowEnteredParam);
-            return StResult.success();
+            return StResult.success(taskitem);
         } catch (Exception e) {
             settingService.FlowCommonExceptionRecord(e, taskitem.getObjectid(), "提交");
             return StResult.error(StCodeMsg.SERVER_EXCEPTION, e.getMessage());

BIN
bound-link-api/sa-flow-api/src/main/resources/lib/sa-flow-engine-3.0.0.jar


+ 27 - 21
bound-link-api/sa-flow-common/src/main/resources/mapper/StTaskitemMapper.xml

@@ -78,30 +78,36 @@
           and auto_pass!=1
     </select>
     <select id="getUserTaskListTodo" resultType="map" parameterType="com.cloud.sa.flow.commom.domain.UserTaskQueryForm">
-        SELECT t1.objectid key,
-            t2.objectid     instanceid,
-               t2.biz_objectid bizobjectid,
-               t1.objectid     taskid,
-               t1.state,
-               t2.state instanceState,
-               t2.sequence_no,
-               t2.instance_name,
-               u.name        originator,
-               t2.flow_version flowVersion,
-               t2.flow_code    flowCode,
-               t1.activity_name,
-               t1.receive_time,
-               t1.activity_code,
-               t1.item_type
+        SELECT t1.objectid `key`,
+        t2.objectid instanceid,
+        t2.biz_objectid bizobjectid,
+        t1.objectid taskid,
+        t1.state,
+        t2.state instanceState,
+        t2.sequence_no,
+        t2.instance_name,
+        u.name originator,
+        t2.flow_version flowVersion,
+        t2.flow_code flowCode,
+        t1.activity_name,
+        t1.receive_time,
+        t1.activity_code,
+        t1.item_type
         from st_taskitem t1
-                 LEFT JOIN st_instance t2 on t1.instanceid = t2.objectid
-                 LEFT JOIN view_user u on t2.originator = u.user_code
+        LEFT JOIN st_instance t2 on t1.instanceid = t2.objectid
+        LEFT JOIN view_user u on t2.originator = u.user_code
         <where>
             t1.state in (0, 1)
-            <if test="form.userId != null and form.userId != ''"> AND t1.participant = #{form.userId}</if>
-            <if test="form.instanceName != null and form.instanceName != ''"> AND t2.instance_name like concat('%',#{form.instanceName},'%')</if>
-            <if test="form.activityName != null and form.activityName != ''"> AND t1.activity_name like concat('%',#{form.activityName},'%')</if>
-            <if test="form.sequenceNo != null and form.sequenceNo != ''"> AND t2.sequence_no like concat('%',#{form.sequenceNo},'%')</if>
+            <if test="form.userId != null and form.userId != ''">AND t1.participant = #{form.userId}</if>
+            <if test="form.instanceName != null and form.instanceName != ''">AND t2.instance_name like
+                concat('%',#{form.instanceName},'%')
+            </if>
+            <if test="form.activityName != null and form.activityName != ''">AND t1.activity_name like
+                concat('%',#{form.activityName},'%')
+            </if>
+            <if test="form.sequenceNo != null and form.sequenceNo != ''">AND t2.sequence_no like
+                concat('%',#{form.sequenceNo},'%')
+            </if>
         </where>
         order by t1.receive_time desc
     </select>