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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml

@@ -42,6 +42,11 @@
           <scope>compile</scope>
       </dependency>
       <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+          <version>2.8.9</version>
+      </dependency>
+      <dependency>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-starter-activemq</artifactId>
           <version>2.5.4</version>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/CommonController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.yeejoin.amos.boot.module.hygf.api.dto.CommerceInfoDto;
+import com.yeejoin.amos.boot.module.hygf.biz.service.impl.CommonServiceImpl;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.FinancingInfoServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -11,6 +12,8 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +24,8 @@ public class CommonController {
 
     @Autowired
     FinancingInfoServiceImpl financingInfoService;
+    @Autowired
+    CommonServiceImpl commonService;
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/selectRegion")
@@ -31,5 +36,24 @@ public class CommonController {
 
 
 
+    /**
+     * 设备信息下载
+     *
+     * @return
+     */
+    @GetMapping(value = "/downInformation")
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "资料下载", notes = "资料下载")
+    public void downList(HttpServletResponse response, @RequestParam(required = false) String surveyInformationId,
+                         @RequestParam(required = false)String peasantHouseholdId,
+                         @RequestParam(required = false)String processInstanceId) throws IOException {
+
+
+        commonService.downZiliao(surveyInformationId,peasantHouseholdId,processInstanceId);
+
+
+    }
+
+
 
 }

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

@@ -769,38 +769,38 @@ public class SurveyInformationServiceImpl
 		}
 		surveyInfoAllDto.setAcceptanceCheck(acceptanceCheck);
 
-		if (!StringUtils.isEmpty(processInstanceId)) {
-			try {
-				Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult();
-				List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
-				if (flowLogger.size() > 0) {
-					Collections.reverse(flowLogger);
-				}
-				List<LinkedHashMap> flowLoggernew = new ArrayList<>();
-				for (LinkedHashMap linkedHashMap : flowLogger) {
-					if (linkedHashMap.get("operateDate") != null
-							&& !linkedHashMap.get("operateDate").toString().isEmpty()) {
-						LinkedHashMap linke = new LinkedHashMap();
-						linke.put("approvalStatue", linkedHashMap.get("approvalStatue").toString());
-						// 审核意见
-						List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>) linkedHashMap
-								.get("approvalSuggestion");
-						if (approvalSuggestion != null && !approvalSuggestion.isEmpty()) {
-							linke.put("approvalSuggestion", approvalSuggestion.get(0).get("message"));
-						}
-						linke.put("taskName", linkedHashMap.get("taskName").toString());
-						linke.put("operator", linkedHashMap.get("operator").toString());
-						linke.put("operateDate", linkedHashMap.get("operateDate").toString());
-						flowLoggernew.add(linke);
-					}
-				}
-				LoggerDto loggerDto = new LoggerDto();
-				loggerDto.setLogger(flowLoggernew);
-				surveyInfoAllDto.setOrderTracking(loggerDto);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
+//		if (!StringUtils.isEmpty(processInstanceId)) {
+//			try {
+//				Map<String, Object> flowLoggerMap = workflowFeignClient.getFlowLogger(processInstanceId).getResult();
+//				List<LinkedHashMap> flowLogger = (List<LinkedHashMap>) flowLoggerMap.get("flowLogger");
+//				if (flowLogger.size() > 0) {
+//					Collections.reverse(flowLogger);
+//				}
+//				List<LinkedHashMap> flowLoggernew = new ArrayList<>();
+//				for (LinkedHashMap linkedHashMap : flowLogger) {
+//					if (linkedHashMap.get("operateDate") != null
+//							&& !linkedHashMap.get("operateDate").toString().isEmpty()) {
+//						LinkedHashMap linke = new LinkedHashMap();
+//						linke.put("approvalStatue", linkedHashMap.get("approvalStatue").toString());
+//						// 审核意见
+//						List<LinkedHashMap> approvalSuggestion = (List<LinkedHashMap>) linkedHashMap
+//								.get("approvalSuggestion");
+//						if (approvalSuggestion != null && !approvalSuggestion.isEmpty()) {
+//							linke.put("approvalSuggestion", approvalSuggestion.get(0).get("message"));
+//						}
+//						linke.put("taskName", linkedHashMap.get("taskName").toString());
+//						linke.put("operator", linkedHashMap.get("operator").toString());
+//						linke.put("operateDate", linkedHashMap.get("operateDate").toString());
+//						flowLoggernew.add(linke);
+//					}
+//				}
+//				LoggerDto loggerDto = new LoggerDto();
+//				loggerDto.setLogger(flowLoggernew);
+//				surveyInfoAllDto.setOrderTracking(loggerDto);
+//			} catch (Exception e) {
+//				e.printStackTrace();
+//			}
+//		}
 
 
 		return surveyInfoAllDto;