发票信息录入

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsurancePolicyController.java

@@ -995,7 +995,7 @@ public class InsurancePolicyController {
     }
 
 
-    @ApiOperation(value="历史投保单列表或者佣金是否入录列表")
+    @ApiOperation(value="历史投保单列表")
     @RequestMapping(value = "insuranceHistoryPageList",method = RequestMethod.POST)
     @ApiImplicitParams({
             @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query"),
@@ -1026,10 +1026,133 @@ public class InsurancePolicyController {
 
         Map<String,Object> searchParams = new HashMap<>();
 
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("a.create_time","desc"));
+
+        searchParams.put("status0",PolicyStatus.Expired.getValue());
+
+        searchParams.put("status1",PolicyStatus.SendOutPolicy.getValue());
+
+        if (StringUtils.isNotEmpty(definitionId)) {
+            searchParams.put("definitionId",definitionId);
+        }
+        if (StringUtils.isNotEmpty(companyName)) {
+            searchParams.put("companyName","%"+companyName+"%");
+        }
+        if (StringUtils.isNotEmpty(promoter)) {
+            searchParams.put("promoter","%"+promoter+"%");
+        }
+        if (StringUtils.isNotEmpty(agentId)) {
+            searchParams.put("agentId",agentId);
+        }
+        if (StringUtils.isNotEmpty(startCreat)) {
+            searchParams.put("startCreat",startCreat);
+        }
+        if (StringUtils.isNotEmpty(endCreat)) {
+            searchParams.put("endCreat",endCreat);
+        }
+        if (StringUtils.isNotEmpty(startFinish)) {
+            searchParams.put("startFinish",startFinish);
+        }
+        if (StringUtils.isNotEmpty(endFinish)) {
+            searchParams.put("endFinish",endFinish);
+        }
+
+        if (isCommission!=null) {
+            if(isCommission){
+                searchParams.put("isCommission",true);
+            }
+            else{
+                searchParams.put("isCommission",false);
+            }
+
+        }
+
+        if (StringUtils.isNotEmpty(startTime)) {
+            searchParams.put("startTime",startTime);
+        }
+        if (StringUtils.isNotEmpty(endTime)) {
+            searchParams.put("endTime",endTime);
+        }
+
+        Page<InsurancePolicy> page = insurancePolicyService.hisPageSearch(searchParams,pageIndex,pageSize,sortList);
+
+        for (InsurancePolicy insurancePolicy:page) {
+            if(insurancePolicy.getCommission()!=null) {
+                List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("佣金分成");
+
+                if (dataDictionaryList.size() > 0) {
+
+                    DataDictionary item = dataDictionaryList.get(0);
+
+                    BigDecimal value = new BigDecimal(item.getValue());
+                    BigDecimal bili = new BigDecimal("0.01");
+                    BigDecimal fencheng = value.multiply(bili);
+                    BigDecimal commission = insurancePolicy.getCommission();
+                    BigDecimal finalFee = commission.multiply(fencheng);
+
+                    insurancePolicy.setPromoterFee(finalFee);
+
+
+                }
+
+                if (dataDictionaryList.size() > 1) {
+                    DataDictionary item = dataDictionaryList.get(1);
+
+                    BigDecimal value = new BigDecimal(item.getValue());
+                    BigDecimal bili = new BigDecimal("0.01");
+                    BigDecimal fencheng = value.multiply(bili);
+                    BigDecimal commission = insurancePolicy.getCommission();
+                    BigDecimal finalFee = commission.multiply(fencheng);
+
+                    insurancePolicy.setAgentFee(finalFee);
+
+
+                }
+            }
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="佣金录入列表")
+    @RequestMapping(value = "commissionPageList",method = RequestMethod.POST)
+    @ApiImplicitParams({
+            @ApiImplicitParam(name="definitionId",value = "险种ID",paramType = "query"),
+            @ApiImplicitParam(name="companyName",value = "公司名称",paramType = "query"),
+            @ApiImplicitParam(name="promoter",value = "推广员账号",paramType = "query"),
+            @ApiImplicitParam(name="agentId",value = "保险代理人ID",paramType = "query"),
+            @ApiImplicitParam(name="startCreat",value = "创建开始时间",paramType = "query"),
+            @ApiImplicitParam(name="endCreat",value = "创建结束时间",paramType = "query"),
+            @ApiImplicitParam(name="startFinish",value = "出单开始时间",paramType = "query"),
+            @ApiImplicitParam(name="endFinish",value = "出单结束时间",paramType = "query"),
+            @ApiImplicitParam(name="isCommission",value = "是否录入佣金（0:否，1:是，不传查询全部）",paramType = "query"),
+            @ApiImplicitParam(name="startTime",value = "投保开始时间",paramType = "query"),
+            @ApiImplicitParam(name="endTime",value = "投保结束时间",paramType = "query")
+    })
+    public MessageResult<Map> commissionPageList(
+            String definitionId,String companyName,String promoter,String agentId,
+            String startCreat,String endCreat,
+            String startFinish,String endFinish,
+            Boolean isCommission,String startTime,String endTime,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
         List<Sort> sortList = new ArrayList<>();
 
         sortList.add(new Sort("a.commission_time","desc"));
-        sortList.add(new Sort("a.create_time","asc"));
+        sortList.add(new Sort("a.create_time","desc"));
 
         searchParams.put("status0",PolicyStatus.Expired.getValue());