协议添加是否有效

docker/shell-pre.sh

@@ -0,0 +1,39 @@
+# 源jar路径
+# SOURCE_PATH=/usr/local/data/jenkins/workspace/insagent/target
+# Dockerfile路径
+DOCKER_FILE_PATH=/usr/local/java/insAgency
+# 容器id
+CID=$(''docker ps | grep "ins" | awk '{print $1}''')
+echo $CID
+# 运行docker容器
+function run(){
+  echo "开始构建镜像..."
+  cd $DOCKER_FILE_PATH
+  echo "当前路径如下"
+  pwd
+  # 构建前判断是否存在镜像，存在则删除
+  if [ -n "$CID" ]; then
+    echo "存在demo容器，CID=$CID,重启docker容器 ..."
+    # 停止容器运行
+    sudo docker stop $CID
+    # 删除容器
+    sudo docker rm $CID
+    # 删除镜像
+    sudo docker rmi insagent
+    echo "删除镜像和容器成功，下面开始构建新镜像"
+  else
+    echo "不存在people-healthy容器，下面直接开始构建镜像"
+  fi
+  # 构建镜像
+  docker build -t insagent .
+  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 8081:8080 -p 9991: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
+}
+
+#入口
+run

src/main/java/com/ydtech/constants/enums/dict/agreement/ValidStatus.java

@@ -0,0 +1,30 @@
+package com.ydtech.constants.enums.dict.agreement;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @version
+ * @description: 是否有效
+ * @author: wenks
+ * @date: 2024/1/17 17:40
+ **/
+@AllArgsConstructor
+@Getter
+public enum ValidStatus {
+
+
+    VS_1("1", "有效", 1, 0),
+    VS_2("0", "无效", 2, 0);
+
+    // 编号
+    private final String code;
+    // 说明
+    private final String desc;
+    // 排序
+    private final Integer sort;
+    // 状态  0 启用  1 不启用
+    private final Integer status;
+
+}

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

@@ -25,6 +25,9 @@ public class PtlAgreementPageVo extends BasePageVO {
     @ApiModelProperty("合作公司id")
     private String partnerCompaniesId;
 
+    @ApiModelProperty("是否有效")
+    private String validStatus;
+
     @ApiModelProperty("审核状态 0 申请审核 1 审核通过 2 审核不通过")
     private Integer auditStatus;
 

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

@@ -133,6 +133,8 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
         List<String> lowerId = esmInsCompanyService.getByLowerId(ptlAgreementPageVo.getPartnerCompaniesId());
         // 审核状态
         wrapper.eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getAuditStatus()), PtlAgreement::getAuditStatus, ptlAgreementPageVo.getAuditStatus())
+                //是否有效
+                .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getValidStatus()), PtlAgreement::getValidStatus, ptlAgreementPageVo.getValidStatus())
                 // 供应商类型
                 .eq(!ObjectUtils.isEmpty(ptlAgreementPageVo.getCompaniesType()), PtlAgreement::getCompaniesType, ptlAgreementPageVo.getCompaniesType())
                 // 合作公司

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

@@ -73,6 +73,7 @@
                  left join ptl_agreement_attribution as paa on paa.id = pa.id
         where (#{localDate} between start_date and end_date)
           and (paa.template_id is not null)
+          and pa.valid_status = 1
           and pa.id in (select distinct agreement_id
                         from ptl_agreement_dept
                         <if test="deptId != null and deptId != ''">