行政区域/隶属集团

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

@@ -603,4 +603,17 @@ public class ContractController {
         }
     }
 
+    /**
+     * 功能描述:新建合同回显、获取行政区域列表
+     * @author liyin
+     * @date 2020/9/23
+     */
+    @GetMapping("/getBarrioCities")
+    @ResponseBody
+    public ResultModel getBarrioCities(){
+
+        return ResultModel.OK(service.getBarrioCities());
+    }
+
+
 }

src/main/java/common/model/BarrioCity.java

+package common.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+/**
+ * @author liyin
+ * @description
+ * @date
+ */
+@Entity
+public class BarrioCity {
+    private Long id;
+    private String name;
+    private Long parentId;
+
+    @Id
+    @GeneratedValue
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+}

src/main/java/common/model/BarrioCityVO.java

+package common.model;
+
+import java.util.List;
+
+/**
+ * @author liyin
+ * @description
+ * @date
+ */
+public class BarrioCityVO {
+    private BarrioCity parentCity;
+    private List<BarrioCity> cities;
+
+    public BarrioCity getParentCity() {
+        return parentCity;
+    }
+
+    public void setParentCity(BarrioCity parentCity) {
+        this.parentCity = parentCity;
+    }
+
+    public List<BarrioCity> getCities() {
+        return cities;
+    }
+
+    public void setCitys(List<BarrioCity> cities) {
+        this.cities = cities;
+    }
+}

src/main/java/common/model/Contract.java

