Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CmWorkflowServiceImpl.java

@@ -65,7 +65,7 @@ public class CmWorkflowServiceImpl implements ICmWorkflowService {
                 // 驳回操作
                // todo 需要工作流适配调整后 进行切换 Workflow.taskV2Client.reject(taskId, data);
                 log.info("开始请求工作流驳回任务接口:/reject/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));
-                processTaskDTO = Workflow.taskV2Client.completeByTaskFroStandard(taskId, data).getResult();
+                processTaskDTO = Workflow.taskV2Client.reject(taskId, data).getResult();
             } else {
                 // 执行普通节点（提交）
                 log.info("开始请求工作流完成任务接口:/complete/standard/{taskId},请求参数：{},{}", taskId, JSONObject.toJSONString(data));

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -404,6 +404,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 useInfoMap.put("useinfoSeq", useInfo.getSequenceNbr());
                 if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())){
                     useInfoMap.put("longitudeLatitude", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                    useInfoMap.put("useLongitudeLatitude", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
+                if(!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                    useInfoMap.put("useAddress", useInfo.getAddress());
                 }
 
             } else {
@@ -426,6 +430,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
                 if(!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
                     useInfoMap.put("LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                    useInfoMap.put("USE_LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
+                }
+                if(!ValidationUtil.isEmpty(useInfo.getAddress())) {
+                    useInfoMap.put("USE_ADDRESS", useInfo.getAddress());
                 }
             }
             if (!useInfoMap.isEmpty()) {

amos-boot-system-tzs/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>com.yeejoin</groupId>
             <artifactId>amos-feign-workflow</artifactId>
-            <version>1.10.4</version>
+            <version>1.10.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>