1.添加车险结算添加新增类型字段

2.添加平台、私有协议区分
3.添加任务管理添加录单来源

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

@@ -111,9 +111,9 @@ public class SysUserLinkPtlAgreementController extends BaseController {
      */
     @GetMapping("findPtlAgreementListNew")
     @ApiOperation("查询所有审核协议列表")
-    public HttpResult<Object> findPtlAgreementListNew() {
+    public HttpResult<Object> findPtlAgreementListNew(String type) {
         try{
-            List<PtlAgreement> list= sysUserLinkPtlAgreementService.findPtlAgreementListNew();
+            List<PtlAgreement> list= sysUserLinkPtlAgreementService.findPtlAgreementListNew(type);
             return HttpResult.ok(list);
         }catch (Exception e){
             return HttpResult.error("操作失败"+e.getMessage());

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

@@ -85,6 +85,6 @@ public interface SysUserLinkPtlAgreementService extends IService<SysUserLinkPtlA
      *  @Date: 2024/07/23
      *  @Description: 查询审核的所有协议  协议名称拼接
      */
-    List<PtlAgreement> findPtlAgreementListNew();
+    List<PtlAgreement> findPtlAgreementListNew(String type);
 
 }

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

@@ -131,9 +131,10 @@ public class SysUserLinkPtlAgreementServiceImpl extends ServiceImpl<SysUserLinkP
      *  @Description: 查询审核的所有协议  协议名称拼接
      */
     @Override
-    public List<PtlAgreement> findPtlAgreementListNew() {
+    public List<PtlAgreement> findPtlAgreementListNew(String type) {
         //预留查询条件后期添加
         PtlAgreement param =new PtlAgreement();
+        param.setAgreementType(type);
         return ptlAgreementService.findCheckAgreementListNew(param);
     }
     /**

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

@@ -467,6 +467,10 @@ public class InsPlyIncome implements Serializable {
     @TableField(exist = false)
     private String isExternal;
 
+    @ApiModelProperty("是否外部订单")
+    @TableField("add_type")
+    private String addType;
+
 
     public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDateTime createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;

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

@@ -1298,6 +1298,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
         insPlyIncome.setNoSuperviseCostsProportion(insPlyIncomeVo.getNoSuperviseCostsProportion());
         insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
+        insPlyIncome.setAddType(insPlyIncomeVo.getAddType());
         baseMapper.updateById(insPlyIncome);
 
         InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();

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

@@ -61,7 +61,7 @@ public class InsPlyIncomeVo implements Serializable {
     private LocalDate createTime;
 
     @ApiModelProperty(value = "结算日期")
-    @DateTimeFormat(value = "yyyy-MM-dd'T'HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDate settlementTime;
 
 
@@ -422,4 +422,8 @@ public class InsPlyIncomeVo implements Serializable {
     private List<InsuranceHandlingSettlementMonthEntity> insuranceHandlingList;
 
 
+    @ApiModelProperty("添加类型")
+    private String addType;
+
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -162,6 +162,9 @@ public class OrderQueryVo {
     @ApiModelProperty("领导人名称")
     private String leaderName;
 
+    @ApiModelProperty("录入来源")
+    private String entryStatus;
+
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){
             return endDate;

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

@@ -48,7 +48,7 @@ public interface PtlAgreementMapper extends BaseMapper<PtlAgreement> {
 
     List<AgreeReportDto> getInsuranceCompany();
 
-    List<PtlAgreement> findCheckAgreementListNew();
+    List<PtlAgreement> findCheckAgreementListNew(@Param("vo") PtlAgreement ptlAgreement);
 
 
 }

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

@@ -834,7 +834,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
      *  @Description: 查询审核的所有协议  协议名称拼接
      */
     public List<PtlAgreement> findCheckAgreementListNew(PtlAgreement ptlAgreement) {
-        List<PtlAgreement> list =baseMapper.findCheckAgreementListNew();
+        List<PtlAgreement> list =baseMapper.findCheckAgreementListNew(ptlAgreement);
         return list;
     }
 

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

@@ -151,7 +151,8 @@
                 a.invoicing_method  as  "invoicingMethod",
                 a.settlement_image_id as "settlementImageId",
                 a.task_id as "taskId",
-                a.create_time  as  "createTime"
+                a.create_time  as  "createTime",
+                a.add_type  as  "addType"
     </sql>
 
     <select id="queryNew"  resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">

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

@@ -53,6 +53,7 @@
         <result property="leaderName" column="leader_name" jdbcType="VARCHAR"/>
         <result property="leaderId" column="leader_id" jdbcType="VARCHAR"/>
         <result property="underwritingStatus" column="underwritingStatus" jdbcType="INTEGER"/>
+        <result property="entryStatus" column="entryStatus" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="OrderResultMap" type="com.ydtech.modules.order.entity.vo.OrderVo">
         <id property="orderno" column="orderno" jdbcType="VARCHAR"/>
@@ -908,7 +909,8 @@
         WHEN '2' THEN '个代'
         WHEN '3' THEN '电销'
         ELSE '' END
-        AS managementSource
+        AS managementSource,
+        io.entry_status  as entryStatus
         from
             ins_area_company iac
         left JOIN
@@ -1043,6 +1045,9 @@
             <if test="orderQueryVo.signStartDateStr != null and orderQueryVo.signEndDateStr != null">
                 and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{orderQueryVo.signStartDateStr} AND #{orderQueryVo.signEndDateStr}
             </if>
+            <if test="orderQueryVo.entryStatus != null and orderQueryVo.entryStatus != ''">
+                and io.entry_status = #{orderQueryVo.entryStatus }
+            </if>
         </where>
         order by io.createtime desc
     </select>
@@ -1181,6 +1186,9 @@
             <if test="orderQueryVo.signStartDateStr != null and orderQueryVo.signEndDateStr != null">
                 and  DATE_FORMAT(iac.signing_time, '%Y-%m-%d') between #{orderQueryVo.signStartDateStr} AND #{orderQueryVo.signEndDateStr}
             </if>
+            <if test="orderQueryVo.entryStatus != null and orderQueryVo.entryStatus != ''">
+                and io.entry_status = #{orderQueryVo.entryStatus }
+            </if>
         </where>
         ) as s
     </select>

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

@@ -259,6 +259,11 @@
         select a.*,
         CONCAT_WS( '-', a.agreement_abbreviation, NULLIF(a.business_description, '' ), NULLIF(a.job_description, '' ) ) AS agreementName
         from ptl_agreement a
+        <where>
+            <if test="vo.agreementType  !=null  and   vo.agreementType  !=''">
+                AND a.agreement_type =#{vo.agreementType}
+            </if>
+        </where>
         order by  a.agreement_code
     </select>
 </mapper>