修复标签异常；添加拜访业务类型

src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java

@@ -145,12 +145,12 @@ public class BazVisitInstance implements Serializable {
 
     /** 签到时间 */
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime signTime;
 
     /** 签退时间 */
     @TableField(exist = false)
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime outTime;
 
     /** 查询开始时间 */

src/main/java/com/qs/serve/modules/oms/entity/OmsOrder.java

@@ -99,7 +99,7 @@ public class OmsOrder implements Serializable {
     /** 是否加急 */
     private Integer urgentFlag;
 
-    /** 订单状态 0->待 */
+    /** 订单状态 0->草稿；1->下单；2->已确认 */
     private Integer status;
 
     /** 备注 */

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -164,10 +164,13 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         //todo 计算是否有活动优惠
         //收货地址
         BmsSupplierAddress supplierAddress;
-        if(confirmOrder.getAddressId()!=null){
+        if(confirmOrder.getAddressId()==null){
-            supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId());
-        }else {
             supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+        }else if (confirmOrder.getAddressId().equals(0L)){
+            supplierAddress = new BmsSupplierAddress();
+            supplierAddress.setId(0L);
+        }else {
+            supplierAddress = bmsSupplierAddressService.getById(confirmOrder.getAddressId());
         }
         OmsConfirmOrderResult confirmOrderResult = new OmsConfirmOrderResult();
         confirmOrderResult.setSupplier(supplier);

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -212,7 +212,9 @@ public class TbsBudgetApplicationService {
             }
         }
         // budgetIds交集
-        budgetIds = (List<Long>) CollectionUtils.intersection(budgetIds, limitBudgetIds);
+        if(limitBudgetIds.size()>0){
+            budgetIds = (List<Long>) CollectionUtils.intersection(budgetIds, limitBudgetIds);
+        }
         // 加载所有条件
         List<TbsBudget> budgetList;
         if(budgetIds.size()>0){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java

@@ -234,6 +234,7 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
         budgetChange.setUserId(sysUser.getId());
         budgetChange.setUserCode(sysUser.getCode());
         budgetChange.setUserName(sysUser.getName());
+        budgetChange.setRemark(param.getRemark());
         budgetChange.setBudgetCheckState(TbsBudgetCheckState.State_1_apply);
         boolean notChangeTitle = param.getBudgetCode()!=null&& param.getBudgetCode().equals(budget.getBudgetCode());
         if(!notChangeTitle){

src/main/resources/mapper/tag/TagDataMapper.xml

@@ -45,6 +45,7 @@
         FROM `tag_data` `tag_data`
         left join tag_info on tag_data.tag_id = tag_info.id
         <where>
+            and tag_info.del_flag = 0 and `tag_data`.del_flag = 0
             <if test="query.id != null"> and `tag_data`.`id` = #{query.id}</if>
             <if test="query.tagName != null and query.tagName != ''"> and `tag_data`.`tag_name` = #{query.tagName}</if>
             <if test="query.tagId != null"> and `tag_data`.`tag_id` = #{query.tagId}</if>