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

docker/shell-test.sh

@@ -3,7 +3,7 @@
 # Dockerfile路径
 DOCKER_FILE_PATH=/usr/local/java/insAgency
 # 容器id
-CID=$(''docker ps | grep "ins" | awk '{print $1}''')
+CID=$(''docker ps | grep "ins-test" | awk '{print $1}''')
 echo $CID
 # 运行docker容器
 function run(){
@@ -19,20 +19,20 @@ function run(){
     # 删除容器
     sudo docker rm $CID
     # 删除镜像
-    sudo docker rmi ins
+    sudo docker rmi ins-test
     echo "删除镜像和容器成功，下面开始构建新镜像"
   else
     echo "不存在people-healthy容器，下面直接开始构建镜像"
   fi
   # 构建镜像
-  docker build -t ins .
+  docker build -t ins-test .
   echo "创建容器成功"
   docker images
   # 杀死特定端口进程
   # mypid=$(netstat -apn|grep 9001|awk '{print $7}'|cut -d/ -f1);
   # echo $mypid
   # kill -9 $mypid
-  docker run -it --name ins -p 8080:8888 -e "--spring.profiles.active=test" -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins:latest
+  docker run -it --name ins-test -p 8080:8888 -e "--spring.profiles.active=test" -p 9999:9999 --restart=always -v /usr/local/java/insAgency:/ins --mount type=bind,source=/nasData,destination=/nasData -v /usr/local/java/insAgency/logs:/ins/logs -d ins-test:latest
 }
 
 #入口

src/main/java/com/ydtech/modules/admin/dao/SysAmountAuditingMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface SysAmountAuditingMapper extends BaseMapper<SysAmountAuditingEntity> {
-    SysAmountAuditingEntity getByUserId(String userId);
+    SysAmountAuditingEntity getByUserId( @Param("userId") String userId, @Param("amountStatus")   String amountStatus);
 
     Page<SysAmountAuditingEntity> queryPageOrder(@Param("sysAmountAuditingVo") SysAmountAuditingVo sysAmountAuditingVo, Page<SysAmountAuditingEntity> page);
 

src/main/java/com/ydtech/modules/admin/dao/SysUserLinkPtlAgreementMapper.java

@@ -26,7 +26,7 @@ public interface SysUserLinkPtlAgreementMapper extends BaseMapper<SysUserLinkPtl
      *  @Date: 2024/4/15 15:32
      *  @Description: 分页
      */
-    Page<SysUserLinkPtlAgreementDto> queryPage(@Param("page") Page<SysUserLinkPtlAgreementDto> page, @Param("vo") SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo);
+    Page<SysUserLinkPtlAgreementDto> queryPage(@Param("page") Page<SysUserLinkPtlAgreementDto> page, @Param("vo") SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo, @Param("ids") List<String> ids);
     /**
      *  @version
      *  @author: hxl

src/main/java/com/ydtech/modules/admin/model/vo/SysAmountAuditingVo.java

@@ -99,6 +99,9 @@ public class SysAmountAuditingVo {
     @ApiModelProperty("时间条件")
     private String  timeFiltering;
 
+    @ApiModelProperty("时间条件")
+    private String  withdrawalTime;
+
 
 
 

src/main/java/com/ydtech/modules/admin/model/vo/SysUserBaseVO.java

@@ -42,5 +42,7 @@ public class SysUserBaseVO {
     private String roleName;
     @ApiModelProperty(value = "工号类型")
     private String noType;
+    @ApiModelProperty(value = "是否绑定协议")
+    private Boolean flag;
 
 }

src/main/java/com/ydtech/modules/admin/model/vo/SysUserLinkPtlAgreementVo.java

@@ -22,11 +22,14 @@ public class SysUserLinkPtlAgreementVo extends BasePageVO {
     private String userId;
 
     /***
-     * 协议ID
+     * 后线用户名称
      */
-    @ApiModelProperty("协议ID")
-    private Long ptlAgreementId;
+    @ApiModelProperty("后线用户名称")
+    private String userName;
 
-    @ApiModelProperty("ID")
-    private Long  id;
+    /***
+     * 保险公司ID
+     */
+    @ApiModelProperty("保险公司ID")
+    private String partnerCompaniesId;
 }

src/main/java/com/ydtech/modules/admin/service/SysAmountAuditingService.java

@@ -12,7 +12,7 @@ import java.util.List;
 public interface SysAmountAuditingService extends IService<SysAmountAuditingEntity> {
     void AmountReview(SysAmountAuditingVo sysUserAccountVo);
 
-    SysAmountAuditingEntity getByUserId(String userId);
+    SysAmountAuditingEntity getByUserId(String userId ,String amountType);
 
     HttpResult<BasePageResult<SysAmountAuditingEntity>> queryByVo(SysAmountAuditingVo sysAmountAuditingVo);
 

src/main/java/com/ydtech/modules/admin/service/impl/SysAmountAuditingServiceImpl.java

@@ -76,8 +76,8 @@ public class SysAmountAuditingServiceImpl extends ServiceImpl<SysAmountAuditingM
     }
 
     @Override
-    public SysAmountAuditingEntity getByUserId(String userId) {
-        return baseMapper.getByUserId(userId);
+    public SysAmountAuditingEntity getByUserId(String userId,String amountStatus) {
+        return baseMapper.getByUserId(userId,amountStatus);
     }
 
     @Override

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -177,7 +177,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         SysAmountAuditingEntity sysAmountAuditingEntity = new SysAmountAuditingEntity();//审核记录表
         sysAmountAuditingEntity.setUserId(userId);
         sysAmountAuditingEntity.setAmount(sysUserAccountVo.getAmount());
-        SysAmountAuditingEntity   judge =    sysAmountAuditingService.getByUserId(userId);
+        SysAmountAuditingEntity   judge =    sysAmountAuditingService.getByUserId(userId,sysUserAccountVo.getAmountStatus());
         if(ObjectUtils.isNotEmpty(judge)){
             return HttpResult.ok("有未提现审核单据, 请审核完成之后再提现");
         }
@@ -484,11 +484,11 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         //非车手续费出口比例
         BigDecimal noExportProceduresFee = insFeeOrderNew.getNoPremium().multiply(insFeeOrderNew.getNoSuperviseCostsProportion().divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
         //用户出口手续费
-        willHalding = willHalding.add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee);
+
         if(sysUserAccountVo.getWillHalding()==null){
-            sysUserAccountVo.setWillHalding(willHalding);
+            sysUserAccountVo.setWillHalding(BigDecimal.ZERO);
         }
-        sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(willHalding));
+        sysUserAccountVo.setWillHalding(sysUserAccountVo.getWillHalding().add(jqExportProceduresFee).add(syExportProceduresFee).add(noExportProceduresFee));
 
         //非车出口比例
         //总机构 交强管理比例
@@ -541,11 +541,10 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 .multiply(noExportProceduresProportion
                         .subtract(insFeeOrderNew.getNoSuperviseCostsProportion()).divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN);
         //用户出口跟单费
-        willDocumentary = willDocumentary.add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee);
         if(sysUserAccountVo.getWillDocumentary()==null){
-            sysUserAccountVo.setWillDocumentary(willDocumentary);
+            sysUserAccountVo.setWillDocumentary(BigDecimal.ZERO);
         }
