车辆设备状态统计

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

@@ -5,6 +5,8 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -73,6 +75,31 @@ public class CmcCarController extends BaseController
         return success(cmcCarService.selectCmcCarByCarId(carId));
     }
 
+    /**
+     * 获取设备统计信息
+     */
+    @GetMapping(value = "/statistic")
+    public AjaxResult getCarStatistic()
+    {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray statusArray = new JSONArray();
+        JSONObject statusObject = new JSONObject();
+        CmcCar cmcCar = new CmcCar();
+        cmcCar.setStatus("0");
+        statusObject.put("被领用", cmcCarService.selectCmcCarList(cmcCar).size());
+        cmcCar.setStatus("1");
+        statusObject.put("可领用", cmcCarService.selectCmcCarList(cmcCar).size());
+        cmcCar.setStatus("2");
+        statusObject.put("维修中", cmcCarService.selectCmcCarList(cmcCar).size());
+        cmcCar.setStatus("3");
+        statusObject.put("已停用", cmcCarService.selectCmcCarList(cmcCar).size());
+        cmcCar.setStatus("4");
+        statusObject.put("已报废", cmcCarService.selectCmcCarList(cmcCar).size());
+        statusArray.add(statusObject);
+        jsonObject.put("",statusArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc车辆信息
      */

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

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.utils.DateUtils;
 import liquibase.pro.packaged.C;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +83,31 @@ public class CmcDeviceController extends BaseController
         return success(cmcDeviceService.selectCmcDeviceByDeviceId(deviceId));
     }
 
+    /**
+     * 获取设备统计信息
+     */
+    @GetMapping(value = "/statistic")
+    public AjaxResult getDeviceStatistic()
+    {
+        JSONObject jsonObject = new JSONObject();
+        JSONArray statusArray = new JSONArray();
+        JSONObject statusObject = new JSONObject();
+        CmcDevice cmcDevice = new CmcDevice();
+        cmcDevice.setStatus("0");
+        statusObject.put("被领用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        cmcDevice.setStatus("1");
+        statusObject.put("可领用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        cmcDevice.setStatus("2");
+        statusObject.put("维修中", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        cmcDevice.setStatus("3");
+        statusObject.put("已停用", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        cmcDevice.setStatus("4");
+        statusObject.put("已报废", cmcDeviceService.selectCmcDeviceList(cmcDevice).size());
+        statusArray.add(statusObject);
+        jsonObject.put("",statusArray);
+        return success(jsonObject);
+    }
+
     /**
      * 新增cmc设备信息
      */

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcMaterial;
+import com.ruoyi.oa.service.ICmcMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,9 @@ public class CmcMaterialBuyController extends BaseController
     @Autowired
     private ICmcMaterialBuyService cmcMaterialBuyService;
 
+    @Autowired
+    private ICmcMaterialService cmcMaterialService;
+
     /**
      * 查询cmc耗材购买列表
      */
@@ -72,6 +78,9 @@ public class CmcMaterialBuyController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcMaterialBuy cmcMaterialBuy)
     {
+        CmcMaterial cmcMaterial = cmcMaterialService.selectCmcMaterialByMaterialId(cmcMaterialBuy.getMaterialId());
+        cmcMaterial.setRemain(cmcMaterial.getRemain() + cmcMaterialBuy.getTotalNum());
+        cmcMaterialService.updateCmcMaterial(cmcMaterial);
         return toAjax(cmcMaterialBuyService.insertCmcMaterialBuy(cmcMaterialBuy));
     }
 

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

@@ -2,6 +2,9 @@ package com.ruoyi.web.controller.oa;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.oa.domain.CmcMaterial;
+import com.ruoyi.oa.service.ICmcMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +36,9 @@ public class CmcMaterialGiveController extends BaseController
     @Autowired
     private ICmcMaterialGiveService cmcMaterialGiveService;
 
+    @Autowired
+    private ICmcMaterialService cmcMaterialService;
+
     /**
      * 查询cmc耗材发放列表
      */
@@ -72,6 +78,9 @@ public class CmcMaterialGiveController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcMaterialGive cmcMaterialGive)
     {
+        CmcMaterial cmcMaterial = cmcMaterialService.selectCmcMaterialByMaterialId(cmcMaterialGive.getMaterialId());
+        cmcMaterial.setRemain(cmcMaterial.getRemain() - cmcMaterialGive.getGiveNum());
+        cmcMaterialService.updateCmcMaterial(cmcMaterial);
         return toAjax(cmcMaterialGiveService.insertCmcMaterialGive(cmcMaterialGive));
     }
 

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

@@ -79,8 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcArchiveList" parameterType="CmcArchive" resultMap="CmcArchiveResult">
         <include refid="selectCmcArchiveVo"/>
         <where>
-            (case YEAR(#{archiveTime}) when 2000 then a.archive_time is not null
-            end)
+
             <if test="projectId != null  and projectId != ''"> and a.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
             <if test="projectLeader != null  and projectLeader != ''"> and a.project_leader = #{projectLeader}</if>
@@ -94,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualityTime != null "> and a.quality_time = #{qualityTime}</if>
             <if test="produceTime != null "> and a.produce_time = #{produceTime}</if>
             <if test="deptTime != null "> and a.dept_time = #{deptTime}</if>
-<!--            <if test="archiveTime != null "> and YEAR(a.archive_time) = YEAR(#{archiveTime})</if>-->
+            <if test="archiveTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', archiveTime) == '2000' "> and a.archive_time is not null</if>
             <if test="produceComment != null  and produceComment != ''"> and a.produce_comment = #{produceComment}</if>
             <if test="qualityComment != null  and qualityComment != ''"> and a.quality_comment = #{qualityComment}</if>
             <if test="deptComment != null  and deptComment != ''"> and a.dept_comment = #{deptComment}</if>

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

@@ -113,8 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCmcSettleList" parameterType="CmcSettle" resultMap="CmcSettleResult">
         <include refid="selectCmcSettleVo"/>
         <where>
-            (case YEAR(#{gmTime}) when 2000 then s.gm_time is not null
-            end)
+
             <if test="settleId != null  and settleId != ''"> and s.settle_id = #{settleId}</if>
             <if test="projectId != null"> and s.project_id = #{projectId}</if>
             <if test="projectNumber != null  and projectNumber != ''"> and p.project_number like concat('%', #{projectNumber}, '%')</if>
@@ -138,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="managerTime != null "> and s.manager_time = #{managerTime}</if>
             <if test="managerComment != null  and managerComment != ''"> and s.manager_comment = #{managerComment}</if>
             <if test="gmUserId != null "> and s.gm_user_id = #{gmUserId}</if>
-<!--            <if test="gmTime != null "> and YEAR(s.gm_time) = YEAR(#{gmTime})</if>-->
+            <if test="gmTime != null and @com.ruoyi.common.utils.DateUtils@parseDateToStr('yyyy', gmTime) == '2000' "> and s.gm_time is not null</if>
             <if test="gmComment != null  and gmComment != ''"> and s.gm_comment = #{gmComment}</if>
         </where>
         order by s.report_time desc