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

src/main/java/com/ydtech/modules/fnc/entity/ImportResult.java

@@ -76,4 +76,8 @@ public class ImportResult implements Serializable {
     private String handStatus;
 
 
+    @TableField(exist = false)
+    private String partnerCompaniesName;
+
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/ImportAsyncServiceImpl.java

@@ -238,6 +238,9 @@ public class ImportAsyncServiceImpl extends ServiceImpl<ImportAsyncMapper, Impor
             if(StringUtils.isNotEmpty(importResultVo.getHandStatus())){
                 params.put("handStatus",importResultVo.getHandStatus());
             }
+            if(StringUtils.isNotEmpty(importResultVo.getCreateTime())){
+                params.put("createTime",importResultVo.getCreateTime());
+            }
             List<ImportResult> list= this.baseMapper.queryNew(params);
 
             pageHelper=new PageInfo(list);

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -598,6 +598,15 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         if(insPlyIncomeVo.getJqStartDate() !=null){
             params.put("syEndDate",insPlyIncomeVo.getSyEndDate());
         }
+        if( StringUtils.isNotEmpty(insPlyIncomeVo.getProvinceId())){
+            params.put("provinceId",insPlyIncomeVo.getProvinceId());
+        }
+        if( StringUtils.isNotEmpty(insPlyIncomeVo.getCityId())){
+            params.put("cityId",insPlyIncomeVo.getCityId());
+        }
+        if( StringUtils.isNotEmpty(insPlyIncomeVo.getCountyId())){
+            params.put("countyId",insPlyIncomeVo.getCountyId());
+        }
         if( StringUtils.isNotEmpty(insPlyIncomeVo.getDeptId())){
             params.put("deptId",insPlyIncomeVo.getDeptId());
         }

src/main/java/com/ydtech/modules/fnc/vo/ImportResultVo.java

@@ -21,8 +21,7 @@ public class ImportResultVo {
     @ApiModelProperty("任务状态")
     private String status; // PROCESSING, COMPLETED, FAILED
 
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createTime;
+
 
 
     @ApiModelProperty("开始时间")
@@ -53,4 +52,7 @@ public class ImportResultVo {
     @ApiModelProperty(value = "页数")
     @Min(value = 1, message = "页数最小为1")
     private int pageNum=1;
+
+    @ApiModelProperty("创建时间")
+    private String createTime;
 }

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -321,4 +321,14 @@ public class InsPlyIncomeVo implements Serializable {
     private String settleOtherStatus;
     @ApiModelProperty("合作公司idList")
     private List<String> partnerCompaniesIdList;
+
+    @ApiModelProperty(value = "省机构id")
+    private String provinceId;
+
+    @ApiModelProperty(value = "市机构id")
+    private String cityId;
+
+    @ApiModelProperty(value = "县机构id")
+    private String countyId;
+
 }

src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -211,7 +211,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompany.setSyapplyno(submitVerifyInfo.getProposalNo());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 3. 聚合支付服务
-            String multiply = insAreaCompany.getSumpremium().toString();
+            String multiply = insAreaCompany.getSumpremium().toPlainString();
             NewPayRequest newPayRequest = new NewPayRequest(multiply, insAreaCompany.getId(), zjConfigureParameters);
             NewPayRequestResponse newPayRequestResponse = zijinRequestApiComponents.newPay(newPayRequest, httpHeaders);
             insAreaCompany.setPaymentLink(newPayRequestResponse.getTwoDimentionImageUrl());
@@ -434,7 +434,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
             insAreaCompany.setSyapplyno(baseInfo.getProposalNo());
             insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
             // 3. 聚合支付服务
-            String multiply = insAreaCompany.getSumpremium().stripTrailingZeros().toString();
+            String multiply = insAreaCompany.getSumpremium().toPlainString();
             NewPayRequest newPayRequest = new NewPayRequest(multiply, insAreaCompany.getId(), zjConfigureParameters);
             NewPayRequestResponse newPayRequestResponse = zijinRequestApiComponents.newPay(newPayRequest, httpHeaders);
             insAreaCompany.setPaymentLink(newPayRequestResponse.getTwoDimentionImageUrl());

src/main/resources/mapper/modules/fnc/ImportAsyncMapper.xml

@@ -4,26 +4,47 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.ImportResult">
-        <id column="id" property="id" />
-        <result column="create_time" property="createTime" />
-        <result column="created_at" property="createdAt" />
-        <result column="completed_at" property="completedAt" />
-        <result column="status" property="status" />
-        <result column="amount" property="amount" />
-        <result column="upload_url" property="uploadUrl" />
-        <result column="company_id" property="companyId" />
-        <result column="partner_companies_id" property="partnerCompaniesId" />
-        <result column="agreement_id" property="agreementId" />
-        <result column="ids" property="ids" />
-        <result column="hand_status" property="handStatus" />
+        <id column="id" property="id"/>
+        <result column="create_time" property="createTime"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="completed_at" property="completedAt"/>
+        <result column="status" property="status"/>
+        <result column="total_amount" property="totalAmount"/>
+        <result column="upload_url" property="uploadUrl"/>
+        <result column="company_id" property="companyId"/>
+        <result column="partner_companies_id" property="partnerCompaniesId"/>
+        <result column="agreement_id" property="agreementId"/>
+        <result column="ids" property="ids"/>
+        <result column="hand_status" property="handStatus"/>
     </resultMap>
 
     <select id="queryNew" resultType="com.ydtech.modules.fnc.entity.ImportResult">
-        select  * from  import_task
-
+        select
+        a.id as "id",
+        a.create_time as "createTime",
+        a.created_at as "createdAt",
+        a.completed_at as "completedAt",
+        a.status as "status",
+        a.total_amount as "totalAmount",
+        a.upload_url as "uploadUrl",
+        a.company_id as "companyId",
+        a.partner_companies_id as "partnerCompaniesId",
+        a.agreement_id as "agreementId",
+        a.ids as "ids",
+        a.hand_status as "handStatus",
+        a.hand_status as "handStatus",
+        eic.name as "partnerCompaniesName"
+        from
+        import_task  a
+        LEFT  JOIN  esm_ins_company  eic  on  eic.id  = a.partner_companies_id
         <where>
             <if test="handStatus !=null  and  handStatus  !=''">
-                hand_status =#{handStatus}
+               a.hand_status =#{handStatus}
+            </if>
+        </where>
+        <where>
+            <if test="createTime !=null  and  createTime  !=''">
+                a.create_time =#{createTime}
             </if>
         </where>
     </select>

src/main/resources/mapper/modules/fnc/InsPlyIncomeMapper.xml

@@ -185,6 +185,18 @@
                     and  pa.docking_person  =#{dockingPerson}
                 </if>
 
+                <if test="provinceId != null and provinceId != ''">
+                    and a.deptid like "${provinceId}%"
+                </if>
+
+                <if test="cityId != null and cityId != ''">
+                    and a.deptid like "${cityId}%"
+                </if>
+
+                <if test="countyId != null and countyId != ''">
+                    and a.deptid like "${countyId}%"
+                </if>
+
                 <if test="orderno !=null  and  orderno  !=''">
                     and a.orderno =#{orderno}
                 </if>