zhoulisky 10 months ago
parent
commit
012b622d1c

+ 11 - 5
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/CgJsbzEntity.java

@@ -43,6 +43,9 @@ public class CgJsbzEntity extends TenantEntity {
 	@Schema(description = "起草单位")
 	@Schema(description = "起草单位")
 	private String qcdw;
 	private String qcdw;
 
 
+	@Schema(description = "参与人")
+	private String cyr;
+
 	@Schema(description = "实施日期")
 	@Schema(description = "实施日期")
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
@@ -51,13 +54,16 @@ public class CgJsbzEntity extends TenantEntity {
 	@Schema(description = "状态")
 	@Schema(description = "状态")
 	private String state;
 	private String state;
 
 
-	@Schema(description = "参与人")
-	private String cyr;
+	@Schema(description = "参与/主持")
+	private String cyZc;
+
+	@Schema(description ="项目名称")
+	private String xmmc;
+
+	@Schema(description ="项目编号")
+	private String xmbh;
 
 
 	@Schema(description = "附件,多个用逗号分割")
 	@Schema(description = "附件,多个用逗号分割")
 	private String attachment;
 	private String attachment;
 
 
-	@Schema(description = "科研项目id,kd_xm的主键")
-	private Long xmId;
-
 }
 }

+ 6 - 3
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/CgKylwEntity.java

@@ -57,10 +57,13 @@ public class CgKylwEntity extends TenantEntity {
 	@Schema(description = "期刊级别")
 	@Schema(description = "期刊级别")
 	private String qkjb;
 	private String qkjb;
 
 
+	@Schema(description ="项目名称")
+	private String xmmc;
+
+	@Schema(description ="项目编号")
+	private String xmbh;
+
 	@Schema(description = "附件,多个用逗号分割")
 	@Schema(description = "附件,多个用逗号分割")
 	private String attachment;
 	private String attachment;
 
 
-	@Schema(description = "科研项目id,kd_xm的主键")
-	private Long xmId;
-
 }
 }

+ 6 - 3
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/CgQtEntity.java

@@ -59,10 +59,13 @@ public class CgQtEntity extends TenantEntity {
 	@Schema(description = "参与/主持")
 	@Schema(description = "参与/主持")
 	private String canyunZhuchi;
 	private String canyunZhuchi;
 
 
+	@Schema(description ="项目名称")
+	private String xmmc;
+
+	@Schema(description ="项目编号")
+	private String xmbh;
+
 	@Schema(description = "附件,多个用逗号分割")
 	@Schema(description = "附件,多个用逗号分割")
 	private String attachment;
 	private String attachment;
 
 
-	@Schema(description = "科研项目id,kd_xm的主键")
-	private Long xmId;
-
 }
 }

+ 15 - 32
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/CgRjzzqEntity.java

@@ -28,61 +28,44 @@ public class CgRjzzqEntity extends TenantEntity {
 	@Serial
 	@Serial
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 
 
-	/**
-	 * 软件名称
-	 */
 	@Schema(description = "软件名称")
 	@Schema(description = "软件名称")
 	private String rjmc;
 	private String rjmc;
-	/**
-	 * 软件简称
-	 */
+
 	@Schema(description = "软件简称")
 	@Schema(description = "软件简称")
 	private String rjjc;
 	private String rjjc;
-	/**
-	 * 版本号
-	 */
+
 	@Schema(description = "版本号		")
 	@Schema(description = "版本号		")
 	private String bbh;
 	private String bbh;
-	/**
-	 * 登记号
-	 */
+
 	@Schema(description = "登记号")
 	@Schema(description = "登记号")
 	private String djh;
 	private String djh;
-	/**
-	 * 开发完成日期
-	 */
+
 	@Schema(description = "开发完成日期")
 	@Schema(description = "开发完成日期")
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	private Date kfwcrq;
 	private Date kfwcrq;
-	/**
-	 * 首次发布日期
-	 */
+
 	@Schema(description = "首次发布日期")
 	@Schema(description = "首次发布日期")
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	private Date scfbrq;
 	private Date scfbrq;
-	/**
-	 * 登记批准日期
-	 */
+
 	@Schema(description = "登记批准日期")
 	@Schema(description = "登记批准日期")
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@DateTimeFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	@JsonFormat(pattern = DateUtil.PATTERN_DATE)
 	private Date djpzrq;
 	private Date djpzrq;
-	/**
-	 * 取得方式
-	 */
+
 	@Schema(description = "取得方式")
 	@Schema(description = "取得方式")
 	private String qdfs;
 	private String qdfs;
-	/**
-	 * 附件,多个用逗号分割
-	 */
+
+	@Schema(description ="项目名称")
+	private String xmmc;
+
+	@Schema(description ="项目编号")
+	private String xmbh;
+
 	@Schema(description = "附件,多个用逗号分割")
 	@Schema(description = "附件,多个用逗号分割")
 	private String attachment;
 	private String attachment;
-	/**
-	 * 科研项目id,kd_xm的主键
-	 */
-	@Schema(description = "科研项目id,kd_xm的主键")
-	private Long xmId;
+
 
 
 }
 }

+ 8 - 2
kd-service-api/kd-scientific-api/src/main/java/org/sky/scientific/pojo/entity/CgZlEntity.java

