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

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

@@ -754,9 +754,9 @@ public class YongchengOrderApiServiceImpl implements YongchengOrderApiService {
     @Override
     public HttpResult uploadImageApi(String quoteOrderNo) {
         InsAreaCompany iac = insAreaCompanyService.getByIdIsExist(quoteOrderNo);
-        if (!iac.getOrderstatus().equals(InsOrderStatusEnum.QUOTE_ING.getCode())) {
-            throw new SystemException("报价中的订单才允许核保");
-        }
+//        if (!iac.getOrderstatus().equals(InsOrderStatusEnum.QUOTE_ING.getCode())) {
+//            throw new SystemException("报价中的订单才允许核保");
+//        }
 
         InsOrders order = insOrdersService.getById(iac.getOrderno());
         List<InsTaskImagesBase64> insTaskImages = insTaskImagesService.findByOrderNo(iac.getOrderno(), iac.getId());

src/main/java/com/ydtech/modules/protocol/controller/PtlAgreementDispositionController.java

@@ -6,13 +6,15 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.vo.PltAgreementDeptDispositionVo;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author wenks
@@ -34,4 +36,19 @@ public class PtlAgreementDispositionController {
         return HttpResult.ok();
     }
 
+    @PostMapping("/agreementRelation")
+    @ApiOperation("部门配置协议信息")
+    public HttpResult agreementRelation(@RequestBody PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo) {
+        AssertionUtils.isFail(StringUtils.isBlank(pltAgreementDeptDispositionVo.getDeptId()), "部门id不能为空");
+        ptlAgreementDeptService.agreementRelation(pltAgreementDeptDispositionVo);
+        return HttpResult.ok();
+    }
+
+    @GetMapping("/getInfo")
+    @ApiOperation("根据部门id获取所有协议信息")
+    public HttpResult<List<PtlAgreement>> getInfo(String deptId) {
+        if (StringUtils.isBlank(deptId)) {return HttpResult.ok(new ArrayList<>());}
+        return HttpResult.ok(ptlAgreementDeptService.getInfo(deptId));
+    }
+
 }

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

@@ -1,7 +1,11 @@
 package com.ydtech.modules.protocol.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @author wenks
@@ -11,6 +15,12 @@ import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
  */
 public interface PtlAgreementDeptMapper extends BaseMapper<PtlAgreementDept> {
 
+    /**
+     * 根据部门id获取关联协议信息
+     * @param deptId
+     * @return
+     */
+    List<PtlAgreement> getAgreementInfo(@Param("deptId")String deptId);
 }
 
 

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

@@ -263,6 +263,8 @@ public class PtlAgreement implements Serializable {
     @TableField(exist = false)
     private String name;
 
+    @TableField(exist = false)
+    private boolean Check = false;
     /**
      * 逻辑删除
      */

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

@@ -39,4 +39,8 @@ public class PtlAgreementDept implements Serializable {
         return deptIdList.stream().map(d -> new PtlAgreementDept(agreementId, d)).collect(Collectors.toList());
     }
 
-}
+    public static List<PtlAgreementDept> toPtlAgreementDeptList(List<String> agreementId, String deptId) {
+        return agreementId.stream().map(a -> new PtlAgreementDept(a,deptId)).collect(Collectors.toList());
+    }
+
+}

src/main/java/com/ydtech/modules/protocol/entity/vo/PltAgreementDeptDispositionVo.java

@@ -16,10 +16,16 @@ import java.util.List;
 @ApiModel("协议配置")
 public class PltAgreementDeptDispositionVo {
 
-    @ApiModelProperty("机构id")
+    @ApiModelProperty("协议id")
     private String agreementId;
 
-    @ApiModelProperty("机构")
+    @ApiModelProperty("机构ids")
     private List<String> dept;
 
+    @ApiModelProperty("协议ids")
+    private List<String> agreementIds;
+
+    @ApiModelProperty("机构id")
+    private String deptId;
+
 }

src/main/java/com/ydtech/modules/protocol/entity/vo/PtlAgreementPageVo.java

@@ -77,4 +77,6 @@ public class PtlAgreementPageVo extends PageRequest {
     @ApiModelProperty("对接人")
     private String dockingPerson;
 
+    @ApiModelProperty("部门id")
+    private String deptId;
 }

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

@@ -1,6 +1,7 @@
 package com.ydtech.modules.protocol.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
 import com.ydtech.modules.protocol.entity.vo.PltAgreementDeptDispositionVo;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,4 +56,16 @@ public interface PtlAgreementDeptService extends IService<PtlAgreementDept> {
         saveBatchDept(agreementId, dept);
     }
 
+    /**
+     * 部门关联协议
+     * @param pltAgreementDeptDispositionVo
+     */
+    void agreementRelation(PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo);
+
+    /**
+     * 根据部门id获取所有协议信息
+     * @param deptId
+     * @return
+     */
+    List<PtlAgreement> getInfo(String deptId);
 }

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

@@ -1,9 +1,13 @@
 package com.ydtech.modules.protocol.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.sql.visitor.functions.If;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.protocol.dao.PtlAgreementDeptMapper;
