合同变更、证照管理

@@ -146,6 +146,10 @@ public class TblContractController extends BaseController {
             variables.put("subjectInformation", bo.getSubjectInformation());
             variables.put("subjectInformation", bo.getSubjectInformation());
             // 附件
             // 附件
             variables.put("attachments", bo.getAttachments());
             variables.put("attachments", bo.getAttachments());
+            // 变更原因
+            variables.put("reasonChange", bo.getReasonChange());
+            // 变更内容
+            variables.put("reasonText", bo.getReasonText());
             // 启动流程
             // 启动流程
             // CollegeMatters mat = iCollegeMattersService.getMatter(matterKey);
             // CollegeMatters mat = iCollegeMattersService.getMatter(matterKey);
 //            matter.setMatterDept(mat.getMatterDepartmentId());
 //            matter.setMatterDept(mat.getMatterDepartmentId());

@@ -94,6 +94,15 @@ public class TblOrginfoCertificateController extends BaseController {
     }
     }
 
 
     /**
     /**
+     * 根据单位编号查询对应的证照列表
+     *
+     */
+    @GetMapping("/selectByOrgnCode")
+    public R<?> selectByOrgnCode(@RequestParam(value = "orgcode") String orgcode){
+        List<TblOrginfoCertificateVo> tblOrginfoCertificateVos = iTblOrginfoCertificateService.selectByOrgnCode(orgcode);
+        return R.ok("成功",tblOrginfoCertificateVos);
+    }
+    /**
      * 删除单位证照表
      * 删除单位证照表
      *
      *
      * @param ids 主键串
      * @param ids 主键串

@@ -88,6 +88,18 @@ public class TblContract extends BaseEntity {
      */
      */
     private String attachments;
     private String attachments;
     /**
     /**
+     * 变更原因
+     */
+    private String reasonChange;
+    /**
+     * 变更内容
+     */
+    private String reasonText;
+    /**
+     * 合同状态
+     */
+    private String status;
+    /**
      *
      *
      */
      */
     @TableId(value = "id")
     @TableId(value = "id")

@@ -10,6 +10,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
 /**
  * 单位证照表对象 tbl_orginfo_certificate
  * 单位证照表对象 tbl_orginfo_certificate
@@ -25,7 +26,7 @@ public class TblOrginfoCertificate extends BaseEntity {
     private static final long serialVersionUID=1L;
     private static final long serialVersionUID=1L;
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @TableId(value = "id")
     @TableId(value = "id")
     private Long id;
     private Long id;
@@ -44,10 +45,14 @@ public class TblOrginfoCertificate extends BaseEntity {
     /**
     /**
      * 发证时间
      * 发证时间
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date issuanceDate;
     private Date issuanceDate;
     /**
     /**
      * 证书有效期
      * 证书有效期
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     private Date certificateValidityPeriod;
     private Date certificateValidityPeriod;
     /**
     /**
      * 证书附件
      * 证书附件

@@ -113,6 +113,18 @@ public class TblContractBo extends BaseEntity {
      */
      */
     @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
     @NotBlank(message = "附件不能为空", groups = { AddGroup.class, EditGroup.class })
     private String attachments;
     private String attachments;
+    /**
+     * 变更原因
+     */
+    private String reasonChange;
+    /**
+     * 变更内容
+     */
+    private String reasonText;
+    /**
+     * 合同状态
+     */
+    private String status;
 
 
     /**
     /**
      *
      *

@@ -11,6 +11,7 @@ import java.util.Date;
 import java.util.Date;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 
 /**
 /**
  * 单位证照表业务对象 tbl_orginfo_certificate
  * 单位证照表业务对象 tbl_orginfo_certificate
@@ -24,7 +25,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblOrginfoCertificateBo extends BaseEntity {
 public class TblOrginfoCertificateBo extends BaseEntity {
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
     private Long id;
@@ -50,12 +51,16 @@ public class TblOrginfoCertificateBo extends BaseEntity {
     /**
     /**
      * 发证时间
      * 发证时间
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @NotNull(message = "发证时间不能为空", groups = { AddGroup.class, EditGroup.class })
     @NotNull(message = "发证时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date issuanceDate;
     private Date issuanceDate;
 
 
     /**
     /**
      * 证书有效期
      * 证书有效期
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @NotNull(message = "证书有效期不能为空", groups = { AddGroup.class, EditGroup.class })
     @NotNull(message = "证书有效期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date certificateValidityPeriod;
     private Date certificateValidityPeriod;
 
 

@@ -107,6 +107,19 @@ public class TblContractVo {
     private String attachments;
     private String attachments;
 
 
     /**
     /**
+     * 变更原因
+     */
+    private String reasonChange;
+    /**
+     * 变更内容
+     */
+    private String reasonText;
+    /**
+     * 合同状态
+     */
+    private String status;
+
+    /**
      *
      *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")

@@ -7,6 +7,8 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import lombok.Data;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 import java.util.Date;
 
 
 
 
@@ -24,7 +26,7 @@ public class TblOrginfoCertificateVo {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 
+     *
      */
      */
     @ExcelProperty(value = "")
     @ExcelProperty(value = "")
     private Long id;
     private Long id;
