首页今日待保养任务数和待保养任务总数

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/controller/CmmsUpkeepController.java

@@ -10,8 +10,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeep;
 import org.jeecg.modules.cmmsUpkeep.entity.CmmsUpkeepDto;
@@ -308,7 +311,7 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	 }
 
 	 /**
-	  * 查询待办的保养工单数  status： 0，1
+	  * 查询待办的保养工单数  status： 0，1 需要我做的待保养任务总数，不包括我下发的待保养任务
 	  *
 	  * @param
 	  * @return 待办保养工单数
@@ -317,7 +320,23 @@ public class CmmsUpkeepController extends JeecgController<CmmsUpkeep, ICmmsUpkee
 	 @ApiOperation(value="保养工单-查询待办的保养工单数", notes="保养工单-查询待办的保养工单数")
 	 @GetMapping(value = "/getMyChargeNum")
 	 public Result<Integer> getMyChargeNum() {
-		 return Result.OK(cmmsUpkeepService.getMyChargeNum());
+		 LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 String chargeruser = user.getId();
+		 return Result.OK(cmmsUpkeepService.getMyChargeNum(chargeruser));
+	 }
+	 /**
+	  * 查询今日待办的保养工单数  status： 0，1  今日刚创建的待保养任务数
+	  *
+	  * @param
+	  * @return 待办保养工单数
+	  */
+	 //@AutoLog(value = "保养工单-查询今日待办的保养工单数")
+	 @ApiOperation(value="保养工单-查询今日待办的保养工单数", notes="保养工单-查询今日待办的保养工单数")
+	 @GetMapping(value = "/getMyChargeNumDay")
+	 public Result<Integer> getMyChargeNumDay() {
+		 LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 String chargeruser = user.getId();
+		 return Result.OK(cmmsUpkeepService.getMyChargeNumDay(chargeruser));
 	 }
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/CmmsUpkeepMapper.java

@@ -63,7 +63,15 @@ public interface CmmsUpkeepMapper extends BaseMapper<CmmsUpkeep> {
      * @param
      * @return 待办保养工单数
      */
-    public int getMyChargeNum();
+    public int getMyChargeNum(String chargeruser);
+
+    /**
+     * 查询今日待办的保养工单数  status： 0，1   今日刚创建的待保养任务数
+     *
+     * @param
+     * @return 待办保养工单数
+     */
+    public int getMyChargeNumDay(String chargeruser);
 
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/mapper/xml/CmmsUpkeepMapper.xml

@@ -108,7 +108,13 @@
     <!-- 查询待办的保养任务数 -->
     <select id="getMyChargeNum" resultType="int">
         select count(*) from cmms_upkeep
-        where status in ("0", "1")
+        where status in ("0", "1") and chargeruser = #{chargeruser}
+    </select>
+
+    <!-- 查询待办的保养任务数 -->
+    <select id="getMyChargeNumDay" resultType="int">
+        select count(*) from cmms_upkeep
+        where status in ("0", "1") and chargeruser = #{chargeruser} and DATE(create_time) = CURDATE()
     </select>
 
 

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/ICmmsUpkeepService.java

@@ -100,11 +100,19 @@ public interface ICmmsUpkeepService extends IService<CmmsUpkeep> {
     public List<CmmsUpkeepDto> selectEquipUpkeepDetailByEqid(Page<CmmsUpkeepDto> page, String equipmentid);
 
     /**
-     * 查询待办的保养工单数  status： 0，1
+     * 查询待办的保养工单数  status： 0，1 需要我做的待保养任务总数，不包括我下发的待保养任务
      *
      * @param
      * @return 待办保养工单数
      */
-    public int getMyChargeNum();
+    public int getMyChargeNum(String chargeruser);
+
+    /**
+     * 查询待办的保养工单数  status： 0，1 今日刚创建的待保养任务数
+     *
+     * @param
+     * @return 待办保养工单数
+     */
+    public int getMyChargeNumDay(String chargeruser);
 
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeep/service/impl/CmmsUpkeepServiceImpl.java

@@ -297,13 +297,22 @@ public class CmmsUpkeepServiceImpl extends ServiceImpl<CmmsUpkeepMapper, CmmsUpk
     }
 
     /**
-     * 查询待办的保养工单数  status： 0，1
+     * 查询待办的保养工单数  status： 0，1  需要我做的待保养任务总数，不包括我下发的待保养任务
      *
      * @param
      * @return 待办保养工单数
      */
-    public int getMyChargeNum(){
-        return cmmsUpkeepMapper.getMyChargeNum();
+    public int getMyChargeNum(String chargeruser){
+        return cmmsUpkeepMapper.getMyChargeNum(chargeruser);
+    }
+    /**
+     * 查询待办的保养工单数  status： 0，1 今日刚创建的待保养任务数
+     *
+     * @param
+     * @return 待办保养工单数
+     */
+    public int getMyChargeNumDay(String chargeruser){
+        return cmmsUpkeepMapper.getMyChargeNumDay(chargeruser);
     }
 
 }