-        sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(willDocumentary));
+        sysUserAccountVo.setWillDocumentary(sysUserAccountVo.getWillDocumentary().add(jqExportOtherFee).add(syExportOtherFee).add(noExportOtherFee));
 
     }
 

src/main/java/com/ydtech/modules/admin/service/impl/SysUserLinkPtlAgreementServiceImpl.java

@@ -12,6 +12,7 @@ import com.ydtech.modules.admin.model.vo.SysUserBaseVO;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementAddVo;
 import com.ydtech.modules.admin.model.vo.SysUserLinkPtlAgreementVo;
 import com.ydtech.modules.admin.service.SysUserLinkPtlAgreementService;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
@@ -41,6 +42,9 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     @Autowired
     private PtlAgreementService ptlAgreementService;
 
+    @Autowired
+    private EsmInsCompanyService esmInsCompanyService;
+
 
     /**
      *  @version
@@ -52,7 +56,9 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
     public BasePageResult<SysUserLinkPtlAgreementDto> queryPage(SysUserLinkPtlAgreementVo sysUserLinkPtlAgreementVo) {
         Page<SysUserLinkPtlAgreementDto> page = new Page<>(sysUserLinkPtlAgreementVo.getPageNum(),
                 sysUserLinkPtlAgreementVo.getPageSize());
-        Page<SysUserLinkPtlAgreementDto> sysUserLinkPtlAgreementDtoBasePageResult = sysUserLinkPtlAgreementMapper.queryPage(page, sysUserLinkPtlAgreementVo);
+        // 获取供应商本级id 及其 下级id
+        List<String> lowerId = esmInsCompanyService.getByLowerId(sysUserLinkPtlAgreementVo.getPartnerCompaniesId());
+        Page<SysUserLinkPtlAgreementDto> sysUserLinkPtlAgreementDtoBasePageResult = sysUserLinkPtlAgreementMapper.queryPage(page, sysUserLinkPtlAgreementVo,lowerId);
         return  new BasePageResult<>(sysUserLinkPtlAgreementVo.getPageNum(), page.getSize(), sysUserLinkPtlAgreementDtoBasePageResult.getTotal(), page.getPages(),
                 sysUserLinkPtlAgreementDtoBasePageResult.getRecords());
     }

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2810,7 +2810,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         nonExportFee.setOtherCostsProportion(nonOtherCostsProportion);
         nonExportFee.setOtherCostsPremiums(insFeeOrderNew.getNoPremium().multiply(nonOtherCostsProportion.divide(new BigDecimal(100))).setScale(2,BigDecimal.ROUND_DOWN));
         nonExportFee.setTotalProportion(nonExportSuperviseCosts.add(nonOtherCostsProportion));
-        nonExportFee.setTotalAmount(nonExportSuperviseCosts.add(nonOtherCostsProportion));
+        nonExportFee.setTotalAmount(nonExportFee.getSuperviseCostsPremiums().add(nonExportFee.getOtherCostsPremiums()));
         exportFeeList.add(nonExportFee);
 
         feeOrderNewVo.setEntranceFee(entranceFeeList);

src/main/java/com/ydtech/modules/protocol/entity/po/PtlAgreement.java

@@ -217,6 +217,12 @@ public class PtlAgreement implements Serializable {
     @TableField(exist = false)
     private String flag;
 
+    /***
+     * 保险公司名称
+     */
+    @TableField(exist = false)
+    private String partnerCompaniesName;
+
     public void generateTheProtocolCode() {
         AssertionUtils.isFail(StringUtils.isNullOrEmpty(this.getPartnerCompaniesId()), "请检查合作保险公司是否选择");
         String string = LocalDate.now().format(DateTimeFormatter.BASIC_ISO_DATE);

src/main/resources/mapper/modules/admin/SysAmountAuditingMapper.xml

@@ -29,6 +29,10 @@
             <if test="userId !=null and  userId !=''">
                 and a.user_id =#{userId}
             </if>
+            <if test="amountStatus !=null and  amountStatus !=''">
+                and a.amount_status =#{amountStatus}
+            </if>
+
         </where>
 
     </select>
@@ -78,9 +82,13 @@
             <if test="sysAmountAuditingVo.startTime !=null and sysAmountAuditingVo.startTime != ''  and  sysAmountAuditingVo.endTime !=null  and sysAmountAuditingVo.endTime!= '' ">
                 and a.create_time BETWEEN #{sysAmountAuditingVo.startTime} AND #{sysAmountAuditingVo.endTime}
             </if>
+
             <if test="sysAmountAuditingVo.timeFiltering !=null and sysAmountAuditingVo.timeFiltering != '' ">
                 AND   DATE_FORMAT(a.auditing_time, '%Y-%m') = #{sysAmountAuditingVo.timeFiltering}
             </if>
+            <if test="sysAmountAuditingVo.withdrawalTime !=null and sysAmountAuditingVo.withdrawalTime != '' ">
+                AND   DATE_FORMAT(a.create_time, '%Y-%m') = #{sysAmountAuditingVo.withdrawalTime}
+            </if>
         </where>
 
     </select>

src/main/resources/mapper/modules/admin/SysUserLinkPtlAgreementMapper.xml

@@ -4,9 +4,11 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ydtech.modules.admin.dao.SysUserLinkPtlAgreementMapper">
     <sql id="Base_Column_List">
-            link.id as id,
+        link.id as id,
             user.id as "sysUser.id",
             user.name as "sysUser.name",
+            t2.id AS "sysUser.deptId",
+            t2.`name` AS "sysUser.deptName",
             agree.id as  "ptlAgreement.id",
             agree.companies_type as  "ptlAgreement.companiesType",
             agree.agreement_type as  "ptlAgreement.agreementType",
@@ -30,7 +32,8 @@
             agree.audit_content  as  "ptlAgreement.auditContent",
             agree.audit_status  as  "ptlAgreement.auditStatus",
             agree.serial_number	  as  "ptlAgreement.serialNumber",
-            agree.underwriting_description	 as  "ptlAgreement.underwritingDescription"
+            agree.underwriting_description	 as  "ptlAgreement.underwritingDescription",
+			com.name as 	"ptlAgreement.partnerCompaniesName"
     </sql>
 
     <select id="queryPage"  resultType="com.ydtech.modules.admin.model.dto.SysUserLinkPtlAgreementDto">
@@ -39,15 +42,25 @@
         FROM
         sys_user_link_pl_agreement link
         LEFT JOIN sys_user USER ON link.user_id = USER.id
+        LEFT JOIN sys_dept t2 ON USER.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
         LEFT JOIN ptl_agreement agree ON link.ptl_agreement_id = agree.id
+        left join esm_ins_company com on com.id = agree.partner_companies_id
         <where>
             <if test="vo.userId != null and vo.userId != ''">
                 and  link.user_id =  #{vo.userId}
             </if>
-            <if test="vo.ptlAgreementId != null">
-                and link.ptl_agreement_id = #{vo.ptlAgreementId}
+            <if test="vo.userName != null and vo.userName != ''">
+                and  USER.name  like CONCAT('%', #{vo.userName}, '%')
+            </if>
+            <if test="ids != null and ids.size>0">
+                and  agree.partner_companies_id in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
         </where>
+        order by agree.agreement_code
     </select>
 
     <delete id="deleteByUserId">
@@ -61,7 +74,10 @@
         FROM
         sys_user_link_pl_agreement link
         LEFT JOIN sys_user USER ON link.user_id = USER.id
+        LEFT JOIN sys_dept t2 ON USER.dept_id = t2.id
+        LEFT JOIN sys_dept sd2 ON sd2.id = t2.parent_id
         LEFT JOIN ptl_agreement agree ON link.ptl_agreement_id = agree.id
+        left join esm_ins_company com on link.id = agree.partner_companies_id
         <where>
             <if test="userId != null and userId != ''">
                 and  link.user_id =  #{userId}

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -551,7 +551,11 @@
             t2.id AS deptId,
             t2.`name` AS deptName,
             sd2.id AS pDeptId,
-            sd2.`name` AS pDeptName
+            sd2.`name` AS pDeptName,
+            CASE
+            WHEN ( SELECT count( 0 ) FROM sys_user_link_pl_agreement link WHERE link.user_id = t1.id) > 0 THEN
+            true ELSE false
+            END AS flag
         FROM
             sys_user t1
                 LEFT JOIN sys_dept t2 ON t1.dept_id = t2.id
@@ -573,5 +577,6 @@
                 and t2.id = #{user.deptId}
             </if>
         </if>
+        order by flag
     </select>
 </mapper>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -144,7 +144,7 @@
         FROM
         ins_area_company
         WHERE
-        id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE id NOT IN ( SELECT ins_order_no FROM ins_fee_audit ) )
+        id IN ( SELECT ins_order_no FROM ins_fee_order_new WHERE ins_order_no NOT IN ( SELECT ins_order_no FROM ins_fee_audit ) )
         AND orderstatus = 3
         )
         AND