fix:[麻精药]失效日期优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Gyzj.java

@@ -53,8 +53,11 @@ public class Gyzj extends MpBaseEntity
     /** 失效日期 */
     @Compare(name = "失效日期",nameEn = "Expiration")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    private String sxrq;
 
+    /** 失效日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date sxrqTime;
 
     /** 来源 */
     private String ly;
@@ -125,9 +128,8 @@ public class Gyzj extends MpBaseEntity
     private String kcdwbj;
 
     /** 失效日期编辑 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Date sxrqbj;
+    private String sxrqbj;
 
     /** 存储条件编辑 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -248,6 +250,14 @@ public class Gyzj extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
+    public Date getSxrqTime() {
+        return sxrqTime;
+    }
+
+    public void setSxrqTime(Date sxrqTime) {
+        this.sxrqTime = sxrqTime;
+    }
+
     public String getParentBh() {
         return parentBh;
     }
@@ -586,11 +596,11 @@ public class Gyzj extends MpBaseEntity
         this.kcdw = kcdw;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
+    public void setSxrq(String sxrq) {
         this.sxrq = sxrq;
     }
 
@@ -708,11 +718,11 @@ public class Gyzj extends MpBaseEntity
         this.kcdwbj = kcdwbj;
     }
 
-    public Date getSxrqbj() {
+    public String getSxrqbj() {
         return sxrqbj;
     }
 
-    public void setSxrqbj(Date sxrqbj) {
+    public void setSxrqbj(String sxrqbj) {
         this.sxrqbj = sxrqbj;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/GyzjFfjl.java

@@ -49,8 +49,7 @@ public class GyzjFfjl extends MpBaseEntity
     private String ccwz;
 
     /** 失效日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    private String sxrq;
 
     /** 出库量 */
     private String ckl;
@@ -485,11 +484,11 @@ public class GyzjFfjl extends MpBaseEntity
         return ccwz;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
+    public void setSxrq(String sxrq) {
         this.sxrq = sxrq;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java

@@ -47,8 +47,11 @@ public class Mjy extends MpBaseEntity
 
     /** 失效日期 */
     @Compare(name = "失效日期",nameEn = "Expiration")
+    private String sxrq;
+
+    /** 失效日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    private Date sxrqTime;
 
     /** 来源 */
     private String ly;
@@ -116,9 +119,8 @@ public class Mjy extends MpBaseEntity
     private String kcdwbj;
 
     /** 失效日期编辑 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Date sxrqbj;
+    private String sxrqbj;
 
     /** 存储条件编辑 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -218,6 +220,18 @@ public class Mjy extends MpBaseEntity
     /** 归档申请人名称 */
     private String gdsqrMc;
 
+    public void setSxrq(String sxrq) {
+        this.sxrq = sxrq;
+    }
+
+    public Date getSxrqTime() {
+        return sxrqTime;
+    }
+
+    public void setSxrqTime(Date sxrqTime) {
+        this.sxrqTime = sxrqTime;
+    }
+
     public String getLy() {
         return ly;
     }
@@ -508,14 +522,10 @@ public class Mjy extends MpBaseEntity
         this.kcdw = kcdw;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
-        this.sxrq = sxrq;
-    }
-
     public Integer getZjzt() {
         return zjzt;
     }
@@ -630,11 +640,11 @@ public class Mjy extends MpBaseEntity
         this.kcdwbj = kcdwbj;
     }
 
