修复用户多个角色进行稽查确认时报错

sp-admin/sa-view/tb-business-car/tb-business-car-add.html

@@ -77,7 +77,7 @@
 							<label class="c-label">
 								<span style="color: red;" v-if="m.realOutTime">*</span>出场确认说明：</label>
 							<div style="display: inline-block;">
-								<el-input type="textarea" v-model="m.outRemark" placeholder="出场确认说明"></el-input>
+								<el-input type="textarea" v-model="m.outRemark" placeholder="出场确认说明" :disabled="!m.realOutTime"></el-input>
 							</div>
 						</div>
 					</el-form>

sp-admin/sa-view/tb-business-car/tb-business-car-edit.html

@@ -77,7 +77,7 @@
 							<label class="c-label">
 								<span style="color: red;" v-if="m.realOutTime&&!obj.realOutTime">*</span>出场确认说明：</label>
 							<div style="display: inline-block;">
-								<el-input type="textarea" v-model="m.outRemark" placeholder="出场确认说明"></el-input>
+								<el-input :disabled="!m.realOutTime" type="textarea" v-model="m.outRemark" placeholder="出场确认说明"></el-input>
 							</div>
 						</div>
 					</el-form>

sp-admin/sa-view/tb-business-car/tb-business-car-list.html

@@ -119,8 +119,8 @@
 						</template>
 					</el-table-column>
 					<sa-td name="支付状态" prop="payType"></sa-td>
-					<sa-td name="备注" prop="remark" width="180"></sa-td>
 					<sa-td name="出场确认说明" prop="outRemark" width="180"></sa-td>
+					<sa-td name="备注" prop="remark" width="180"></sa-td>
 					<el-table-column label="操作" width="280px" fixed="right">
 						<template slot-scope="s">
 							<el-button class="c-btn" type="success" icon="el-icon-view" @click="get(s.row)">查看

sp-server/src/main/java/com/pj/project/tb_account/TbAccountController.java

@@ -5,8 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import com.pj.constants.UserTypeEnum;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.project.tb_charge_record.TbChargeRecord;
-import com.pj.project.tb_costomer.TbCostomer;
-import com.pj.utils.AesUtil;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;

sp-server/src/main/java/com/pj/project/tb_account/TbAccountService.java

@@ -24,7 +24,6 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Service: tb_account -- 客户账户

sp-server/src/main/java/com/pj/project/tb_business/TbBusinessService.java

@@ -8,7 +8,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
@@ -31,9 +30,7 @@ import com.pj.project.oa.bo.OAResultBO;
 import com.pj.project.oa.bo.ParamsBO;
 import com.pj.project.relation_business_car.RelationBusinessCar;
 import com.pj.project.relation_business_car.RelationBusinessCarService;
-import com.pj.project.relation_type_item.RelationTypeItemService;
 
-import com.pj.project.tb_account.TbAccount;
 import com.pj.project.tb_account.AutomaticPay;
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
@@ -71,7 +68,6 @@ import com.pj.project4sp.admin.SpAdminService;
 import com.pj.project4sp.global.BusinessException;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
-import com.sun.org.apache.regexp.internal.RE;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;

sp-server/src/main/java/com/pj/project/tb_business_car/ExportTbBusinessDTO.java

@@ -38,4 +38,8 @@ public class ExportTbBusinessDTO {
 
     @ExcelProperty("支付时间")
     private Date payTime;
+    @ExcelProperty("出场确认说明")
+    private String outRemark;
+    @ExcelProperty("备注")
+    private String remark;
 }

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarController.java

