jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 936a7ebcefc4f4a5c63bd090675cfabd958a763f

Authored by liquanyu
1 parent 747cee6976
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 4 changed files with 38 additions and 38 deletions

platform-dal/pom.xml View file @ 936a7eb
... ... @@ -16,12 +16,12 @@
16 16 <artifactId>platform-common</artifactId>
17 17 <version>1.0.1</version>
18 18 </dependency>
19   - <dependency>
20   - <groupId>com.fasterxml.jackson.core</groupId>
21   - <artifactId>jackson-annotations</artifactId>
22   - <version>2.9.0</version>
23   - <scope>compile</scope>
24   - </dependency>
  19 + <!--<dependency>-->
  20 + <!--<groupId>com.fasterxml.jackson.core</groupId>-->
  21 + <!--<artifactId>jackson-annotations</artifactId>-->
  22 + <!--<version>2.9.0</version>-->
  23 + <!--<scope>compile</scope>-->
  24 + <!--</dependency>-->
25 25 <dependency>
26 26 <groupId>org.projectlombok</groupId>
27 27 <artifactId>lombok</artifactId>
platform-operate-api/pom.xml View file @ 936a7eb
... ... @@ -102,24 +102,8 @@
102 102 <artifactId>jxl</artifactId>
103 103 <version>2.6.12</version>
104 104 </dependency>
105   - <dependency>
106   - <groupId>com.fasterxml.jackson.core</groupId>
107   - <artifactId>jackson-annotations</artifactId>
108   - <version>2.8.8</version>
109   - </dependency>
110 105  
111   - <dependency>
112   - <groupId>com.fasterxml.jackson.core</groupId>
113   - <artifactId>jackson-databind</artifactId>
114   - <version>2.8.8</version>
115   - </dependency>
116 106  
117   - <dependency>
118   - <groupId>org.codehaus.jackson</groupId>
119   - <artifactId>jackson-mapper-asl</artifactId>
120   - <version>1.9.13</version>
121   - </dependency>
122   -
123 107 <!-- https://mvnrepository.com/artifact/freemarker/freemarker -->
124 108 <!-- <dependency>
125 109 <groupId>freemarker</groupId>
... ... @@ -145,11 +129,11 @@
145 129 <artifactId>jxls-poi</artifactId>
146 130 <version>1.0.9</version>
147 131 </dependency>
148   - <dependency>
149   - <groupId>com.fasterxml.jackson.core</groupId>
150   - <artifactId>jackson-core</artifactId>
151   - <version>2.10.1</version>
152   - </dependency>
  132 + <!--<dependency>-->
  133 + <!--<groupId>com.fasterxml.jackson.core</groupId>-->
  134 + <!--<artifactId>jackson-core</artifactId>-->
  135 + <!--<version>2.10.1</version>-->
  136 + <!--</dependency>-->
153 137 <!-- <dependency>
154 138 <groupId>org.springframework</groupId>
155 139 <artifactId>spring-test</artifactId>
... ... @@ -162,12 +146,7 @@
162 146 <version>4.12</version>
163 147 <scope>test</scope>
164 148 </dependency>-->
165   - <dependency>
166   - <groupId>com.fasterxml.jackson.core</groupId>
167   - <artifactId>jackson-annotations</artifactId>
168   - <version>2.9.0</version>
169   - <scope>compile</scope>
170   - </dependency>
  149 +
171 150 </dependencies>
172 151 <build>
173 152 <resources>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 936a7eb
... ... @@ -2563,8 +2563,8 @@
2563 2563 }
2564 2564 }
2565 2565 } else {
2566   - newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
2567   - newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  2566 + newBabyManagerQueryModel.setBirthHM(babyModel.getBirth() == null ? null : new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
  2567 + newBabyManagerQueryModel.setBirthYMD(babyModel.getBirth() == null ? null : DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
2568 2568 }
2569 2569 BeanUtils.copy(babyModel, newBabyManagerQueryModel);
2570 2570 String apgarScorePf1 = "";
pom.xml View file @ 936a7eb
... ... @@ -429,16 +429,37 @@
429 429 <version>0.9.2-pre5</version>
430 430 </dependency>
431 431  
  432 +
  433 + <!--<dependency>-->
  434 + <!--<groupId>com.fasterxml.jackson.core</groupId>-->
  435 + <!--<artifactId>jackson-annotations</artifactId>-->
  436 + <!--<version>2.8.8</version>-->
  437 + <!--</dependency>-->
  438 +
432 439 <dependency>
433   - <groupId>org.codehaus.jackson</groupId>
434   - <artifactId>jackson-core-asl</artifactId>
435   - <version>1.9.7</version>
  440 + <groupId>com.fasterxml.jackson.core</groupId>
  441 + <artifactId>jackson-databind</artifactId>
  442 + <version>2.8.8</version>
436 443 </dependency>
  444 +
437 445 <dependency>
438 446 <groupId>org.codehaus.jackson</groupId>
439 447 <artifactId>jackson-mapper-asl</artifactId>
  448 + <version>1.9.13</version>
  449 + </dependency>
  450 +
  451 + <dependency>
  452 + <groupId>com.fasterxml.jackson.core</groupId>
  453 + <artifactId>jackson-annotations</artifactId>
  454 + <version>2.9.0</version>
  455 + <scope>compile</scope>
  456 + </dependency>
  457 + <dependency>
  458 + <groupId>org.codehaus.jackson</groupId>
  459 + <artifactId>jackson-core-asl</artifactId>
440 460 <version>1.9.7</version>
441 461 </dependency>
  462 +
442 463 <!-- JSON lib 开发包 以及它的依赖包 -->
443 464 <dependency>
444 465 <groupId>net.sf.json-lib</groupId>