Merge branch 'master' of https://git.steerinfo.com/caol/jg_wzjl_api.git

src/main/java/com/steerinfo/baseinfo/meterbasecar/controller/MeterBaseCarController.java

@@ -982,7 +982,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
     public RESTfulResult newId() {
         try {
             HashMap<String, Object> map = new HashMap<>();
-            map.put("valueFlag", "0");
+            map.put("validFlag", "0");
             List<MeterBaseCar> carList = meterBaseCarMapper.selectByParameters(map);
             int count = 0;
             if(carList.size() >= 1) {
@@ -992,7 +992,7 @@ public class MeterBaseCarController extends BaseRESTfulController {
                     i++;
                     DecimalFormat decimalFormat = new DecimalFormat("00000");
                     String numFormat= decimalFormat .format(i);
-                    car.setPkNo(new SimpleDateFormat("yyyyMMdd").format(new Date())+numFormat);
+                    car.setPkNo("20220517"+numFormat);
 
                     int j = meterBaseCarMapper.reNewID(car);
                     if(j >= 1) {

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2844,7 +2844,7 @@
     <include refid="select"/>
     <include refid="whereLike"/>
     <if test="flag != null and flag != ''">
-      and value_flag != '0'
+      value_flag not in ('0', '2')
     </if>
     order by create_time desc
   </select>