+import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlAgreementDept;
 import com.ydtech.modules.protocol.entity.vo.PltAgreementDeptDispositionVo;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
@@ -50,6 +54,35 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
         }
     }
 
+    @Override
+    @Transactional
+    public void agreementRelation(PltAgreementDeptDispositionVo pltAgreementDeptDispositionVo) {
+        // 删除所有部门关联的协议
+        LambdaQueryWrapper<PtlAgreementDept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PtlAgreementDept::getDeptId, pltAgreementDeptDispositionVo.getDeptId());
+        remove(lambdaQueryWrapper);
+
+        // 批量新增
+        List<String> ids = pltAgreementDeptDispositionVo.getAgreementIds();
+        if(CollUtil.isNotEmpty(ids)){
+            List<PtlAgreementDept> ptlAgreementDeptList = PtlAgreementDept.toPtlAgreementDeptList(ids, pltAgreementDeptDispositionVo.getDeptId());
+            saveBatch(ptlAgreementDeptList);
+        }
+    }
+
+    @Override
+    public List<PtlAgreement> getInfo(String deptId) {
+        List<PtlAgreement> agreementList = this.baseMapper.getAgreementInfo(deptId);
+        if (CollUtil.isNotEmpty(agreementList)) {
+            for (PtlAgreement ptlAgreement : agreementList) {
+                ptlAgreement.setName(ptlAgreement.getAgreementName()
+                        + (StrUtil.isNotBlank(ptlAgreement.getBusinessDescription())? "-"+ptlAgreement.getBusinessDescription() : "")
+                        + (StrUtil.isNotBlank(ptlAgreement.getJobDescription())? "-"+ptlAgreement.getJobDescription() : ""));
+            }
+        }
+        return agreementList;
+    }
+
     private LambdaQueryWrapper<PtlAgreementDept> byAgreementId(String agreementId) {
         LambdaQueryWrapper<PtlAgreementDept> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(PtlAgreementDept::getAgreementId, agreementId);

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

@@ -1,5 +1,6 @@
 package com.ydtech.modules.protocol.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -520,18 +521,34 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
             }
             wrapper.apply("SUBSTRING(partner_companies_id, 6, " + sign + ") =" + prefix);
         }
+        List<PtlAgreementDept> deptList = new ArrayList<>();
+        if(StringUtils.isNotBlank(ptlAgreementPageVo.getDeptId())){
+            // 获取所有该部门下勾选的协议
+            LambdaQueryWrapper<PtlAgreementDept> deptWrapper = new LambdaQueryWrapper<>();
+            deptWrapper.eq(PtlAgreementDept::getDeptId, ptlAgreementPageVo.getDeptId());
+            deptList = ptlAgreementDeptService.list(deptWrapper);
+        }
+        Map<String, Object> agreeMap = new HashMap<>();
+        if(CollUtil.isNotEmpty(deptList)){
+            agreeMap = deptList.stream().collect(Collectors.toMap(PtlAgreementDept::getAgreementId,PtlAgreementDept::getDeptId));
+        }
         Page<PtlAgreement> agreementPage = page(page, wrapper);
-        agreementPage.getRecords().forEach(agreement -> {
+        for (PtlAgreement agreement : agreementPage.getRecords()) {
             LocalDate startDate = agreement.getStartDate();
+            System.out.println(startDate);
             LocalDate endDate = agreement.getEndDate();
             LocalDate now = LocalDate.now();
-            //更新是否有效
+
             if (now.isEqual(startDate) || (now.isAfter(startDate) && now.isBefore(endDate))) {
                 agreement.setIsValid("1");
             } else {
                 agreement.setIsValid("0");
             }
-        });
+            // 判断是否勾选
+            if(agreeMap.containsKey(agreement.getId())){
+                agreement.setCheck(true);
+            }
+        }
         return agreementPage;
     }
 

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

@@ -107,7 +107,7 @@
                 and io.createtime >= #{createTime}
             </if>
             <if test="beginDate !=null and beginDate != '' and endDate !=null and endDate != ''">
-                AND  io.createtime  BETWEEN  #{beginDate}  AND  #{endDate}
+                AND  iac.signing_time  BETWEEN  #{beginDate}  AND  #{endDate}
             </if>
         </where>
     </select>
@@ -171,7 +171,7 @@
              and   io.userid =#{userId}
             </if>
             <if test="beginDate !=null and beginDate != '' and endDate !=null and endDate != ''">
-                AND  io.createtime  BETWEEN  #{beginDate}  AND  #{endDate}
+                AND  iac.signing_time  BETWEEN  #{beginDate}  AND  #{endDate}
             </if>
         </where>
     </select>

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

