实现用车审批或签功能

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcCarController.java

@@ -5,7 +5,9 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,6 +38,9 @@ public class CmcCarController extends BaseController
 {
     @Autowired
     private ICmcCarService cmcCarService;
+
+    @Autowired
+    private ISysUserService userService;
     /**
      * 查询cmc车辆信息列表
      */
@@ -65,7 +70,20 @@ public class CmcCarController extends BaseController
     @GetMapping(value = "/{carId}")
     public AjaxResult getInfo(@PathVariable("carId") Integer carId)
     {
-        return success(cmcCarService.selectCmcCarByCarId(carId));
+        JSONObject jsonObject = new JSONObject();
+        CmcCar cmcCar = cmcCarService.selectCmcCarByCarId(carId);
+        jsonObject.put("carId", cmcCar.getCarId());
+        jsonObject.put("licensePlate", cmcCar.getLicensePlate());
+        jsonObject.put("driver", userService.selectUserById(cmcCar.getDriver()).getNickName());
+        jsonObject.put("brand", cmcCar.getBrand());
+        jsonObject.put("series", cmcCar.getSeries());
+        jsonObject.put("cost", cmcCar.getCost());
+        jsonObject.put("acquisitionTime", cmcCar.getAcquisitionTime());
+        jsonObject.put("expectLife", cmcCar.getExpectLife());
+        jsonObject.put("expectKm", cmcCar.getExpectKm());
+        jsonObject.put("isRent", cmcCar.getIsRent());
+        jsonObject.put("dayCost", cmcCar.getDayCost());
+        return success(jsonObject);
     }
 
     /**

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarExpense.java

@@ -36,7 +36,7 @@ public class CmcCarExpense extends BaseEntity
     /** 发生日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "发生日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date occurrDate;
+    private Date occurDate;
 
     public void setCarExpenseId(String carExpenseId) 
     {
@@ -74,14 +74,14 @@ public class CmcCarExpense extends BaseEntity
     {
         return expense;
     }
-    public void setOccurrDate(Date occurrDate)
+    public void setOccurDate(Date occurDate)
     {
-        this.occurrDate = occurrDate;
+        this.occurDate = occurDate;
     }
 
-    public Date getOccurrDate()
+    public Date getOccurDate()
     {
-        return occurrDate;
+        return occurDate;
     }
 
     @Override
@@ -91,7 +91,7 @@ public class CmcCarExpense extends BaseEntity
             .append("carId", getCarId())
             .append("expenseType", getExpenseType())
             .append("expense", getExpense())
-            .append("occurrDate", getOccurrDate())
+            .append("occurDate", getOccurDate())
             .toString();
     }
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarExpenseMapper.xml

@@ -9,11 +9,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="carId"    column="car_id"    />
         <result property="expenseType"    column="expense_type"    />
         <result property="expense"    column="expense"    />
-        <result property="occurrDate"    column="occurr_date"    />
+        <result property="occurDate"    column="occur_date"    />
     </resultMap>
 
     <sql id="selectCmcCarExpenseVo">
-        select car_expense_id, car_id, expense_type, expense, occurr_date from cmc_car_expense
+        select car_expense_id, car_id, expense_type, expense, occur_date from cmc_car_expense
     </sql>
 
     <select id="selectCmcCarExpenseList" parameterType="CmcCarExpense" resultMap="CmcCarExpenseResult">
@@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carId != null "> and car_id = #{carId}</if>
             <if test="expenseType != null  and expenseType != ''"> and expense_type = #{expenseType}</if>
             <if test="expense != null "> and expense = #{expense}</if>
-            <if test="occurrDate != null "> and occurr_date = #{occurrDate}</if>
+            <if test="occurDate != null "> and occur_date = #{occurDate}</if>
         </where>
     </select>
     
@@ -38,14 +38,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carId != null">car_id,</if>
             <if test="expenseType != null">expense_type,</if>
             <if test="expense != null">expense,</if>
-            <if test="occurrDate != null">occurr_date,</if>
+            <if test="occurDate != null">occur_date,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="carExpenseId != null">#{carExpenseId},</if>
             <if test="carId != null">#{carId},</if>
             <if test="expenseType != null">#{expenseType},</if>
             <if test="expense != null">#{expense},</if>
-            <if test="occurrDate != null">#{occurrDate},</if>
+            <if test="occurDate != null">#{occurDate},</if>
          </trim>
     </insert>
 
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carId != null">car_id = #{carId},</if>
             <if test="expenseType != null">expense_type = #{expenseType},</if>
             <if test="expense != null">expense = #{expense},</if>
-            <if test="occurrDate != null">occurr_date = #{occurrDate},</if>
+            <if test="occurDate != null">occur_date = #{occurDate},</if>
         </trim>
         where car_expense_id = #{carExpenseId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcCarMapper.xml

@@ -16,10 +16,11 @@
         <result property="brand"    column="brand"    />
         <result property="isRent"    column="is_rent"    />
         <result property="dayCost"    column="day_cost"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectCmcCarVo">
-        select car_id, license_plate, driver, acquisition_time, cost, expect_life, expect_km, series, brand, is_rent, day_cost from cmc_car
+        select car_id, license_plate, driver, acquisition_time, cost, expect_life, expect_km, series, brand, is_rent, day_cost, remark from cmc_car
     </sql>
 
     <select id="selectCmcCarList" parameterType="CmcCar" resultMap="CmcCarResult">
@@ -35,6 +36,7 @@
             <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
             <if test="isRent != null  and isRent != ''"> and isRent = #{isRent}</if>
             <if test="dayCost != null  and dayCost != ''"> and day_cost = #{dayCost}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
         </where>
     </select>
 
@@ -56,6 +58,7 @@
             <if test="brand != null">brand,</if>
             <if test="isRent != null">is_rent,</if>
             <if test="dayCost != null">day_cost,</if>
+            <if test="remark != null">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="licensePlate != null">#{licensePlate},</if>
@@ -68,6 +71,7 @@
             <if test="brand != null">#{brand},</if>
             <if test="isRent != null">#{isRent},</if>
             <if test="dayCost != null">#{dayCost},</if>
+            <if test="remark != null">#{remark},</if>
         </trim>
     </insert>
 
@@ -84,6 +88,7 @@
             <if test="brand != null">brand = #{brand},</if>
             <if test="isRent != null">is_rent = #{isRent},</if>
             <if test="dayCost != null">day_cost = #{dayCost},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where car_id = #{carId}
     </update>

oa-back/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDriverList" resultMap="SysUserResult">
 		select u.user_id, u.nick_name
 		from sys_user u left join sys_user_post up on u.user_id = up.user_id
-		where up.post_id = 27
+		where up.post_id = 27 and u.status = '0'
 	</select>
 
 	<select id="selectDeptLeaderByUserId" parameterType="String" resultMap="SysUserResult">

oa-ui/src/views/flowable/form/carForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-12 09:46:54
+ * @LastEditTime: 2024-03-13 14:17:12
 -->
 <!--
  * @Author: wrh
@@ -326,7 +326,7 @@ export default {
           });
         })
       } else if (this.taskName == '分管审核' || this.taskName == '工会审核') {
-        this.$set(this.taskForm.variables, "approval", 16);
+        this.$set(this.taskForm.variables, "approvalList", [8,16]);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
           this.$emit('goBack')