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

src/main/java/com/ydtech/modules/admin/controller/AgreeReportConroller.java

@@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -44,4 +46,25 @@ public class AgreeReportConroller {
             return HttpResult.error("查询错误"+e.getMessage());
         }
     }
+
+
+    /**
+     * @version
+     * @author: whp
+     * @Date: 2024/7/23
+     * @Description: 查询保险公司列表
+     */
+    @PostMapping("getInsuranceCompany")
+    @ApiOperation(value = "获取保险公司列表")
+    public HttpResult<List<AgreeReportDto>> getInsuranceCompany() {
+        try {
+            List<AgreeReportDto> result = agreeReportService.getInsuranceCompany();
+            return HttpResult.ok("查询数据成功", result);
+        } catch (Exception e) {
+            return HttpResult.error("查询错误" + e.getMessage());
+        }
+    }
+
+
+
 }

src/main/java/com/ydtech/modules/admin/controller/SysUserLinkPtlAgreementController.java

@@ -103,6 +103,23 @@ public class SysUserLinkPtlAgreementController extends BaseController {
         }
     }
 
+    /**
+     *  @version
+     *  @author: whp
+     *  @Date: 2024/07/23
+     *  @Description: 查询审核的所有协议  协议名称拼接
+     */
+    @GetMapping("findPtlAgreementListNew")
+    @ApiOperation("查询所有审核协议列表")
+    public HttpResult<Object> findPtlAgreementListNew() {
+        try{
+            List<PtlAgreement> list= sysUserLinkPtlAgreementService.findPtlAgreementListNew();
+            return HttpResult.ok(list);
+        }catch (Exception e){
+            return HttpResult.error("操作失败"+e.getMessage());
+        }
+    }
+
     @GetMapping("/findPtlAgreementListByUserId/{userId}")
     @ApiOperation(value = "后线人员关联协议列表")
     @ApiImplicitParam(name = "userId", value = "后线人员id", required = true)

src/main/java/com/ydtech/modules/admin/model/dto/AgreeReportQueryDto.java

@@ -37,6 +37,12 @@ public class AgreeReportQueryDto {
     @ApiModelProperty("合作公司id")
     private String partnerCompaniesId;
 
+    /***
+     * 保险公司id
+     */
+    @ApiModelProperty("保险公司id")
+    private String insuranceCompanyId;
+
     @ApiModelProperty("地区")
     private String areaId;
 

src/main/java/com/ydtech/modules/admin/model/report/user/agree/AgreeReportDto.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  *  @version
  *  @author: hxl
@@ -77,4 +79,31 @@ public class AgreeReportDto {
 
     @ApiModelProperty(value = "临期天数")
     private String dayStr;
+
+
+
+    @ApiModelProperty(value = "保险公司图标")
+    private String logo;
+
+
+    @ApiModelProperty(value = "保险公司id")
+    private String insuranceCompanyId;
+
+    @ApiModelProperty(value = "保险公司简称")
+    private String namesimple;
+
+    @ApiModelProperty(value = "签署日期")
+    private LocalDateTime  createTime;
+
+    @ApiModelProperty(value = "协议说明")
+    private String  agreementName;
+
+    @ApiModelProperty(value = "对接人")
+    private String  dockingPerson;
+
+    @ApiModelProperty(value = "是否启用")
+    private String  validStatus;
+
+    @ApiModelProperty(value = "是否有效")
+    private String  isEenabled;
 }

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

@@ -5,6 +5,8 @@ import com.ydtech.modules.admin.model.dto.AgreeReportQueryDto;
 import com.ydtech.modules.admin.model.report.user.agree.AgreeReportDto;
 import com.ydtech.modules.order.entity.BasePageResult;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -20,6 +22,16 @@ public interface AgreeReportService {
      *  @Description:  查询战略合作单位统计
      */
     BasePageResult<AgreeReportDto> queryPage(AgreeReportQueryDto agreeReportQueryDto);
+
+    /**
+     *  @version
+     *  @author:  whp
+     *  @Date: 2024/7/23
+     *  @Description:  查询保险公司列表
+     */
+    List<AgreeReportDto> getInsuranceCompany();
+
+
 }
 
 

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

@@ -79,4 +79,12 @@ public interface SysUserLinkPtlAgreementService extends IService<SysUserLinkPtlA
      *  @Description:  分页查询数据
      */
     BasePageResult<PtlAgreement> findPtlAgreementPageListByUserId(SysUserLinkPtlAgreementQueryDto sysUserLinkPtlAgreementQueryDto);
+    /**
+     *  @version
+     *  @author: whp
+     *  @Date: 2024/07/23
+     *  @Description: 查询审核的所有协议  协议名称拼接
+     */
+    List<PtlAgreement> findPtlAgreementListNew();
+
 }

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

@@ -8,6 +8,9 @@ import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.protocol.dao.PtlAgreementMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
 
 /**
  *  @version
@@ -36,6 +39,17 @@ public class AgreeReportServiceImpl implements AgreeReportService {
         return  new BasePageResult<>(agreeReportQueryDto.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
                 result.getRecords());
     }
+
+    /**
+     *  @version
+     *  @author:  whp
+     *  @Date: 2024/7/23
+     *  @Description:  查询保险公司列表
+     */
+    @Override
+    public List<AgreeReportDto> getInsuranceCompany() {
+        return   ptlAgreementMapper.getInsuranceCompany();
+    }
 }
 
 

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

@@ -118,6 +118,18 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
         PtlAgreement param =new PtlAgreement();
         return ptlAgreementService.findCheckAgreementList(param);
     }