@@ -22,7 +22,7 @@
         <where>
             iac.orderstatus = '3'
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND DATE_FORMAT( iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
                 DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
@@ -72,7 +72,7 @@
         <where>
             iac.orderstatus = '3'
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND DATE_FORMAT( iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
                 DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
@@ -134,7 +134,7 @@
         <where>
         iac.orderstatus = '3'
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND DATE_FORMAT( iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
                 DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
@@ -192,7 +192,7 @@
              1=1
             and iac.orderstatus ='3'
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND DATE_FORMAT( iac.createtime, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
+                AND DATE_FORMAT( iac.signing_time, '%Y-%m-%d') BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d') AND
                 DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
             </if>
 

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

@@ -1093,7 +1093,7 @@
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
                 and iac.createtime >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
@@ -1176,7 +1176,7 @@
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN  DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d') AND  DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
                 and iac.createtime >= DATE_SUB(NOW(), INTERVAL #{taskStatisticsVo.days} DAY)
@@ -1267,7 +1267,7 @@
                 AND   DATE_FORMAT( io.createtime, '%Y-%m-%d')   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
 
             <if test="taskStatisticsVo.companyId !=null and taskStatisticsVo.companyId != ''">
@@ -1331,7 +1331,7 @@
                 AND   io.createtime   BETWEEN #{taskStatisticsVo.createtimeStart} AND #{taskStatisticsVo.createtimeEnd}
             </if>
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   iac.createtime   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
+                AND   iac.signing_time   BETWEEN #{taskStatisticsVo.beginDate} AND #{taskStatisticsVo.endDate}
             </if>
 
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
@@ -1410,7 +1410,7 @@
             </if>
 
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
 
             <if test="taskStatisticsVo.days !=null  and taskStatisticsVo.days !='' ">
@@ -1488,7 +1488,7 @@
             </if>
 
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">
-                AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{taskStatisticsVo.beginDate}, '%Y-%m-%d')  AND DATE_FORMAT( #{taskStatisticsVo.endDate}, '%Y-%m-%d')
             </if>
 
             <if test="taskStatisticsVo.userId !=null  and  taskStatisticsVo.userId!='' ">
@@ -1640,7 +1640,7 @@
                 </foreach>
             </if>
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND iac.createtime BETWEEN #{vo.createtimeStart} AND #{vo.createtimeEnd}
+                AND iac.signing_time BETWEEN #{vo.createtimeStart} AND #{vo.createtimeEnd}
             </if>
         </where>
         GROUP BY
@@ -1685,7 +1685,7 @@
                 </foreach>
             </if>
             <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-                AND iac.createtime BETWEEN #{vo.createtimeStart} AND #{vo.createtimeEnd}
+                AND iac.signing_time BETWEEN #{vo.createtimeStart} AND #{vo.createtimeEnd}
             </if>
             <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
                 AND iac.createtime BETWEEN #{vo.beginDate} AND #{vo.endDate}
@@ -1827,7 +1827,7 @@
             and agree.partner_companies_id = #{vo.parterCompanyId}
         </if>
         <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-            AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
+            AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </if>
         <if test="vo.provinceId != null and vo.provinceId != '' and  vo.cityId == null and vo.countyId == null  and vo.houseId == null ">
             and io.deptid like "${vo.provinceId}%"
@@ -1904,7 +1904,7 @@
             and agree.partner_companies_id = #{vo.parterCompanyId}
         </if>
         <if test="vo.createtimeStart  != null  and  vo.createtimeStart!=''  and vo.createtimeEnd  != null  and  vo.createtimeEnd!=''">
-            AND   DATE_FORMAT( iac.createtime, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
+            AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')   BETWEEN DATE_FORMAT( #{vo.createtimeStart}, '%Y-%m-%d')  AND DATE_FORMAT( #{vo.createtimeEnd}, '%Y-%m-%d')
         </if>
         <if test="vo.days !=null  and vo.days !=''  and vo.days != 0 ">
             and iac.createtime >= DATE_SUB(NOW(), INTERVAL #{vo.days} DAY)

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

@@ -12,4 +12,20 @@
     <sql id="Base_Column_List">
         agreement_id,dept_id
     </sql>
+    <select id="getAgreementInfo" resultType="com.ydtech.modules.protocol.entity.po.PtlAgreement">
+        SELECT
+            b.id,
+            b.agreement_code as agreementCode,
+            b.agreement_name as agreementName,
+            b.business_description as businessDescription,
+            b.job_description as jobDescription
+        FROM ptl_agreement_dept as a
+        LEFT JOIN ptl_agreement as b ON a.agreement_id = b.id
+        <where>
+            <if test="deptId != null and deptId != ''">
+                a.dept_id = #{deptId}
+            </if>
+        </where>
+
+    </select>
 </mapper>

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

@@ -36,19 +36,18 @@
             insurance_company_id = #{companyId}
     </select>
     <select id="getInsureCompany" resultType="com.ydtech.modules.esm.model.EsmInsCompany">
-
         SELECT
-            eic.*
+        eic.*
         FROM
         esm_ins_company eic
         LEFT JOIN ptl_agreement pa ON eic.id = pa.insurance_company_id
-        <where>
-            <if test="params.id != null and params.id != ''">
-                eic.id = #{params.id}
-            </if>
-        </where>
+        where parent_id = '0'
+        and pa.is_external = '0'
+        <if test="params.id != null and params.id != ''">
+           and eic.id = #{params.id}
+        </if>
         GROUP BY
-            eic.id
+        eic.id
     </select>
 
 </mapper>