Răsfoiți Sursa

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

szjbdgzl 2 ani în urmă
părinte
comite
0f6b3e5b45
29 a modificat fișierele cu 39 adăugiri și 41 ștergeri
  1. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/api/IExperimentalService.java
  2. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/api/IReagentService.java
  3. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/domain/Experimental.java
  4. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/domain/Reagent.java
  5. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalDao.java
  6. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalQueryDao.java
  7. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ReagentDao.java
  8. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ReagentQueryDao.java
  9. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ExperimentalDaoImpl.java
  10. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ExperimentalQueryDaoImpl.java
  11. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ReagentDaoImpl.java
  12. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ReagentQueryDaoImpl.java
  13. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalPo.java
  14. 4 5
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalTbl.java
  15. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ReagentPo.java
  16. 4 5
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ReagentTbl.java
  17. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/provider/ExperimentalProvider.java
  18. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/provider/ReagentProvider.java
  19. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/ExperimentalRepository.java
  20. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/ReagentRepository.java
  21. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/impl/ExperimentalRepositoryImpl.java
  22. 1 1
      ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/impl/ReagentRepositoryImpl.java
  23. 3 3
      ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/Experimental.map.xml
  24. 3 3
      ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/Reagent.map.xml
  25. 1 1
      ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/PvBaseTest.java
  26. 1 1
      ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/domain/ExperimentalTest.java
  27. 1 1
      ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/domain/ReagentTest.java
  28. 1 1
      ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalDaoTest.java
  29. 1 1
      ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/persistence/dao/ReagentDaoTest.java

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/api/IExperimentalService.java

@@ -26,7 +26,7 @@ import javax.validation.Valid;
  * 构建组:ibps-provider-experimental-api
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:36
+ * 创建时间:2024-05-14 10:49:06
  *</pre>
  */
 @Validated

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/api/IReagentService.java

@@ -26,7 +26,7 @@ import javax.validation.Valid;
  * 构建组:ibps-provider-reagent-api
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:44
+ * 创建时间:2024-05-14 10:49:12
  *</pre>
  */
 @Validated

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/domain/Experimental.java

@@ -26,7 +26,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:35
+ * 创建时间:2024-05-14 10:49:06
  *</pre>
  */
 @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/domain/Reagent.java

@@ -24,7 +24,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:44
+ * 创建时间:2024-05-14 10:49:12
  *</pre>
  */
 @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalDao.java

