111

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/controller/workOvertimeController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.workOvertime.controller;
 
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -8,11 +9,15 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.viewClockIn.entity.ViewClockIn;
 import org.jeecg.modules.workOvertime.entity.workOvertime;
 import org.jeecg.modules.workOvertime.service.IworkOvertimeService;
 import java.util.Date;
@@ -49,10 +54,23 @@ import io.swagger.annotations.ApiOperation;
 public class workOvertimeController extends JeecgController<workOvertime, IworkOvertimeService> {
 	@Autowired
 	private IworkOvertimeService workOvertimeService;
-	
-	/**
+
+	 /**
+	  * 获取加班信息
+	  * @param jsonObject
+	  * @return
+	  * @throws ParseException
+	  */
+	 @RequestMapping(value = "/getJiaBan", method = RequestMethod.PUT)
+	 public List<workOvertime> getJiaBan(@RequestBody JSONObject jsonObject) throws ParseException {
+		 String viewDate = jsonObject.get("viewDate").toString();
+		 String username = jsonObject.get("username").toString();
+		 List<workOvertime> list = workOvertimeService.getJiaBan(username,viewDate);
+		 return list;
+	 }
+
+	 /**
 	 * 分页列表查询
-	 *
 	 * @param workOvertime
 	 * @param pageNo
 	 * @param pageSize

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/entity/workOvertime.java

@@ -40,6 +40,8 @@ public class workOvertime {
 	@Excel(name = "审批编号", width = 15)
     @ApiModelProperty(value = "审批编号")
 	private String code;
+
+	private String setInfo;
 	/**提交时间*/
 	@Excel(name = "提交时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/mapper/workOvertimeMapper.java

@@ -20,6 +20,14 @@ public interface workOvertimeMapper extends BaseMapper<workOvertime> {
 
     List<workOvertime>getworkList(Page<workOvertime> page,@Param("name")String name,@Param("code")String code,@Param("startDate")String startDate,@Param("endDate")String endDate);
 
+    /**
+     * 根据时间和人员编码获取加班信息
+     * @param person
+     * @param getJiaBan
+     * @return
+     */
+    List<workOvertime>getJiaBan(@Param("person")String person,@Param("viewDate")String viewDate);
+
     /**
      * 删除无效打卡信息
      * @param userId

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/mapper/xml/workOvertimeMapper.xml

@@ -35,4 +35,8 @@ order by a.commit_date desc
         where user_id = #{userId} and DATE_FORMAT(user_date,'%Y-%m-%d') = #{viewDate}
         and exception_type = '未打卡'
     </update>
+
+    <select id="getJiaBan" resultType="org.jeecg.modules.workOvertime.entity.workOvertime">
+        select * from bd_work_overtime where person=#{person} and date_format(begin_date, '%Y-%m-%d' ) = #{viewDate}
+    </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/service/IworkOvertimeService.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.workOvertime.entity.workOvertime;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -18,4 +19,6 @@ public interface IworkOvertimeService extends IService<workOvertime> {
     Boolean workSave(workOvertime work);
 
     IPage<workOvertime> getWork(Page<workOvertime> page, String name, String code,String startDate,String endDate);
+
+    public List<workOvertime> getJiaBan(String person, String viewDate);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/workOvertime/service/impl/workOvertimeServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.workOvertime.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.workOvertime.entity.workOvertime;
 import org.jeecg.modules.workOvertime.mapper.workOvertimeMapper;
@@ -11,6 +12,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 加班表
  * @Author: jeecg-boot
@@ -39,4 +42,8 @@ public class workOvertimeServiceImpl extends ServiceImpl<workOvertimeMapper, wor
     public IPage<workOvertime> getWork(Page<workOvertime> page, String name, String code,String startDate,String endDate) {
         return page.setRecords(works.getworkList(page,name,code,startDate, endDate));
     }
+
+    public List<workOvertime> getJiaBan(String person, String viewDate) {
+        return works.getJiaBan(person,viewDate);
+    }
 }