@@ -66,6 +66,9 @@ public class Contract {
 
     private Integer shareSign;//标记是否计算分摊收入 1 计算 0 不计算
 
+
+
+
     private String searchName;
 
     private List<String> customBodyNames;
@@ -86,6 +89,9 @@ public class Contract {
     private String erroMessage;
     private String tradeName;
 
+    private Long barrioId;//行政区域id
+    private String barrioName;//行政区域名称
+    private String belongGroup;//隶属集团
 
     @Id
     @GeneratedValue
@@ -501,32 +507,20 @@ public class Contract {
         this.adjustmentFundForm = adjustmentFundForm;
     }
 
+    public Long getBarrioId() {
+        return barrioId;
+    }
 
-    @Override
-    public String toString() {
-        return "Contract{" +
-                "id=" + id +
-                ", product='" + product + '\'' +
-                ", myBodyName='" + myBodyName + '\'' +
-                ", myBodyCode='" + myBodyCode + '\'' +
-                ", customerBody='" + customerBody + '\'' +
-                ", email='" + email + '\'' +
-                ", contractCode='" + contractCode + '\'' +
-                ", contractType='" + contractType + '\'' +
-                ", startDate='" + startDate + '\'' +
-                ", endDate='" + endDate + '\'' +
-                ", priceLevel=" + priceLevel +
-                ", money=" + money +
-                ", rebate=" + rebate +
-                ", sale=" + sale +
-                ", platform='" + platform + '\'' +
-                ", status='" + status + '\'' +
-                ", modifyAccount=" + modifyAccount +
-                ", createAccount=" + createAccount +
-                ", modifyTime=" + modifyTime +
-                ", createTime=" + createTime +
-                ", ds='" + ds + '\'' +
-                '}';
+    public void setBarrioId(Long barrioId) {
+        this.barrioId = barrioId;
+    }
+
+    public String getBelongGroup() {
+        return belongGroup;
+    }
+
+    public void setBelongGroup(String belongGroup) {
+        this.belongGroup = belongGroup;
     }
 
     public Integer getBackStatus() {
@@ -563,4 +557,75 @@ public class Contract {
     public void setShareSign(Integer shareSign) {
         this.shareSign = shareSign;
     }
+
+    @Transient
+    public String getBarrioName() {
+        return barrioName;
+    }
+
+    public void setBarrioName(String barrioName) {
+        this.barrioName = barrioName;
+    }
+
+    @Override
+    public String toString() {
+        return "Contract{" +
+                "id=" + id +
+                ", product='" + product + '\'' +
+                ", myBodyName='" + myBodyName + '\'' +
+                ", myBodyCode='" + myBodyCode + '\'' +
+                ", customerBody='" + customerBody + '\'' +
+                ", email='" + email + '\'' +
+                ", contractCode='" + contractCode + '\'' +
+                ", codeNum=" + codeNum +
+                ", contractType='" + contractType + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", endDate='" + endDate + '\'' +
+                ", priceLevel=" + priceLevel +
+                ", priceLevelName='" + priceLevelName + '\'' +
+                ", money=" + money +
+                ", rebate=" + rebate +
+                ", sale=" + sale +
+                ", platform='" + platform + '\'' +
+                ", status='" + status + '\'' +
+                ", saleName='" + saleName + '\'' +
+                ", payMoney=" + payMoney +
+                ", backStatus=" + backStatus +
+                ", invoice=" + invoice +
+                ", invoiceMoney=" + invoiceMoney +
+                ", createName='" + createName + '\'' +
+                ", type='" + type + '\'' +
+                ", priceName=" + priceName +
+                ", old=" + old +
+                ", extraFlow=" + extraFlow +
+                ", modifyAccount=" + modifyAccount +
+                ", createAccount=" + createAccount +
+                ", modifyTime=" + modifyTime +
+                ", createTime=" + createTime +
+                ", ds='" + ds + '\'' +
+                ", virtual=" + virtual +
+                ", firstBackId=" + firstBackId +
+                ", adjustmentFund=" + adjustmentFund +
+                ", adjustmentFundForm='" + adjustmentFundForm + '\'' +
+                ", intervalUseDays=" + intervalUseDays +
+                ", incomeExcludingTax=" + incomeExcludingTax +
+                ", intervaIncomeShare=" + intervaIncomeShare +
+                ", incomeShareAll=" + incomeShareAll +
+                ", shareSign=" + shareSign +
+                ", searchName='" + searchName + '\'' +
+                ", customBodyNames=" + customBodyNames +
+                ", discountTimeLong=" + discountTimeLong +
+                ", customerShort='" + customerShort + '\'' +
+                ", customerThird='" + customerThird + '\'' +
+                ", tradeType=" + tradeType +
+                ", relationContract=" + relationContract +
+                ", relationCode='" + relationCode + '\'' +
+                ", hasDiscount='" + hasDiscount + '\'' +
+                ", typeId='" + typeId + '\'' +
+                ", erroMessage='" + erroMessage + '\'' +
+                ", tradeName='" + tradeName + '\'' +
+                ", barrioId=" + barrioId +
+                ", belongGroup='" + belongGroup + '\'' +
+                '}';
+    }
 }

src/main/java/common/service/ContractService.java

@@ -77,4 +77,5 @@ public interface ContractService {
 
     ResultModel uploadBatchInfo(MultipartFile file, String platform);
 
+    Object getBarrioCities();
 }
\ No newline at end of file

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

@@ -50,6 +50,7 @@ import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -210,6 +211,9 @@ public class ContractServiceImpl implements ContractService {
     @Autowired
     QcloudAccountRepository qcloudAccountRepository;
 
+    @Autowired
+    private BarrioCityRepository barrioCityRepository;
+
 
     @Override
     public Map<String, Object> checkAccount(String email, String platfrom) {
@@ -1349,11 +1353,13 @@ public class ContractServiceImpl implements ContractService {
         Map<String, String> tradeTypeMap = tradeTypeRepsitory.findAll().stream().collect(Collectors.toMap(v -> v.getId().toString(), v -> v.getName()));
 
         if (ValidateUtil.isValid(contractList)) {
+            List<BarrioCity> barrioCities = barrioCityRepository.findAll();
+            Map<Long, BarrioCity> barrioCitiesNameMap = barrioCities.stream().collect(Collectors.toMap(BarrioCity::getId, Function.identity(), (v1, v2) -> v1));
             for (Contract c : contractList) {
                 c.setMyBodyName(bodyMap.get(c.getMyBodyCode()));
                 c.setTradeName(tradeTypeMap.get(c.getTradeType() + ""));
                 c.setDs(new DateTime(c.getCreateTime()).toString("yyyy-MM-dd"));
-
+                c.setBarrioName(barrioCitiesNameMap.get(barrioCitiesNameMap.get(c.getBarrioId()).getParentId()).getName());
                 if ((c.getExtraFlow() != null && c.getExtraFlow() > 0) ||
                         (c.getDiscountTimeLong() != null && c.getDiscountTimeLong() > 0)) {
 
@@ -2226,6 +2232,19 @@ public class ContractServiceImpl implements ContractService {
         }
     }
 
+    @Override
+    public Object getBarrioCities() {
+        List<BarrioCity> barrioCities = barrioCityRepository.findByParentId(0L);
+        ArrayList<BarrioCityVO> objects = new ArrayList<>();
+        for (BarrioCity barrioCity : barrioCities) {
+            BarrioCityVO barrioCityVO = new BarrioCityVO();
+            barrioCityVO.setParentCity(barrioCity);
+            barrioCityVO.setCitys(barrioCityRepository.findByParentId(barrioCity.getId()));
+            objects.add(barrioCityVO);
+        }
+        return objects;
+    }
+
 
     public ResultModel saveDataBySheet(Sheet sheet, int row_length, String platformexcl) {
         String sheetName = sheet.getSheetName();

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

@@ -3,10 +3,7 @@ package common.service.impl;
 import com.amazonaws.services.dynamodbv2.xspec.B;
 import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import common.model.*;
-import common.repository.AuthRepository;
-import common.repository.ContractBodyRepository;
-import common.repository.ContractChangeRepository;
-import common.repository.ContractRepository;
+import common.repository.*;
 import common.service.ShareIncomeService;
 import dic.ContractStatusEnum;
 import dic.RoleEnum;
@@ -24,6 +21,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -40,6 +38,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
     private ContractBodyRepository contractBodyRepository;
     @Autowired
     private ContractChangeRepository contractChangeRepository;
+    @Autowired
+    private BarrioCityRepository barrioCityRepository;
 
     @Override
     public List<Contract> shareIncomeList(User loginAccount, String startDate, String endDate, String platform, String bodyCode, String serchName) {
@@ -93,6 +93,10 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         Map<String, String> bodiesNameMap = bodies.stream().collect(
                 Collectors.toMap(ContractBody::getCode, ContractBody::getName, (v1, v2) -> v1));
 
+        List<BarrioCity> barrioCities = barrioCityRepository.findAll();
+        Map<Long, BarrioCity> barrioCitiesNameMap = barrioCities.stream().collect(Collectors.toMap(BarrioCity::getId, Function.identity(), (v1, v2) -> v1));
+
+
         DateTime start = new DateTime(startDate);
         DateTime end = new DateTime(endDate);
 
@@ -106,6 +110,8 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
             streamContract.forEachOrdered(v -> {
                 this.shareIncome4Contract(v, start, end);
                 v.setMyBodyName(bodiesNameMap.get(v.getMyBodyCode()));
+                if(v.getBarrioId()!=null)
+                v.setBarrioName(barrioCitiesNameMap.get(barrioCitiesNameMap.get(v.getBarrioId()).getParentId()).getName());
             });
         }
         logger.info("计算分摊收入耗时:{}", (System.currentTimeMillis() - start_));