1、添加记工模块功能

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/employController/CommonApiController.java

@@ -8,9 +8,11 @@ import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiService.CommonApiService;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.employBillInfo.entity.EmployBillInfo;
 import org.jeecg.modules.employFeedback.entity.EmployFeedback;
 import org.jeecg.modules.employNotebook.entity.EmployNotebook;
 import org.jeecg.modules.employVipUser.entity.EmployVipUser;
+import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo;
 import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -85,6 +87,54 @@ public class CommonApiController {
         return commonApiService.queryNotebookList(token, type, status, pageBean);
     }
 
+    @ApiOperation(value="记工记账-项目记账", notes="记工记账-项目记账")
+    @RequestMapping(value = "/addBillInfo", method = {RequestMethod.POST})
+    public Result<?> addBillInfo(@RequestHeader("X-Access-Token") String token, EmployBillInfo employBillInfo){
+        String message = null;
+        //参数校验
+        if(null == employBillInfo.getNotebookId()){
+            message = "账本id为空，请输入正确的账本id";
+        }else if(null == employBillInfo.getAmount()){
+            message = "记账金额为空，请输入金额";
+        }else if(null == employBillInfo.getBillDate()){
+            message = "记账日期为空，请输入记账日期";
+        }else if(null == employBillInfo.getType()){
+            message = "记账类型为空，请输入记账类型";
+        }
+        //参数输入有误，返回错误信息
+        if(null != message){
+            return Result.OK(message);
+        }
+
+        //业务处理
+        return commonApiService.addBillInfo(token, employBillInfo);
+    }
+
+    @ApiOperation(value="记工记账-项目记工", notes="记工记账-项目记工")
+    @RequestMapping(value = "/addWorkInfo", method = {RequestMethod.POST})
+    public Result<?> addWorkInfo(@RequestHeader("X-Access-Token") String token, EmployWorkInfo employWorkInfo){
+        String message = null;
+        //参数校验
+        if(null == employWorkInfo.getNotebookId()){
+            message = "账本id为空，请输入正确的账本id";
+        }else if(null == employWorkInfo.getType()){
+            message = "工作类型为空，请输入工作类型";
+        }else if(null == employWorkInfo.getOvertime()){
+            message = "加班时长为空，请输入加班时长";
+        }else if(null == employWorkInfo.getWorkDate()){
+            message = "记工日期为空，请输入记工日期";
+        }
+
+        //参数输入有误，返回错误信息
+        if(null != message){
+            return Result.OK(message);
+        }
+
+        //业务处理
+        return commonApiService.addWorkInfo(token, employWorkInfo);
+    }
+
+
     /***************会员中心***************/
     //会员中心-正式积分||临时积分
     @ApiOperation(value="会员中心-正式积分||临时积分", notes="正式积分||临时积分||当前积分")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CommonApiService.java

@@ -4,9 +4,11 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.employAhthenticationCompany.entity.EmployAhthenticationCompany;
 import org.jeecg.modules.employAuthenticationPerson.entity.EmployAuthenticationPerson;
+import org.jeecg.modules.employBillInfo.entity.EmployBillInfo;
 import org.jeecg.modules.employFeedback.entity.EmployFeedback;
 import org.jeecg.modules.employNotebook.entity.EmployNotebook;
 import org.jeecg.modules.employVipUser.entity.EmployVipUser;
+import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo;
 
 public interface CommonApiService {
 
@@ -33,14 +35,14 @@ public interface CommonApiService {
     //个人记工-技工问题
     public Result<?> addQuestion(String toke, EmployFeedback employFeedback);
 
-    //个人记工-在建项目
+    //个人记工-在建项目/结束项目
     public Result<?> queryNotebookList(String token, String type, String status, PageBean pageBean);
 
-//    //个人记工-在建项目
-//    public Result<?> queryStrartJobList(PageBean pageBean);
-//
-//    //个人记工-结束项目
-//    public Result<?> queryEndJobList(PageBean pageBean);
+    //个人记工-项目记账
+    public Result<?> addBillInfo(String token, EmployBillInfo employBillInfo);
+
+    //个人记工-项目记工
+    public Result<?> addWorkInfo(String token, EmployWorkInfo employWorkInfo);
 
     /***************会员中心***************/
     //会员中心-正式积分||临时积分

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CommonApiServiceImpl.java

@@ -34,6 +34,8 @@ import org.jeecg.modules.employVipType.entity.EmployVipType;
 import org.jeecg.modules.employVipType.service.IEmployVipTypeService;
 import org.jeecg.modules.employVipUser.entity.EmployVipUser;
 import org.jeecg.modules.employVipUser.service.IEmployVipUserService;
+import org.jeecg.modules.employWorkInfo.entity.EmployWorkInfo;
+import org.jeecg.modules.employWorkInfo.service.IEmployWorkInfoService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.stereotype.Service;
@@ -77,6 +79,10 @@ public class CommonApiServiceImpl implements CommonApiService {
     @Resource
     private IEmployBillInfoService employBillInfoService;
 
+    //记工信息表
+    @Resource
+    private IEmployWorkInfoService employWorkInfoService;
+
     //意见反馈表
     @Resource
     private IEmployFeedbackService employFeedbackService;
@@ -279,6 +285,41 @@ public class CommonApiServiceImpl implements CommonApiService {
         return Result.OK("在建/结束项目", pageList);
     }
 
+    //记工记账-项目记账
+    @Override
+    public Result<?> addBillInfo(String token, EmployBillInfo employBillInfo) {
+        String message = "";
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        boolean result = employBillInfoService.save(employBillInfo);
+
+        if(result){
+            message = "项目记账添加成功！";
+        }else {
+            message = "项目记账添加失败！";
+        }
+
+        return Result.OK(message);
+    }
+    //记工记账-项目记工
+    @Override
+    public Result<?> addWorkInfo(String token, EmployWorkInfo employWorkInfo) {
+        String message = "";
+        //权限验证
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        boolean result = employWorkInfoService.save(employWorkInfo);
+
+        if(result){
+            message = "项目记工添加成功！";
+        }else {
+            message = "项目记工添加失败！";
+        }
+
+        return Result.OK(message);
+    }
+
     /***************会员中心***************/
     //会员中心-正式积分||临时积分
     @Override