@@ -50,12 +52,16 @@ public class TblOrginfoCertificateVo {
     /**
     /**
      * 发证时间
      * 发证时间
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ExcelProperty(value = "发证时间")
     @ExcelProperty(value = "发证时间")
     private Date issuanceDate;
     private Date issuanceDate;
 
 
     /**
     /**
      * 证书有效期
      * 证书有效期
      */
      */
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
     @ExcelProperty(value = "证书有效期")
     @ExcelProperty(value = "证书有效期")
     private Date certificateValidityPeriod;
     private Date certificateValidityPeriod;
 
 

@@ -4,6 +4,8 @@ import com.ruoyi.compliancemanagement.domain.TblOrginfoCertificate;
 import com.ruoyi.compliancemanagement.domain.vo.TblOrginfoCertificateVo;
 import com.ruoyi.compliancemanagement.domain.vo.TblOrginfoCertificateVo;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
 
+import java.util.List;
+
 /**
 /**
  * 单位证照表Mapper接口
  * 单位证照表Mapper接口
  *
  *
@@ -12,4 +14,5 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  */
  */
 public interface TblOrginfoCertificateMapper extends BaseMapperPlus<TblOrginfoCertificateMapper, TblOrginfoCertificate, TblOrginfoCertificateVo> {
 public interface TblOrginfoCertificateMapper extends BaseMapperPlus<TblOrginfoCertificateMapper, TblOrginfoCertificate, TblOrginfoCertificateVo> {
 
 
+    List<TblOrginfoCertificateVo> selectByOrgnCode(String orgcode);
 }
 }

@@ -87,6 +87,18 @@ public class TblContractModel extends BaseEntity {
      */
      */
     private String attachments;
     private String attachments;
     /**
     /**
+     * 变更原因
+     */
+    private String reasonChange;
+    /**
+     * 变更内容
+     */
+    private String reasonText;
+    /**
+     * 合同状态
+     */
+    private String status;
+    /**
      *
      *
      */
      */
     private Long id;
     private Long id;

 package com.ruoyi.compliancemanagement.service;
 package com.ruoyi.compliancemanagement.service;
 
 
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.compliancemanagement.domain.TblOrginfoCertificate;
 import com.ruoyi.compliancemanagement.domain.TblOrginfoCertificate;
 import com.ruoyi.compliancemanagement.domain.vo.TblOrginfoCertificateVo;
 import com.ruoyi.compliancemanagement.domain.vo.TblOrginfoCertificateVo;
 import com.ruoyi.compliancemanagement.domain.bo.TblOrginfoCertificateBo;
 import com.ruoyi.compliancemanagement.domain.bo.TblOrginfoCertificateBo;
@@ -46,4 +47,6 @@ public interface ITblOrginfoCertificateService {
      * 校验并批量删除单位证照表信息
      * 校验并批量删除单位证照表信息
      */
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    List<TblOrginfoCertificateVo> selectByOrgnCode(String orgcode);
 }
 }

@@ -111,4 +111,9 @@ public class TblOrginfoCertificateServiceImpl implements ITblOrginfoCertificateS
         }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
         return baseMapper.deleteBatchIds(ids) > 0;
     }
     }
+
+    @Override
+    public List<TblOrginfoCertificateVo> selectByOrgnCode(String orgcode) {
+        return baseMapper.selectByOrgnCode(orgcode);
+    }
 }
 }

@@ -20,6 +20,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="signingDate" column="signing_date"/>
         <result property="signingDate" column="signing_date"/>
         <result property="subjectInformation" column="subject_information"/>
         <result property="subjectInformation" column="subject_information"/>
         <result property="attachments" column="attachments"/>
         <result property="attachments" column="attachments"/>
+        <result property="reasonChange" column="reason_change"/>
+        <result property="reasonText" column="reason_text"/>
+        <result property="status" column="status"/>
         <result property="createBy" column="create_by"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateBy" column="update_by"/>
@@ -42,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="signingDate" column="signing_date"/>
         <result property="signingDate" column="signing_date"/>
         <result property="subjectInformation" column="subject_information"/>
         <result property="subjectInformation" column="subject_information"/>
         <result property="attachments" column="attachments"/>
         <result property="attachments" column="attachments"/>
+        <result property="reasonChange" column="reason_change"/>
+        <result property="reasonText" column="reason_text"/>
+        <result property="status" column="status"/>
         <result property="createBy" column="create_by"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateBy" column="update_by"/>
@@ -65,6 +71,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.signing_date,
             a.signing_date,
             a.subject_information,
             a.subject_information,
             a.attachments,
             a.attachments,
+            a.reason_change,
+            a.reason_text,
+            a.status,
             a.create_by,
             a.create_by,
             a.create_time,
             a.create_time,
             a.update_by,
             a.update_by,

@@ -17,6 +17,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
     </resultMap>
+    <select id="selectByOrgnCode" resultType="com.ruoyi.compliancemanagement.domain.vo.TblOrginfoCertificateVo">
+        select * from tbl_orginfo_certificate
+        where orgcode=#{orgcode}
+    </select>
 
 
 
 
 </mapper>
 </mapper>