@@ -9,7 +9,7 @@ import com.lc.ibps.components.pv.persistence.entity.ExperimentalPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:33
+ * 创建时间:2024-05-14 10:49:04
  *</pre>
  */
 public interface ExperimentalDao extends IDao<String, ExperimentalPo> {

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalQueryDao.java

@@ -9,7 +9,7 @@ import com.lc.ibps.components.pv.persistence.entity.ExperimentalPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:33
+ * 创建时间:2024-05-14 10:49:04
  *</pre>
  */
 public interface ExperimentalQueryDao extends IQueryDao<String, ExperimentalPo> {

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ReagentDao.java

@@ -9,7 +9,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:40
+ * 创建时间:2024-05-14 10:49:10
  *</pre>
  */
 public interface ReagentDao extends IDao<String, ReagentPo> {

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/ReagentQueryDao.java

@@ -10,7 +10,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:40
+ * 创建时间:2024-05-14 10:49:10
  *</pre>
  */
 public interface ReagentQueryDao extends IQueryDao<String, ReagentPo> {

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ExperimentalDaoImpl.java

@@ -12,7 +12,7 @@ import com.lc.ibps.components.pv.persistence.entity.ExperimentalPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:33
+ * 创建时间:2024-05-14 10:49:04
  *</pre>
  */
 @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ExperimentalQueryDaoImpl.java

@@ -13,7 +13,7 @@ import com.lc.ibps.components.pv.persistence.entity.ExperimentalPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:33
+ * 创建时间:2024-05-14 10:49:04
  *</pre>
  */
  @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ReagentDaoImpl.java

@@ -12,7 +12,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:40
+ * 创建时间:2024-05-14 10:49:10
  *</pre>
  */
 @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/dao/impl/ReagentQueryDaoImpl.java

@@ -14,7 +14,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:40
+ * 创建时间:2024-05-14 10:49:10
  *</pre>
  */
  @SuppressWarnings("serial")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalPo.java

@@ -13,7 +13,7 @@ import io.swagger.annotations.ApiModel;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:32
+ * 创建时间:2024-05-14 10:49:03
  *</pre>
  */
 @SuppressWarnings("serial")

+ 4 - 5
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ExperimentalTbl.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:32
+ * 创建时间:2024-05-14 10:49:03
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -64,9 +64,8 @@ public class ExperimentalTbl extends AbstractPo<String>{
 	protected String  shiYanShuJu; 		/*实验数据*/
 	@ApiModelProperty(value = "结论审核人")
 	protected String  shenHeRen; 		/*结论审核人*/
-	@com.fasterxml.jackson.annotation.JsonFormat(pattern = com.lc.ibps.base.core.constants.StringPool.DATE_FORMAT_DATETIME)
 	@ApiModelProperty(value = "报告时间")
-	protected Date  baoGaoShiJian; 		/*报告时间*/
+	protected String  baoGaoShiJian; 		/*报告时间*/
 	@ApiModelProperty(value = "附件")
 	protected String  fuJian; 		/*附件*/
 	@ApiModelProperty(value = "实验结论")
@@ -348,7 +347,7 @@ public class ExperimentalTbl extends AbstractPo<String>{
 	{
 		return this.shenHeRen;
 	}
-	public void setBaoGaoShiJian(Date baoGaoShiJian) 
+	public void setBaoGaoShiJian(String baoGaoShiJian) 
 	{
 		this.baoGaoShiJian = baoGaoShiJian;
 	}
@@ -356,7 +355,7 @@ public class ExperimentalTbl extends AbstractPo<String>{
 	 * 返回 报告时间
 	 * @return
 	 */
-	public Date getBaoGaoShiJian() 
+	public String getBaoGaoShiJian() 
 	{
 		return this.baoGaoShiJian;
 	}

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ReagentPo.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModel;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:39
+ * 创建时间:2024-05-14 10:49:09
  *</pre>
  */
 @SuppressWarnings("serial")

+ 4 - 5
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/persistence/entity/ReagentTbl.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:39
+ * 创建时间:2024-05-14 10:49:09
  *</pre>
  */
 @SuppressWarnings("serial")
@@ -34,9 +34,8 @@ public class ReagentTbl extends AbstractPo<String>{
 	protected String  piHao; 		/*批号*/
 	@ApiModelProperty(value = "厂家")
 	protected String  changJia; 		/*厂家*/
-	@com.fasterxml.jackson.annotation.JsonFormat(pattern = com.lc.ibps.base.core.constants.StringPool.DATE_FORMAT_DATETIME)
 	@ApiModelProperty(value = "有效期")
-	protected Date  youXiaoQi; 		/*有效期*/
+	protected String  youXiaoQi; 		/*有效期*/
 
 	public void setId(String id) 
 	{
@@ -134,7 +133,7 @@ public class ReagentTbl extends AbstractPo<String>{
 	{
 		return this.changJia;
 	}
-	public void setYouXiaoQi(Date youXiaoQi) 
+	public void setYouXiaoQi(String youXiaoQi) 
 	{
 		this.youXiaoQi = youXiaoQi;
 	}
@@ -142,7 +141,7 @@ public class ReagentTbl extends AbstractPo<String>{
 	 * 返回 有效期
 	 * @return
 	 */
-	public Date getYouXiaoQi() 
+	public String getYouXiaoQi() 
 	{
 		return this.youXiaoQi;
 	}

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/provider/ExperimentalProvider.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ExtensionProperty;
  * 构建组:ibps-provider-experimental
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:36
+ * 创建时间:2024-05-14 10:49:07
  *</pre>
  */
 @Api(tags = "性能验证实验信息管理", value = "性能验证实验信息数据")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/provider/ReagentProvider.java

@@ -34,7 +34,7 @@ import io.swagger.annotations.ExtensionProperty;
  * 构建组:ibps-provider-reagent
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:45
+ * 创建时间:2024-05-14 10:49:12
  *</pre>
  */
 @Api(tags = "性能验证试剂信息管理", value = "性能验证试剂信息数据")

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/ExperimentalRepository.java

@@ -10,7 +10,7 @@ import com.lc.ibps.components.pv.persistence.entity.ExperimentalPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:35
+ * 创建时间:2024-05-14 10:49:05
  *</pre>
  */
 public interface ExperimentalRepository extends IRepository<String, ExperimentalPo,Experimental>{

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/ReagentRepository.java

@@ -11,7 +11,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:43
+ * 创建时间:2024-05-14 10:49:11
  *</pre>
  */
 public interface ReagentRepository extends IRepository<String, ReagentPo,Reagent>{

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/impl/ExperimentalRepositoryImpl.java

@@ -24,7 +24,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:35
+ * 创建时间:2024-05-14 10:49:05
  *</pre>
  */
 @Repository

+ 1 - 1
ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/components/pv/repository/impl/ReagentRepositoryImpl.java

@@ -20,7 +20,7 @@ import com.lc.ibps.components.pv.persistence.entity.ReagentPo;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:41
+ * 创建时间:2024-05-14 10:49:11
  *</pre>
  */
 @Repository

+ 3 - 3
ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/Experimental.map.xml

@@ -30,7 +30,7 @@
 		<result property="shiYanCanShu" column="SHI_YAN_CAN_SHU_" jdbcType="BLOB"/>
 		<result property="shiYanShuJu" column="SHI_YAN_SHU_JU_" jdbcType="BLOB"/>
 		<result property="shenHeRen" column="SHEN_HE_REN_" jdbcType="VARCHAR"/>
-		<result property="baoGaoShiJian" column="BAO_GAO_SHI_JIAN_" jdbcType="TIMESTAMP"/>
+		<result property="baoGaoShiJian" column="BAO_GAO_SHI_JIAN_" jdbcType="VARCHAR"/>
 		<result property="fuJian" column="FU_JIAN_" jdbcType="VARCHAR"/>
 		<result property="shiYanJieLun" column="SHI_YAN_JIE_LUN_" jdbcType="BLOB"/>
 	</resultMap>
@@ -43,7 +43,7 @@
 		INSERT INTO T_XNYZSYXX
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{shiYanXiangMu,jdbcType=VARCHAR}, #{shiYanFangFa,jdbcType=VARCHAR}, #{yangBenLeiXing,jdbcType=VARCHAR}, #{shiYanYiQi,jdbcType=VARCHAR}, #{yiQiBianHao,jdbcType=VARCHAR}, #{kaiShiShiJian,jdbcType=VARCHAR}, #{jieShuShiJian,jdbcType=VARCHAR}, #{jieGuoDanWei,jdbcType=VARCHAR}, #{baoLiuXiaoShu,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{fangAnLeiXing,jdbcType=VARCHAR}, #{shiYanCanShu,jdbcType=BLOB}, #{shiYanShuJu,jdbcType=BLOB}, #{shenHeRen,jdbcType=VARCHAR}, #{baoGaoShiJian,jdbcType=TIMESTAMP}, #{fuJian,jdbcType=VARCHAR}, #{shiYanJieLun,jdbcType=BLOB})
+		(#{id,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{shiFouGuoShen,jdbcType=VARCHAR}, #{diDian,jdbcType=VARCHAR}, #{bianZhiRen,jdbcType=VARCHAR}, #{bianZhiBuMen,jdbcType=VARCHAR}, #{bianZhiShiJian,jdbcType=VARCHAR}, #{kuaiZhao,jdbcType=VARCHAR}, #{shiYanXiangMu,jdbcType=VARCHAR}, #{shiYanFangFa,jdbcType=VARCHAR}, #{yangBenLeiXing,jdbcType=VARCHAR}, #{shiYanYiQi,jdbcType=VARCHAR}, #{yiQiBianHao,jdbcType=VARCHAR}, #{kaiShiShiJian,jdbcType=VARCHAR}, #{jieShuShiJian,jdbcType=VARCHAR}, #{jieGuoDanWei,jdbcType=VARCHAR}, #{baoLiuXiaoShu,jdbcType=VARCHAR}, #{beiZhu,jdbcType=VARCHAR}, #{fangAnLeiXing,jdbcType=VARCHAR}, #{shiYanCanShu,jdbcType=BLOB}, #{shiYanShuJu,jdbcType=BLOB}, #{shenHeRen,jdbcType=VARCHAR}, #{baoGaoShiJian,jdbcType=VARCHAR}, #{fuJian,jdbcType=VARCHAR}, #{shiYanJieLun,jdbcType=BLOB})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="ExperimentalPo">
@@ -111,7 +111,7 @@
 		SHI_YAN_CAN_SHU_=#{shiYanCanShu,jdbcType=BLOB},
 		SHI_YAN_SHU_JU_=#{shiYanShuJu,jdbcType=BLOB},
 		SHEN_HE_REN_=#{shenHeRen,jdbcType=VARCHAR},
-		BAO_GAO_SHI_JIAN_=#{baoGaoShiJian,jdbcType=TIMESTAMP},
+		BAO_GAO_SHI_JIAN_=#{baoGaoShiJian,jdbcType=VARCHAR},
 		FU_JIAN_=#{fuJian,jdbcType=VARCHAR},
 		SHI_YAN_JIE_LUN_=#{shiYanJieLun,jdbcType=BLOB}
 		WHERE

+ 3 - 3
ibps-provider-root/modules/provider-business/src/main/resources/com/lc/ibps/pv/persistence/mapping/Reagent.map.xml

@@ -15,7 +15,7 @@
 		<result property="shiJiMingCheng" column="SHI_JI_MING_CHENG" jdbcType="VARCHAR"/>
 		<result property="piHao" column="PI_HAO_" jdbcType="VARCHAR"/>
 		<result property="changJia" column="CHANG_JIA_" jdbcType="VARCHAR"/>
-		<result property="youXiaoQi" column="YOU_XIAO_QI_" jdbcType="TIMESTAMP"/>
+		<result property="youXiaoQi" column="YOU_XIAO_QI_" jdbcType="VARCHAR"/>
 	</resultMap>
 	
 	<sql id="columns">
@@ -26,7 +26,7 @@
 		INSERT INTO T_XNYZSJXX
 		(<include refid="columns"/>)
 		VALUES 
-		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{leiBie,jdbcType=VARCHAR}, #{shiJiMingCheng,jdbcType=VARCHAR}, #{piHao,jdbcType=VARCHAR}, #{changJia,jdbcType=VARCHAR}, #{youXiaoQi,jdbcType=TIMESTAMP})
+		(#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{tenantId,jdbcType=VARCHAR}, #{ip,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{leiBie,jdbcType=VARCHAR}, #{shiJiMingCheng,jdbcType=VARCHAR}, #{piHao,jdbcType=VARCHAR}, #{changJia,jdbcType=VARCHAR}, #{youXiaoQi,jdbcType=VARCHAR})
 	</insert>
 	
 	<select id="get" parameterType="java.lang.String" resultMap="ReagentPo">
@@ -79,7 +79,7 @@
 		SHI_JI_MING_CHENG=#{shiJiMingCheng,jdbcType=VARCHAR},
 		PI_HAO_=#{piHao,jdbcType=VARCHAR},
 		CHANG_JIA_=#{changJia,jdbcType=VARCHAR},
-		YOU_XIAO_QI_=#{youXiaoQi,jdbcType=TIMESTAMP}
+		YOU_XIAO_QI_=#{youXiaoQi,jdbcType=VARCHAR}
 		WHERE
 		ID_=#{id}
 	</update>

+ 1 - 1
ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/PvBaseTest.java

@@ -14,7 +14,7 @@ import com.lc.ibps.api.base.id.IdGenerator;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:41
+ * 创建时间:2024-05-14 10:49:10
  *</pre>
  */
 @ContextConfiguration({"classpath:conf/components-test.xml"})

+ 1 - 1
ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/domain/ExperimentalTest.java

@@ -20,7 +20,7 @@ import com.lc.ibps.components.PvBaseTest;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:35
+ * 创建时间:2024-05-14 10:49:05
  *</pre>
  */
 public class ExperimentalTest extends PvBaseTest{

+ 1 - 1
ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/domain/ReagentTest.java

@@ -20,7 +20,7 @@ import com.lc.ibps.components.PvBaseTest;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:43
+ * 创建时间:2024-05-14 10:49:11
  *</pre>
  */
 public class ReagentTest extends PvBaseTest{

+ 1 - 1
ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/persistence/dao/ExperimentalDaoTest.java

@@ -17,7 +17,7 @@ import com.lc.ibps.components.PvBaseTest;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:32
+ * 创建时间:2024-05-14 10:49:04
  *</pre>
  */
 public class ExperimentalDaoTest extends PvBaseTest{

+ 1 - 1
ibps-provider-root/modules/provider-business/src/test/java/com/lc/ibps/components/pv/persistence/dao/ReagentDaoTest.java

@@ -17,7 +17,7 @@ import com.lc.ibps.components.PvBaseTest;
  *<pre> 
  * 开发公司:深圳市金源信通科技有限公司
  * 开发人员:codegen
- * 创建时间:2024-05-14 09:43:40
+ * 创建时间:2024-05-14 10:49:09
  *</pre>
  */
 public class ReagentDaoTest extends PvBaseTest{