-    public Date getSxrqbj() {
+    public String getSxrqbj() {
         return sxrqbj;
     }
 
-    public void setSxrqbj(Date sxrqbj) {
+    public void setSxrqbj(String sxrqbj) {
         this.sxrqbj = sxrqbj;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/MjyFfjl.java

@@ -48,8 +48,7 @@ public class MjyFfjl extends MpBaseEntity
     private String ccwz;
 
     /** 失效日期 */
-            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    private String sxrq;
 
     /** 出库量 */
     private String ckl;
@@ -490,11 +489,11 @@ public class MjyFfjl extends MpBaseEntity
         return ccwz;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
+    public void setSxrq(String sxrq) {
         this.sxrq = sxrq;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/BjForm.java

@@ -23,7 +23,7 @@ public class BjForm {
     private String nd;
 
     /** 浓度单位编辑 */
-    @Compare(name = "浓度单位",nameEn = "todo浓度单位")
+    @Compare(name = "浓度单位",nameEn = "Concentration Unit")
     private String nddw;
 
     /** 库存编辑 */
@@ -31,16 +31,15 @@ public class BjForm {
     private String kc;
 
     /** 库存单位编辑 */
-    @Compare(name = "库存单位",nameEn = "todo库存单位")
+    @Compare(name = "库存单位",nameEn = "Concentration Unit")
     private String kcdw;
 
     /** 失效日期编辑 */
-    @Compare(name = "失效日期",nameEn = "todo失效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    @Compare(name = "失效日期",nameEn = "Expiration")
+    private String sxrq;
 
     /** 存储条件编辑 */
-    @Compare(name = "存储条件",nameEn = "todo库存单位")
+    @Compare(name = "存储条件",nameEn = "Storage Condition")
     private String cctj;
 
     /** 存储位置编辑 */
@@ -107,11 +106,11 @@ public class BjForm {
         this.kcdw = kcdw;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
+    public void setSxrq(String sxrq) {
         this.sxrq = sxrq;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/BjForm.java

@@ -23,7 +23,7 @@ public class BjForm {
     private String nd;
 
     /** 浓度单位编辑 */
-    @Compare(name = "浓度单位",nameEn = "todo浓度单位")
+    @Compare(name = "浓度单位",nameEn = "Concentration Unit")
     private String nddw;
 
     /** 库存编辑 */
@@ -31,16 +31,15 @@ public class BjForm {
     private String kc;
 
     /** 库存单位编辑 */
-    @Compare(name = "库存单位",nameEn = "todo库存单位")
+    @Compare(name = "库存单位",nameEn = "Concentration Unit")
     private String kcdw;
 
     /** 失效日期编辑 */
-    @Compare(name = "失效日期",nameEn = "todo失效日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date sxrq;
+    @Compare(name = "失效日期",nameEn = "Expiration")
+    private String sxrq;
 
     /** 存储条件编辑 */
-    @Compare(name = "存储条件",nameEn = "todo库存单位")
+    @Compare(name = "存储条件",nameEn = "Storage Condition")
     private String cctj;
 
     /** 存储位置编辑 */
@@ -107,11 +106,11 @@ public class BjForm {
         this.kcdw = kcdw;
     }
 
-    public Date getSxrq() {
+    public String getSxrq() {
         return sxrq;
     }
 
-    public void setSxrq(Date sxrq) {
+    public void setSxrq(String sxrq) {
         this.sxrq = sxrq;
     }
 

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -226,10 +226,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             queryWrapper.and(p -> p.like("s.`name`", form.getStudyMc()));
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
-            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+            queryWrapper.apply("t.sxrq_time>={0}", form.getStartDate());
         }
         if (StringUtils.isNoneBlank(form.getEndDate())) {
-            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+            queryWrapper.apply("t.sxrq_time<{0}", form.getEndDate());
         }
         queryWrapper.orderByDesc("ts.id");
         return baseMapper.queryStudyList(queryWrapper);
@@ -259,10 +259,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
-            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+            queryWrapper.apply("t.sxrq_time>={0}", form.getStartDate());
         }
         if (StringUtils.isNoneBlank(form.getEndDate())) {
-            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+            queryWrapper.apply("t.sxrq_time<{0}", form.getEndDate());
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -1023,6 +1023,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             gyzjOld.setCcwz(gyzjOld.getCcwzbj());
             gyzjOld.setCctj(gyzjOld.getCctjbj());
             gyzjOld.setSxrq(gyzjOld.getSxrqbj());
+            gyzjOld.setSxrqTime(DateUtils.parseDate(gyzjOld.getSxrqbj()));
             gyzjOld.setNddw(gyzjOld.getNddwbj());
             gyzjOld.setNd(gyzjOld.getNdbj());
             gyzjOld.setMc(gyzjOld.getMcbj());
@@ -1493,7 +1494,12 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                                 gyzj.setNddw(studyFormFillResource.getNddw());
                                 gyzj.setKcdw(studyFormFillResource.getKcdw());
                                 gyzj.setKc(studyFormFillResource.getKc());
-                                gyzj.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+                                gyzj.setSxrq(studyFormFillResource.getSxrq());
+                                try{
+                                    gyzj.setSxrqTime(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+                                }catch (Exception e){
+                                    logger.error("失效日期不是日期格式");
+                                }
                                 this.saveOrUpdate(gyzj);if(isAdd){gyzjList.add(gyzj);}gyzjMap.put(gyzj.getBh(), gyzj);
                                 jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
                                 tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId()));
@@ -1503,7 +1509,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     }
                     if (gyzj != null) {
                         studyFormFillResource.setMc(gyzj.getMc()); studyFormFillResource.setNd(gyzj.getNd());studyFormFillResource.setNddw(gyzj.getNddw()); studyFormFillResource.setLy(gyzj.getLy());
-                        studyFormFillResource.setSxrq(gyzj.getSxrq() != null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", gyzj.getSxrq()):"");
+                        studyFormFillResource.setSxrq(gyzj.getSxrq() != null?gyzj.getSxrq():"");
                         studyFormFillResource.setNd(gyzj.getNd());
                         studyFormFillResource.setNddw(gyzj.getNddw());
                         studyFormFillResource.setLy(gyzj.getLy());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -95,10 +95,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
-            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+            queryWrapper.apply("t.sxrq_time>={0}", form.getStartDate());
         }
         if (StringUtils.isNoneBlank(form.getEndDate())) {
-            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+            queryWrapper.apply("t.sxrq_time<{0}", form.getEndDate());
         }
         queryWrapper.orderByDesc("ts.id");
         return baseMapper.queryStudyList(queryWrapper);
@@ -127,10 +127,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
-            queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
+            queryWrapper.apply("t.sxrq_time>={0}", form.getStartDate());
         }
         if (StringUtils.isNoneBlank(form.getEndDate())) {
-            queryWrapper.apply("t.sxrq<{0}", form.getEndDate());
+            queryWrapper.apply("t.sxrq_time<{0}", form.getEndDate());
         }
         queryWrapper.orderByDesc("t.id");
         return baseMapper.queryList(queryWrapper);
@@ -914,6 +914,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             mjyOld.setCcwz(mjyOld.getCcwzbj());
             mjyOld.setCctj(mjyOld.getCctjbj());
             mjyOld.setSxrq(mjyOld.getSxrqbj());
+            mjyOld.setSxrqTime(DateUtils.parseDate(mjyOld.getSxrqbj()));
             mjyOld.setNddw(mjyOld.getNddwbj());
             mjyOld.setNd(mjyOld.getNdbj());
             mjyOld.setMc(mjyOld.getMcbj());
@@ -1268,7 +1269,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                                 mjy.setLy(studyFormFillResource.getLy());
                                 mjy.setKc(studyFormFillResource.getKc());
                                 mjy.setKcdw(studyFormFillResource.getKcdw());
-                                mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+                                mjy.setSxrq(studyFormFillResource.getSxrq());
+                                try{
+                                    mjy.setSxrqTime(DateUtils.parseDate(studyFormFillResource.getSxrq()));
+                                }catch (Exception e){
+                                    logger.error("失效日期不是日期格式");
+                                }
                                 this.saveOrUpdate(mjy);if(isAdd){mjyList.add(mjy);}mjyMap.put(mjy.getBh(), mjy);
                                 jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "配制完成", JcmcysEnum.green.getValue(), null, null, qmr, remark));
                                 tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "配制完成", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId()));
@@ -1278,7 +1284,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                     }
                     if (mjy != null) {
                         studyFormFillResource.setMc(mjy.getMc());studyFormFillResource.setNd(mjy.getNd());studyFormFillResource.setNddw(mjy.getNddw());studyFormFillResource.setLy(mjy.getLy());
-                        studyFormFillResource.setSxrq(mjy.getSxrq() != null?DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", mjy.getSxrq()):"");
+                        studyFormFillResource.setSxrq(mjy.getSxrq() != null?mjy.getSxrq():"");
                         studyFormFillResource.setNd(mjy.getNd());
                         studyFormFillResource.setNddw(mjy.getNddw());
                         studyFormFillResource.setLy(mjy.getLy());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java

@@ -56,7 +56,7 @@ public class Dosage {
             formData1.put(getName("编号"), gyzj.getBh());
             formData1.put(getName("浓度"), gyzj.getNd() + gyzj.getNddw());
             formData1.put(getName("库存量"), gyzj.getKc() + gyzj.getKcdw());
-            formData1.put(getName("失效日期"), PdfExportUtil.parseDateToStr(gyzj.getSxrq()));
+            formData1.put(getName("失效日期"), gyzj.getSxrq());
             formData1.put(getName("存储条件"), gyzj.getCctj());
             formData1.put(getName("存储位置"), gyzj.getCcwz());
             formData1.put(getName("制剂状态"), "en".equals(language) ? (GyzjJcnrUtil.getEn(ZjztEnum.getEnumByValue(gyzj.getZjzt()).getText())) : ZjztEnum.getEnumByValue(gyzj.getZjzt()).getText());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java

@@ -55,7 +55,7 @@ public class Drug {
             formData1.put(getName("编号"), mjy.getBh());
             formData1.put(getName("浓度"), mjy.getNd() + mjy.getNddw());
             formData1.put(getName("库存量"), mjy.getKc() + mjy.getKcdw());
-            formData1.put(getName("失效日期"), PdfExportUtil.parseDateToStr(mjy.getSxrq()));
+            formData1.put(getName("失效日期"), mjy.getSxrq());
             formData1.put(getName("存储条件"), mjy.getCctj());
             formData1.put(getName("存储位置"), mjy.getCcwz());
             formData1.put(getName("制剂状态"), "en".equals(language) ? (MjyJcnrUtil.getEn(ZjztEnum.getEnumByValue(mjy.getZjzt()).getText())) : ZjztEnum.getEnumByValue(mjy.getZjzt()).getText());