Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseSheetController.java

@@ -53,7 +53,7 @@ public class ExpenseSheetController {
     }
 
     @RequestMapping("/list")
-    public HttpRespMsg list(ExpenseSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
+    public HttpRespMsg list(ExpenseSheet sheet,String startDate, String endDate, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
         String token = request.getHeader("TOKEN");
         User user = userMapper.selectById(token);
         if (user.getRole() == 0) {
@@ -61,7 +61,7 @@ public class ExpenseSheetController {
             sheet.setOwnerId(user.getId());
         }
         sheet.setCompanyId(user.getCompanyId());
-        return expenseSheetService.queryList(sheet, pageIndex, pageSize);
+        return expenseSheetService.queryList(sheet, startDate, endDate, pageIndex, pageSize);
     }
 
     @RequestMapping("/getDetail")

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ExpenseSheetService.java

@@ -19,7 +19,7 @@ public interface ExpenseSheetService extends IService<ExpenseSheet> {
 
     HttpRespMsg delete(Integer id);
 
-    HttpRespMsg queryList(ExpenseSheet sheet,  Integer pageIndex,  Integer pageSize);
+    HttpRespMsg queryList(ExpenseSheet sheet, String startDate, String endDate, Integer pageIndex,  Integer pageSize);
 
     HttpRespMsg getNextCode(String userId);
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java

@@ -252,22 +252,22 @@ public class DingDingServiceImpl implements DingDingService {
         }
     }
 
-    private void getUserDetailInfo(User user, String accessToken) throws ApiException {
-        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/get");
-        OapiV2UserGetRequest req = new OapiV2UserGetRequest();
-        req.setUserid(user.getDingdingUserid());
-        req.setLanguage("zh_CN");
-        OapiV2UserGetResponse rsp = null;
-        rsp = client.execute(req, accessToken);
-        String body = rsp.getBody();
-        JSONObject json = JSONObject.parseObject(body);
-        JSONObject result = json.getJSONObject("result");
-        String name = result.getString("name");
-        String unionId = result.getString("unionid");
-        user.setDingdingUnionid(unionId);
-        user.setName(name);
-        userMapper.updateById(user);
-    }
+//    private void getUserDetailInfo(User user, String accessToken) throws ApiException {
+//        DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/topapi/v2/user/get");
+//        OapiV2UserGetRequest req = new OapiV2UserGetRequest();
+//        req.setUserid(user.getDingdingUserid());
+//        req.setLanguage("zh_CN");
+//        OapiV2UserGetResponse rsp = null;
+//        rsp = client.execute(req, accessToken);
+//        String body = rsp.getBody();
+//        JSONObject json = JSONObject.parseObject(body);
+//        JSONObject result = json.getJSONObject("result");
+//        String name = result.getString("name");
+//        String unionId = result.getString("unionid");
+//        user.setDingdingUnionid(unionId);
+//        user.setName(name);
+//        userMapper.updateById(user);
+//    }
 
 
     //获取授权企业的accessToken

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java

@@ -103,7 +103,7 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
     }
 
     @Override
-    public HttpRespMsg queryList(ExpenseSheet sheet, Integer pageIndex, Integer pageSize) {
+    public HttpRespMsg queryList(ExpenseSheet sheet, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
         QueryWrapper<ExpenseSheet> queryWrapper = new QueryWrapper<ExpenseSheet>();
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         queryWrapper.eq("company_id", sheet.getCompanyId()).orderByDesc("id");
@@ -121,8 +121,8 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
         if (sheet.getType() != null) {
             queryWrapper.eq("type", sheet.getType());
         }
-        if (sheet.getCreateDate() != null) {
-            queryWrapper.eq("create_date", sheet.getCreateDate());
+        if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
+            queryWrapper.between("create_date", startDate, endDate);
         }
         IPage<ExpenseSheet> listIPager = expenseSheetMapper.selectPage(new Page<>(pageIndex, pageSize),
                 queryWrapper);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -639,7 +639,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                         .setCost(cost)
                         .setSalaryType(salaryType)
                         .setDepartmentId(departmentId)
-                        .setDepartmentCascade(convertDepartmentIdToCascade(departmentId)));
+                        .setDepartmentCascade(departmentId==null?null:convertDepartmentIdToCascade(departmentId)));
             }
             //最后删掉这个文件
 //            if (!file.delete()) {