111

src/main/java/common/controller/ContractController.java

@@ -42,17 +42,31 @@ public class ContractController {
     private static final Logger logger = LoggerFactory.getLogger(ContractController.class);
 
     private static final Map<String, String> CONTRACT_STATUS = new HashMap<String, String>() {{
-        put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
-        put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
-        put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
-        put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
-        put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
-        put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
-        put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
-        put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
+//        put(ContractStatusEnum.WAIT.getKey(), ContractStatusEnum.WAIT.getValue());
+//        put(ContractStatusEnum.EXECUTING.getKey(), ContractStatusEnum.EXECUTING.getValue());
+//        put(ContractStatusEnum.END.getKey(), ContractStatusEnum.END.getValue());
+//        put(ContractStatusEnum.CANCEL.getKey(), ContractStatusEnum.CANCEL.getValue());
+//        put(ContractStatusEnum.MONEY_BACK_ALL.getKey(), ContractStatusEnum.MONEY_BACK_ALL.getValue());
+//        put(ContractStatusEnum.MONEY_BACK_PART.getKey(), ContractStatusEnum.MONEY_BACK_PART.getValue());
+//        put(ContractStatusEnum.MONEY_BACK_NONE.getKey(), ContractStatusEnum.MONEY_BACK_NONE.getValue());
+//        put(ContractStatusEnum.DELETE.getKey(), ContractStatusEnum.DELETE.getValue());
+
+        putdata(this,ContractStatusEnum.WAIT);
+        putdata(this,ContractStatusEnum.EXECUTING);
+        putdata(this,ContractStatusEnum.END);
+        putdata(this,ContractStatusEnum.CANCEL);
+        putdata(this,ContractStatusEnum.MONEY_BACK_ALL);
+        putdata(this,ContractStatusEnum.MONEY_BACK_PART);
+        putdata(this,ContractStatusEnum.MONEY_BACK_NONE);
+        putdata(this,ContractStatusEnum.DELETE);
 
     }};
 
+
+    private static  void putdata(Map map,ContractStatusEnum a){
+        map.put(a.getKey(),a.getValue());
+    }
+
     @Autowired
     private ContractService service;
 

src/main/java/common/service/IOpenApiService.java

 package common.service;
 
-import java.util.List;
 
 /**
  * description:

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -745,8 +745,6 @@ public class ContractServiceImpl implements ContractService {
             }
         }
 
-        List<Long> contractIds = null;
-
         List<String> platforms = new ArrayList<>();
         Map<String,String> idsDic = new HashMap<>();
         platforms.add(platform);
@@ -780,7 +778,7 @@ public class ContractServiceImpl implements ContractService {
 
             if(!StringUtils.isEmpty(contractId)){
                 //查看关联合同
-                if (contractIds != null && contractIds.size() > 0) {
+                if (ids != null && ids.size() > 0) {
                     contractList = contractRepository.findByDsAndRoileRelation(startDate, endDate, platforms, idList, ids);
                 }
 
@@ -793,7 +791,7 @@ public class ContractServiceImpl implements ContractService {
 //            contractList = contractRepository.findByDs(startDate, endDate, platform);
 
             if(!StringUtils.isEmpty(contractId)){
-                if (contractIds != null && contractIds.size() > 0) {
+                if (ids != null && ids.size() > 0) {
                     contractList = contractRepository.findByDsRelation(startDate, endDate, platforms, ids);
                 }
             }else{

src/main/java/common/task/ContractTask.java

 package common.task;
 
-import com.google.common.base.Splitter;
-import common.model.AppCategory;
-import common.model.AppInfo;
 import common.model.Contract;
-import common.repository.AppCategoryRepository;
-import common.repository.AppInfoRepository;
-import common.repository.CityRepository;
 import common.repository.ContractRepository;
-import dmp.model.OtPkgDevStats;
-import dmp.repository.OtPkgDevStatsRepository;
-import dmp.repository.TagCrawlerAppsWandoujiaRepository;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.anarres.lzo.LzoAlgorithm;
-import org.anarres.lzo.LzoDecompressor;
-import org.anarres.lzo.LzoInputStream;
-import org.anarres.lzo.LzoLibrary;
-import org.apache.commons.collections.map.HashedMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import util.*;
+import util.DateUtil;
+import util.ValidateUtil;
 
-import java.io.*;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Created by zxy on 2017/12/26.