+    /**
+     *  @version
+     *  @author: whp
+     *  @Date: 2024/07/23
+     *  @Description: 查询审核的所有协议  协议名称拼接
+     */
+    @Override
+    public List<PtlAgreement> findPtlAgreementListNew() {
+        //预留查询条件后期添加
+        PtlAgreement param =new PtlAgreement();
+        return ptlAgreementService.findCheckAgreementListNew(param);
+    }
     /**
      *  @version
      *  @author: hxl

src/main/java/com/ydtech/modules/protocol/dao/PtlAgreementMapper.java

@@ -6,6 +6,7 @@ import com.ydtech.modules.admin.model.dto.AgreeReportQueryDto;
 import com.ydtech.modules.admin.model.report.user.agree.AgreeReportDto;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDate;
@@ -18,6 +19,7 @@ import java.util.List;
  * @createDate 2023-06-05 17:59:52
  * @Entity com.ydtech.modules.protocol.entity.po.PtlAgreement
  */
+@Mapper
 public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
 
     List<PtlAgreementInsCompanyDto> getAgreementCompany(@Param("localDate") LocalDate localDate, @Param("deptId") String deptId);
@@ -43,6 +45,12 @@ public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
      *  @Description: 查询分页统计
      */
     Page<AgreeReportDto> queryReportPage(@Param("page") Page<AgreeReportDto> page, @Param("vo") AgreeReportQueryDto agreeReportQueryDto);
+
+    List<AgreeReportDto> getInsuranceCompany();
+
+    List<PtlAgreement> findCheckAgreementListNew();
+
+
 }
 
 

src/main/java/com/ydtech/modules/protocol/service/PtlAgreementService.java

@@ -227,6 +227,17 @@ public interface PtlAgreementService extends IService<PtlAgreement> {
      */
     List<PtlAgreement> findCheckAgreementList(PtlAgreement ptlAgreement);
 
+
+    /**
+     *  @version
+     *  @author: whp
+     *  @Date: 2024/07/23
+     *  @Description: 查询审核的所有协议  协议名称拼接
+     */
+    List<PtlAgreement> findCheckAgreementListNew(PtlAgreement ptlAgreement);
+
+
+
     /**
      * 获取当前费用的保险公司所有协议
      *

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -787,6 +787,17 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         return list;
     }
 
+    /**
+     *  @version
+     *  @author: whp
+     *  @Date: 2024/07/23
+     *  @Description: 查询审核的所有协议  协议名称拼接
+     */
+    public List<PtlAgreement> findCheckAgreementListNew(PtlAgreement ptlAgreement) {
+        List<PtlAgreement> list =baseMapper.findCheckAgreementListNew();
+        return list;
+    }
+
     //    @Autowired
 //    private PtlAgreementProductCostsNewService ptlAgreementProductCostsNewService;
     public List<PtlAgreement> getCurrentAgreementList(String agreementId) {

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

@@ -158,7 +158,7 @@
         select
         su1.name as "settlementUserName",
         su2.name as "updateUserName",
-        pa.agreement_name  as "agreementName",
+        CONCAT_WS( '-', pa.agreement_abbreviation, NULLIF( pa.business_description, '' ), NULLIF( pa.job_description, '' ) ) AS agreementName,
         pa.agreement_type  as "agreementType",
         pa.docking_person  as "dockingPerson",
         pa.is_external  as "isExternal",

src/main/resources/mapper/modules/protocol/PtlAgreementMapper.xml

@@ -165,7 +165,12 @@
         SELECT
         eic.id AS companyId,
         eic.NAME AS companyName,
+        eic.namesimple AS namesimple,
         pa.id AS agreeId,
+        pa.agreement_name AS agreementName,
+        pa.docking_person AS dockingPerson,
+        pa.create_time AS createTime,
+        pa.valid_status AS validStatus,
         eic_hz.id AS partnerCompaniesId,
         eic_hz.NAME AS partnerCompaniesName,
         pa.partner_companies_id,
@@ -206,7 +211,7 @@
                     DATEDIFF(pa.end_date,NOW()) <=  30
                 </when>
                 <when test="warningStatus==2">
-                    DATEDIFF(pa.end_date,NOW()) >  30
+                    DATEDIFF(pa.end_date,NOW()) &gt;  30
                 </when>
             </choose>
         </if>
@@ -216,8 +221,31 @@
         <if test="vo.partnerCompaniesId  !=null  and   vo.partnerCompaniesId  !=''" >
             and   pa.partner_companies_id =#{vo.partnerCompaniesId}
         </if>
+        <if test="vo.insuranceCompanyId  !=null  and   vo.insuranceCompanyId  !=''" >
+            and   pa.insurance_company_id =#{vo.insuranceCompanyId}
+        </if>
         </where>
         ORDER BY
         pa.serial_number
     </select>
+
+    <select id="getInsuranceCompany" resultType="com.ydtech.modules.admin.model.report.user.agree.AgreeReportDto">
+        SELECT
+            a.insurance_company_id as "insuranceCompanyId",
+            eic.logo as "logo",
+            eic.namesimple as "namesimple"
+        FROM
+            `ptl_agreement` a
+                LEFT JOIN esm_ins_company eic ON eic.id = a.insurance_company_id
+        GROUP BY
+            a.insurance_company_id
+    </select>
+
+
+    <select id="findCheckAgreementListNew" resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
+        select a.*,
+        CONCAT_WS( '-', a.agreement_abbreviation, NULLIF(a.business_description, '' ), NULLIF(a.job_description, '' ) ) AS agreementName
+        from ptl_agreement a
+        order by  a.agreement_code
+    </select>
 </mapper>