@@ -38,8 +38,8 @@ public class CgZlEntity extends TenantEntity {
 	@Schema(description = "专利类型")
 	@Schema(description = "专利类型")
 	private String zllx;
 	private String zllx;
 
 
-	@Schema(description = "是否国防专利,1:是,0:否")
-	private Boolean sfgfzl;
+	@Schema(description = "是否国防专利,是,否")
+	private String sfgfzl;
 
 
 	@Schema(description = "国别")
 	@Schema(description = "国别")
 	private String gb;
 	private String gb;
@@ -72,6 +72,12 @@ public class CgZlEntity extends TenantEntity {
 	@Schema(description = "法律状态")
 	@Schema(description = "法律状态")
 	private String flzt;
 	private String flzt;
 
 
+	@Schema(description ="项目名称")
+	private String xmmc;
+
+	@Schema(description ="项目编号")
+	private String xmbh;
+
 	@Schema(description = "收件人邮箱")
 	@Schema(description = "收件人邮箱")
 	private String sjryx;
 	private String sjryx;
 
 

+ 2 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/excel/CgZlExcel.java

@@ -46,8 +46,8 @@ public class CgZlExcel implements Serializable {
 	private String zllx;
 	private String zllx;
 
 
 	@ColumnWidth(20)
 	@ColumnWidth(20)
-	@ExcelProperty(index = 4, value ="是否国防专利,1:是,0:否")
-	private Integer sfgfzl;
+	@ExcelProperty(index = 4, value ="是否国防专利,是,否")
+	private String sfgfzl;
 
 
 	@ColumnWidth(20)
 	@ColumnWidth(20)
 	@ExcelProperty(index = 5, value ="国别")
 	@ExcelProperty(index = 5, value ="国别")

+ 2 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/CgJsbzMapper.xml

@@ -15,7 +15,8 @@
         <result column="state" property="state"/>
         <result column="state" property="state"/>
         <result column="CYR" property="cyr"/>
         <result column="CYR" property="cyr"/>
         <result column="attachment" property="attachment"/>
         <result column="attachment" property="attachment"/>
-        <result column="XM_ID" property="xmId"/>
+        <result column="XMBH" property="xmbh"/>
+        <result column="XMMC" property="xmmc"/>
         <result column="create_user" property="createUser"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>

+ 2 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/CgKylwMapper.xml

@@ -16,7 +16,8 @@
         <result column="QKLX" property="qklx"/>
         <result column="QKLX" property="qklx"/>
         <result column="QKJB" property="qkjb"/>
         <result column="QKJB" property="qkjb"/>
         <result column="attachment" property="attachment"/>
         <result column="attachment" property="attachment"/>
-        <result column="XM_ID" property="xmId"/>
+        <result column="XMBH" property="xmbh"/>
+        <result column="XMMC" property="xmmc"/>
         <result column="create_user" property="createUser"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>

+ 2 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/CgQtMapper.xml

@@ -16,7 +16,8 @@
         <result column="SHOUQUAN_RQ" property="shouquanRq"/>
         <result column="SHOUQUAN_RQ" property="shouquanRq"/>
         <result column="CANYUN_ZHUCHI" property="canyunZhuchi"/>
         <result column="CANYUN_ZHUCHI" property="canyunZhuchi"/>
         <result column="attachment" property="attachment"/>
         <result column="attachment" property="attachment"/>
-        <result column="XM_ID" property="xmId"/>
+        <result column="XMBH" property="xmbh"/>
+        <result column="XMMC" property="xmmc"/>
         <result column="create_user" property="createUser"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>

+ 2 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/CgRjzzqMapper.xml

@@ -15,7 +15,8 @@
         <result column="DJPZRQ" property="djpzrq"/>
         <result column="DJPZRQ" property="djpzrq"/>
         <result column="QDFS" property="qdfs"/>
         <result column="QDFS" property="qdfs"/>
         <result column="attachment" property="attachment"/>
         <result column="attachment" property="attachment"/>
-        <result column="XM_ID" property="xmId"/>
+        <result column="XMBH" property="xmbh"/>
+        <result column="XMMC" property="xmmc"/>
         <result column="create_user" property="createUser"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>

+ 6 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/mapper/CgZlMapper.xml

@@ -12,12 +12,17 @@
         <result column="SFGFZL" property="sfgfzl"/>
         <result column="SFGFZL" property="sfgfzl"/>
         <result column="GB" property="gb"/>
         <result column="GB" property="gb"/>
         <result column="SQH_ZLH" property="sqhZlh"/>
         <result column="SQH_ZLH" property="sqhZlh"/>
-        <result column="FMR" property="fmr"/>
         <result column="SHENQING_RQ" property="shenqingRq"/>
         <result column="SHENQING_RQ" property="shenqingRq"/>
         <result column="SHOUQUAN_RQ" property="shouquanRq"/>
         <result column="SHOUQUAN_RQ" property="shouquanRq"/>
         <result column="SQDW" property="sqdw"/>
         <result column="SQDW" property="sqdw"/>
         <result column="ZLQR" property="zlqr"/>
         <result column="ZLQR" property="zlqr"/>
         <result column="GYQR" property="gyqr"/>
         <result column="GYQR" property="gyqr"/>
+        <result column="FMR" property="fmr"/>
+        <result column="FLZT" property="flzt"/>
+        <result column="XMBH" property="xmbh"/>
+        <result column="XMMC" property="xmmc"/>
+        <result column="SJRYX" property="sjryx"/>
+        <result column="ZLTXGN" property="zltxgn"/>
         <result column="create_user" property="createUser"/>
         <result column="create_user" property="createUser"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_dept" property="createDept"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>