工作流升级

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -90,6 +90,6 @@
             </if>
         </where>
         ORDER BY
-            bga.acceptance_rec_date DESC
+        bga.rec_date desc, bga.acceptance_rec_date DESC
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -67,6 +67,6 @@
                 AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT( #{map.gridConnectionTime}, '%Y-%m-%d')
             </if>
         </where>
-        ORDER BY  hogaa.grid_connection_time desc ,hogaa.rec_date desc
+        ORDER BY  hbga.rec_date desc, hogaa.grid_connection_time desc
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java

@@ -302,6 +302,7 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 process.add(processDto);
                 startProcessDto.setProcess(process);
                 workflow.startProcess(basicGridAcceptance, startProcessDto,requestContext.getUserId());
+                powerStation=new PowerStation();
             }
                 peasantHousehold.setSurveyOrNot(2);
                 peasantHousehold.setReview(1);
@@ -314,7 +315,8 @@ public class SurveyInformationServiceImpl extends BaseService<SurveyInformationD
                 powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
                 powerStation.setServiceAgent(peasantHousehold.getDeveloperName());
                 // 获取流程信息
-
+                powerStation.setTaskId(basicGridAcceptance.getNextTaskId());
+                powerStation.setProcessInstanceId(basicGridAcceptance.getInstanceId());
                 powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
                 powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
                 powerStation.setNodeRouting(PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()));