@@ -166,6 +166,11 @@ public class TbBusinessCarController {
     @SaCheckPermission(TbBusinessCar.PERMISSION_EXPORT)
     public AjaxJson export() {
         SoMap soMap = SoMap.getRequestSoMap();
+        String carNo = soMap.getString("carNo");
+        if (StrUtil.isNotEmpty(carNo)) {
+            soMap.put("carNo", carNo.toUpperCase().trim());
+            soMap.put("carNoList", StrUtil.splitTrim(carNo.toUpperCase(), "、"));
+        }
         return AjaxJson.getSuccessData(tbBusinessCarService.export(soMap));
     }
 

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarMapper.java

@@ -46,4 +46,6 @@ public interface TbBusinessCarMapper extends BaseMapper<TbBusinessCar> {
     List<TbBusinessCar> searchForPayCar(@Param("carNo") String carNo);
 
     CarStatics staticsCar(@Param("weightCar") String weightCar, @Param("emptyCar") String emptyCar, @Param("list")List<String> list);
+
+    void updateRecord(TbBusinessCar db);
 }

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarMapper.xml

@@ -27,6 +27,24 @@
         set business_id=null
         where id = #{id}
     </update>
+    <update id="updateRecord">
+        update  tb_business_car
+         set
+         car_no=#{carNo},
+         color=#{color},
+         real_in_time=#{realInTime},
+         real_out_time=#{realOutTime},
+         money=#{money},
+         pay=#{pay},
+         pay_type=#{payType},
+         time_update=now(),
+         in_image=#{inImage},
+         out_image=#{outImage},
+         remark=#{remark},
+         out_remark=#{outRemark},
+         car_size=#{carSize}
+         where id=#{id}
+    </update>
 
     <!-- 查集合 - 根据条件（参数为空时代表忽略指定条件） [G] -->
     <select id="getList" resultMap="model">

sp-server/src/main/java/com/pj/project/tb_business_car/TbBusinessCarService.java

@@ -203,6 +203,9 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
         if (StrUtil.isEmpty(outRemark)&& !Objects.equals(t.getRealOutTime(),db.getRealOutTime())){
             throw new Exception("补录离场时间，出场确认说明必填");
         }
+        if (t.getRealInTime()==null&&t.getRealOutTime()!=null){
+            throw new Exception("补录离场时间，请填写入场时间");
+        }
         if (db.getRealOutTime() == null && t.getRealOutTime() != null) {
             //补录放行记录，解绑扣费绑定
             tbDeductionBindService.autoUnbindCar(db.getCarNo());
@@ -223,21 +226,25 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
         String oldCarNo = db.getCarNo();
         String newCarNo = t.getCarNo();
         Date now = new Date();
-        db.setRealInTime(t.getRealInTime()).setColor(t.getColor())
-                .setRealOutTime(t.getRealOutTime()).setInImage(t.getInImage())
+        db.setRealInTime(t.getRealInTime())
+                .setColor(t.getColor())
+                .setRealOutTime(t.getRealOutTime())
+                .setInImage(t.getInImage())
                 .setOutImage(t.getOutImage())
                 .setCarSize(t.getCarSize())
-                .setDriverName(t.getDriverName()).setRemark(t.getRemark()).setOutRemark(t.getOutRemark())
-                .setDriverPhone(t.getDriverPhone()).setTimeUpdate(now);
+                .setRemark(t.getRemark())
+                .setOutRemark(t.getOutRemark())
+                .setTimeUpdate(now);
         if (t.getRealOutTime() != null && db.getPay() == 0) {
             db.setPay(1);
             if (!StrUtil.equals(db.getPayType(), TbBusinessCar.PayTypeEnum.FEE_TYPE.getType())) {
                 db.setPayType(TbBusinessCar.PayTypeEnum.HAS_PAY_TYPE.getType());
             }
         }
+
         //车牌没改
         if (StrUtil.equals(oldCarNo, newCarNo)) {
-            this.updateById(db);
+            tbBusinessCarMapper.updateRecord(db);
             return;
         }
         //改了车牌，看下新车牌是否被占用
@@ -250,7 +257,7 @@ public class TbBusinessCarService extends ServiceImpl<TbBusinessCarMapper, TbBus
             throw new Exception("车辆已存在");
         }
         db.setCarNo(newCarNo);
-        this.updateById(t);
+        tbBusinessCarMapper.updateRecord(t);
         List<TbBusiness> businessList = tbBusinessService.findOtherBusinessByCarId(t.getId());
         String carStr = StrUtil.sub(newCarNo, 0, 1);
         for (TbBusiness tbBusiness : businessList) {

sp-server/src/main/java/com/pj/project/tb_business_item/TbBusinessItemController.java

@@ -7,7 +7,6 @@ import com.pj.project.tb_costomer.TbCostomer;
 import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.so.SoMap;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

sp-server/src/main/java/com/pj/project/tb_costomer/TbCostomerService.java

@@ -13,7 +13,6 @@ import com.pj.project4sp.admin.SpAdminService;
 import com.pj.project4sp.role.SpRole;
 import com.pj.project4sp.role.SpRoleMapper;
 import com.pj.project4sp.role4permission.SpRolePermissionMapper;
-import com.pj.project4sp.role4permission.SpRolePermissionService;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

sp-server/src/main/java/com/pj/project/tb_deduction_bind/TbDeductionBind.java

@@ -2,7 +2,6 @@ package com.pj.project.tb_deduction_bind;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.pj.project.tb_costomer.TbCostomer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

sp-server/src/main/java/com/pj/project/tb_deduction_bind/TbDeductionBindService.java

@@ -1,6 +1,5 @@
 package com.pj.project.tb_deduction_bind;
 
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
@@ -11,16 +10,12 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.constants.UserTypeEnum;
 import com.pj.current.satoken.StpUserUtil;
-import com.pj.project.tb_account.AutomaticPay;
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
 import com.pj.project.tb_costomer.TbCostomer;
 import com.pj.project.tb_costomer.TbCostomerService;
-import com.pj.project.tb_deduction_record.TbDeductionRecord;
-import com.pj.project4sp.SP;
 import com.pj.utils.AesUtil;
 import com.pj.utils.sg.AjaxError;
-import com.pj.utils.sg.AjaxJson;
 import com.pj.utils.sg.NbUtil;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;

sp-server/src/main/java/com/pj/project/tb_deduction_record/TbDeductionRecord.java

@@ -2,7 +2,6 @@ package com.pj.project.tb_deduction_record;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import com.pj.project.tb_costomer.TbCostomer;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -2,9 +2,9 @@ package com.pj.project.tb_fee_details;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.date.DateUtil;
@@ -14,7 +14,6 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.util.ListUtils;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.alibaba.excel.write.metadata.style.WriteCellStyle;
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -57,11 +56,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Service: tb_fee_details -- 收费明细表
@@ -743,8 +737,14 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
 
     public void diaoDuConfirm(List<Long> ids) {
         SpAdmin admin = StpUserUtil.getAdmin();
-        SpRole role = spRoleMapper.getById(Long.valueOf(admin.getRoleId()));
-        if(!StrUtil.equals(TbFeeDetails.personEnum.FUHE.getDesc(), role.getName()) && !StrUtil.equals("admin", role.getType())){
+        AtomicBoolean hasPermission= new AtomicBoolean(false);
+        StrUtil.splitTrim(admin.getRoleId(),",").forEach(roleId->{
+            SpRole role = spRoleMapper.getById(Long.valueOf(roleId));
+            if(StrUtil.equals(TbFeeDetails.personEnum.FUHE.getDesc(), role.getName()) ||StrUtil.equals("admin", role.getType())){
+               hasPermission.set(true);
+            }
+        });
+        if (!hasPermission.get()){
             throw new BusinessException("无操作权限");
         }
         List<TbFeeDetails> detailsList = this.listByIds(ids);

sp-server/src/main/java/com/pj/project/tb_init_permission/TbInitPermissionService.java

@@ -3,8 +3,6 @@ package com.pj.project.tb_init_permission;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pj.project.tb_costomer.TbCostomer;
-import com.pj.project.tb_costomer.TbCostomerMapper;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

sp-server/src/main/java/com/pj/project/tb_invoice_order/TbInvoiceOrderService.java

@@ -2,9 +2,7 @@ package com.pj.project.tb_invoice_order;
 
 import java.io.File;
 import java.math.BigDecimal;
-import java.time.Month;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,7 +22,6 @@ import com.pj.project.tb_business.TbBusiness;
 import com.pj.project.tb_business.TbBusinessService;
 import com.pj.project.tb_business_car.TbBusinessCar;
 import com.pj.project.tb_business_car.TbBusinessCarService;
-import com.pj.project.tb_costomer.TbCostomer;
 import com.pj.project.tb_costomer.TbCostomerService;
 import com.pj.project.tb_fee_details.TbFeeDetails;
 import com.pj.project.tb_fee_details.TbFeeDetailsService;
@@ -42,12 +39,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Service: tb_invoice_order -- 开票订单表