八爪鱼后台接口

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-31
- */
-@RestController
-@RequestMapping("/alert-time")
-public class AlertTimeController {
-
-}
-

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

@@ -1,128 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.AuditWorkflowSetting;
-import com.management.platform.entity.AuditWorkflowSetting;
-import com.management.platform.entity.Department;
-import com.management.platform.entity.Report;
-import com.management.platform.mapper.*;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-28
- */
-@RestController
-@RequestMapping("/audit-workflow-setting")
-public class AuditWorkflowSettingController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    AuditWorkflowSettingMapper auditWorkflowSettingMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    DepartmentMapper departmentMapper;
-    @Resource
-    ReportMapper reportMapper;
-
-
-    @RequestMapping("/add")
-    public HttpRespMsg add(String json, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        auditWorkflowSettingMapper.delete(new QueryWrapper<AuditWorkflowSetting>().eq("dept_id", deptId));
-        JSONArray array = JSONArray.parseArray(json);
-
-        if (array.size() == 1 && array.getJSONObject(0).getInteger("auditorType") == 0) {
-            //只有一个项目负责人审核，不保存
-        } else {
-            //检查是否有重复的部门
-            List<Integer> auditDeptIds = new ArrayList<>();
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowSetting.class);
-                if (auditWorkflowTimeSetting.getAuditDeptId() != null) {
-                    if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("保存失败： 部门["+auditWorkflowTimeSetting.getAuditDeptName()+"]存在重复");
-                        return msg;
-                    } else {
-                        auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());
-                    }
-                }
-            }
-
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowSetting.class);
-                auditWorkflowTimeSetting.setCompanyId(companyId);
-                auditWorkflowTimeSetting.setSeq(i+1);
-                if (i == array.size() -1) {
-                    auditWorkflowTimeSetting.setIsFinal(1);
-                } else {
-                    auditWorkflowTimeSetting.setIsFinal(0);
-                }
-                auditWorkflowTimeSetting.setDeptId(deptId);
-                auditWorkflowSettingMapper.insert(auditWorkflowTimeSetting);
-            }
-        }
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/checkNodeInUse")
-    public HttpRespMsg checkNodeInUse(String auditDeptId, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        HttpRespMsg msg = new HttpRespMsg();
-        List<AuditWorkflowSetting> targetNode = auditWorkflowSettingMapper.selectList(new QueryWrapper<AuditWorkflowSetting>().eq("dept_id", deptId).eq("audit_dept_id", auditDeptId));
-        if (targetNode.size() > 0) {
-            //要删除的部门节点是存在的，需要检测是否有待审核的走到这个流程点了
-            long num = reportMapper.selectCount(new QueryWrapper<Report>().eq("state", 0).eq("is_dept_audit", 1).eq("audit_deptid", auditDeptId));
-            if (num > 0) {
-                msg.setError("当前部门存在待审核报告，无法操作!");
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        List<AuditWorkflowSetting> auditWorkflowTimeSettings = auditWorkflowSettingMapper.selectList(new QueryWrapper<AuditWorkflowSetting>().eq("dept_id", deptId).orderByAsc("seq"));
-        HttpRespMsg msg = new HttpRespMsg();
-        if (auditWorkflowTimeSettings.size() == 0) {
-            int seq = 1;
-            //未独立设置，获取默认的设置,默认直接就是项目负责人审批
-            Department dept = departmentMapper.selectById(deptId);
-            AuditWorkflowSetting setting = new AuditWorkflowSetting();
-            setting.setSeq(seq);
-            setting.setCompanyId(companyId);
-            setting.setDeptId(dept.getDepartmentId());
-            setting.setIsFinal(1);
-            setting.setAuditorType(0);
-            auditWorkflowTimeSettings.add(setting);
-        }
-        msg.data = auditWorkflowTimeSettings;
-        return msg;
-    }
-
-}
-

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

@@ -1,141 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.AuditWorkflowTimeSetting;
-import com.management.platform.entity.Department;
-import com.management.platform.entity.Report;
-import com.management.platform.mapper.AuditWorkflowTimeSettingMapper;
-import com.management.platform.mapper.DepartmentMapper;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-07-25
- */
-@RestController
-@RequestMapping("/audit-workflow-time-setting")
-public class AuditWorkflowTimeSettingController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    DepartmentMapper departmentMapper;
-    @Resource
-    ReportMapper reportMapper;
-
-
-    @RequestMapping("/add")
-    public HttpRespMsg add(String json, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        auditWorkflowTimeSettingMapper.delete(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId));
-        JSONArray array = JSONArray.parseArray(json);
-
-        if (array.size() == 1 && array.getJSONObject(0).getInteger("isDeptAudit") == 0) {
-            //只有一个项目负责人审核，不保存
-        } else {
-            //检查是否有重复的部门
-            List<Integer> auditDeptIds = new ArrayList<>();
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
-                if (auditDeptIds.contains(auditWorkflowTimeSetting.getAuditDeptId())) {
-                    HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError("保存失败： 部门["+auditWorkflowTimeSetting.getAuditDeptName()+"]存在重复");
-                    return msg;
-                } else {
-                    auditDeptIds.add(auditWorkflowTimeSetting.getAuditDeptId());
-                }
-            }
-
-            for (int i=0;i<array.size(); i++) {
-                JSONObject obj = array.getJSONObject(i);
-                AuditWorkflowTimeSetting auditWorkflowTimeSetting = JSONObject.toJavaObject(obj, AuditWorkflowTimeSetting.class);
-                auditWorkflowTimeSetting.setCompanyId(companyId);
-                auditWorkflowTimeSetting.setSeq(i+1);
-                if (i == array.size() -1) {
-                    auditWorkflowTimeSetting.setIsFinal(1);
-                } else {
-                    auditWorkflowTimeSetting.setIsFinal(0);
-                }
-                auditWorkflowTimeSetting.setDeptId(deptId);
-                auditWorkflowTimeSettingMapper.insert(auditWorkflowTimeSetting);
-            }
-        }
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/checkNodeInUse")
-    public HttpRespMsg checkNodeInUse(String auditDeptId, Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        HttpRespMsg msg = new HttpRespMsg();
-        List<AuditWorkflowTimeSetting> targetNode = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).eq("audit_dept_id", auditDeptId));
-        if (targetNode.size() > 0) {
-            //要删除的部门节点是存在的，需要检测是否有待审核的走到这个流程点了
-            long num = reportMapper.selectCount(new QueryWrapper<Report>().eq("state", 0).eq("is_dept_audit", 1).eq("audit_deptid", auditDeptId));
-            if (num > 0) {
-                msg.setError("当前部门存在待审核报告，无法操作!");
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer deptId) {
-        String token = request.getHeader("TOKEN");
-        Integer companyId = userMapper.selectById(token).getCompanyId();
-        List<AuditWorkflowTimeSetting> auditWorkflowTimeSettings = auditWorkflowTimeSettingMapper.selectList(new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", deptId).orderByAsc("seq"));
-        HttpRespMsg msg = new HttpRespMsg();
-        if (auditWorkflowTimeSettings.size() == 0) {
-            int seq = 1;
-            //未独立设置，获取默认的设置,默认直接就是项目负责人审批
-            Department dept = departmentMapper.selectById(deptId);
-            AuditWorkflowTimeSetting setting = new AuditWorkflowTimeSetting();
-            setting.setSeq(seq);
-            setting.setCompanyId(companyId);
-            setting.setDeptId(dept.getDepartmentId());
-            setting.setIsFinal(1);
-            setting.setIsDeptAudit(0);
-            auditWorkflowTimeSettings.add(setting);
-//            while (dept.getSuperiorId() != null && dept.getSuperiorId() > 0) {
-//                seq++;
-//                dept = departmentMapper.selectById(dept.getSuperiorId());
-//                setting = new AuditWorkflowTimeSetting();
-//                setting.setCompanyId(companyId);
-//                setting.setDeptId(dept.getDepartmentId());
-//                setting.setSeq(seq);
-//                setting.setAuditDeptId(dept.getDepartmentId());
-//                setting.setAuditDeptName(dept.getDepartmentName());
-//                auditWorkflowTimeSettings.add(setting);
-//            }
-
-        }
-        msg.data = auditWorkflowTimeSettings;
-        return msg;
-    }
-
-
-}
-

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

@@ -1,155 +0,0 @@
-package com.management.platform.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Company;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.SysConfig;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.UserVO;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.mapper.SysConfigMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.UserAgentUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.*;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.view.RedirectView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Controller
-public class AuthRedirectController {
-    @Resource
-    HttpServletRequest request;
-    @Value("${suitId}")
-    private String suitId;
-    @Value("${suitSecret}")
-    private String suitSecret;
-    @Value("${token}")
-    private String token;
-    @Value("${encodingAesKey}")
-    private String encodingAesKey;
-    @Value("${corpId}")
-    private String corpId;
-
-    @Resource
-    SysConfigMapper sysConfigMapper;
-    @Autowired
-    RestTemplate restTemplate;
-    @Resource
-    UserMapper userMapper;
-
-    @RequestMapping("/corpWXAuth")
-    public ModelAndView auth(String code, int state) {
-        Map<String,Object> reqParam = new HashMap<String,Object>(16);
-        String userAgent = request.getHeader("User-Agent");
-        //获取设备类型
-        String deviceType = UserAgentUtils.getDeviceType(userAgent);
-        if ("MOBILE".equals(deviceType)) {
-            state = 0;
-        } else {
-            state = 1;
-        }
-        System.out.println("code="+code);
-        String url = WeiXinCorpController.GET_CORP_USERINFO_URL.replace("SUITE_ACCESS_TOKEN", getSuiteAccessToken()).replace("CODE", code);
-        String forObject = this.restTemplate.getForObject(url, String.class);
-        JSONObject obj = JSONObject.parseObject(forObject);
-        String wxUserId = obj.getString("UserId");
-        List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("corpwx_userid", wxUserId).eq("is_active", 1));
-        if (userList.size() > 0) {
-            //该用户已存在
-            User curUser = userList.get(0);
-            reqParam.put("userId", curUser.getId());
-        }
-        reqParam.put("hasTriedAutoLogin", 1);
-        String redirecUrl = null;
-        if (state == 0) {
-            redirecUrl = "http://mobworktime.ttkuaiban.com";
-        } else if (state == 1) {
-            redirecUrl = "http://worktime.ttkuaiban.com";
-        }
-        ModelAndView modelAndView = new ModelAndView(
-                new RedirectView(redirecUrl), reqParam);
-
-        return modelAndView;
-    }
-
-    @GetMapping("testClient")
-    @ResponseBody
-    public String test(HttpServletRequest request) {
-        String userAgent = request.getHeader("user-agent");
-        System.out.println("agent: " + userAgent);
-        if (userAgent.toLowerCase().contains("micromessenger")) {
-            System.out.println("===微信平台");
-        } else if (userAgent.toLowerCase().contains("wxwork")) {
-            System.out.println("===企业微信平台");
-        }
-        System.out.println("浏览器组：" + UserAgentUtils.getBorderGroup(userAgent));
-        System.out.println("浏览器名字：" + UserAgentUtils.getBorderName(userAgent));
-        System.out.println("浏览器类型" + UserAgentUtils.getBorderType(userAgent));
-        System.out.println("浏览器生产商：" + UserAgentUtils.getBrowserManufacturer(userAgent));
-        System.out.println("浏览器版本：" + UserAgentUtils.getBrowserVersion(userAgent));
-        System.out.println("设备生产厂商:" + UserAgentUtils.getDeviceManufacturer(userAgent));
-        System.out.println("设备类型:" + UserAgentUtils.getDeviceType(userAgent));
-        System.out.println("设备操作系统：" + UserAgentUtils.getOs(userAgent));
-        System.out.println("操作系统的名字：" + UserAgentUtils.getOsName(userAgent));
-        System.out.println("操作系统的版本号：" + UserAgentUtils.getOsVersion(userAgent));
-        System.out.println("操作系统浏览器的渲染引擎:" + UserAgentUtils.getBorderRenderingEngine(userAgent));
-        String os = UserAgentUtils.getOs(userAgent);
-        if (os.contains("Windows")) {
-            System.out.println("是Windows");
-        } else if (os.contains("Linux")) {
-            System.out.println("是Linux");
-        } else {
-            System.out.println("无法匹配: {" + os + "}");
-        }
-
-        return "Success";
-    }
-
-    //获取第三方应用临时凭证
-    private String getSuiteAccessToken() {
-        if (WeiXinCorpController.SUITE_ACCESS_TOKEN == null || WeiXinCorpController.suiteTokenExpireTime < System.currentTimeMillis()) {
-            //失效了，需要重新获取
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            JSONObject reqParam = new JSONObject();
-            reqParam.put("suite_id",  suitId);
-            reqParam.put("suite_secret", suitSecret);
-            SysConfig param = sysConfigMapper.selectOne(new QueryWrapper<SysConfig>().eq("param_key", "wx_suite_ticket"));
-            if (param != null) {
-                reqParam.put("suite_ticket",param.getParamValue());
-            }
-
-            HttpEntity<String> requestEntity = new HttpEntity<String>(reqParam.toJSONString(), headers);
-            ResponseEntity<String> responseEntity = this.restTemplate.exchange(WeiXinCorpController.GET_SUITE_ACCESS_TOKEN_URL,
-                    HttpMethod.POST, requestEntity, String.class);
-            if (responseEntity.getStatusCode() == HttpStatus.OK) {
-                String resp = responseEntity.getBody();
-                System.out.println("获取企业微信suitAccessToken返回"+resp);
-                JSONObject obj = JSONObject.parseObject(resp);
-                if (obj.getIntValue("errcode") == 0) {
-                    WeiXinCorpController.SUITE_ACCESS_TOKEN = obj.getString("suite_access_token");
-                    WeiXinCorpController.suiteTokenExpireTime = System.currentTimeMillis() + obj.getIntValue("expires_in")*1000;
-                }
-            }
-        }
-        return WeiXinCorpController.SUITE_ACCESS_TOKEN;
-    }
-
-}

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

@@ -1,39 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.CompanyDingding;
-import com.management.platform.mapper.CompanyDingdingMapper;
-import com.management.platform.service.CompanyDingdingService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-27
- */
-@RestController
-@RequestMapping("/company-dingding")
-public class CompanyDingdingController {
-    @Resource
-    private CompanyDingdingService companyDingdingService;
-    @Resource
-    private CompanyDingdingMapper companyDingdingMapper;
-
-
-    @RequestMapping("/pushAlertMsg")
-    public HttpRespMsg pushAlertMsg(String corpid, String userDingId) {
-        CompanyDingding companyDingding = companyDingdingMapper.selectById(corpid);
-        companyDingdingService.sendFillReportAlertMsg(companyDingding.getCompanyId(), 1339030842L, "填入日报哦", "040534176023851922");
-        return new HttpRespMsg();
-    }
-
-}
-

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

@@ -1,108 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.CustomerInfo;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.CustomerInfoMapper;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-07-31
- */
-@RestController
-@RequestMapping("/customer-info")
-public class CustomerInfoController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ProjectMapper projectMapper;
-    @Resource
-    CustomerInfoMapper customerInfoMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(CustomerInfo info) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        if (info.getId() == null) {
-            info.setCompanyId(user.getCompanyId());
-            customerInfoMapper.insert(info);
-        } else {
-            info.setCompanyId(user.getCompanyId());
-            customerInfoMapper.updateById(info);
-            //更新项目表中的客户名称
-            Project p = new Project();
-            p.setCustomerName(info.getCustomerName());
-            projectMapper.update(p, new QueryWrapper<Project>().eq("customer_id", info.getId()));
-        }
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        int r = customerInfoMapper.delete(new QueryWrapper<CustomerInfo>().eq("id", id).eq("company_id", user.getCompanyId()));
-        if (r <= 0) {
-            msg.setError("无权删除");
-        }
-        return msg;
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, String keyword) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        QueryWrapper<CustomerInfo> queryWrapper = new QueryWrapper<CustomerInfo>().eq("company_id", user.getCompanyId()).orderByDesc("id");
-        if (!StringUtils.isEmpty(keyword)) {
-            queryWrapper.like("customer_name", keyword);
-        }
-        IPage<CustomerInfo> projectIPage = customerInfoMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<CustomerInfo> list = projectIPage.getRecords();
-        Long total = projectIPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll() {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<CustomerInfo> all = customerInfoMapper.getAll(user.getCompanyId());
-        msg.data = all;
-        return msg;
-    }
-
-}
-

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

@@ -1,123 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.DepartmentService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 部门 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-02-11
- */
-@RestController
-@RequestMapping("/department")
-public class DepartmentController {
-
-    @Autowired
-    private DepartmentService departmentService;
-
-    /**
-     * 获取带有层级的部门列表
-     */
-    @RequestMapping("/list")
-    public HttpRespMsg getDepartment(HttpServletRequest request) {
-        return departmentService.getDepartmentList(request);
-    }
-
-    @RequestMapping("/listAllMemb")
-    public HttpRespMsg listAllMemb(HttpServletRequest request) {
-        return departmentService.listAllMemb(request);
-    }
-
-    //获取我可以管辖到的人员列表，进行代填时选择的人员列表用到
-    @RequestMapping("/listMyMembs")
-    public HttpRespMsg listMyMembs(HttpServletRequest request) {
-        return departmentService.listMyMembs(request);
-    }
-
-    /**
-     * 获取不带有层级的部门列表
-     */
-    @RequestMapping("/normalList")
-    public HttpRespMsg getDepartmentNormal(HttpServletRequest request) {
-        return departmentService.getNormalDepartmentList(request);
-    }
-
-
-    /**
-     * 新增部门
-     * name 部门名称
-     * parentId 父级部门id
-     */
-    @RequestMapping("/add")
-    public HttpRespMsg insertDepartment(@RequestParam String name, Integer parentId, String managerId, String reportAuditUserid, HttpServletRequest request) {
-        return departmentService.insertDepartment(name, parentId, managerId, reportAuditUserid, request);
-    }
-
-    /**
-     * 修改部门名称
-     * id 部门id
-     * name 部门名称
-     */
-    @RequestMapping("/edit")
-    public HttpRespMsg updateDepartment(@RequestParam Integer id, @RequestParam String name, String managerId, String reportAuditUserid, HttpServletRequest request) {
-        return departmentService.updateDepartment(id, name, managerId, reportAuditUserid, request);
-    }
-
-    /**
-     * 删除部门
-     * id 部门id
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg deleteDepartment(@RequestParam Integer id, HttpServletRequest request) {
-        return departmentService.deleteDepartment(id, request);
-    }
-
-    /**
-     * 获取部门的统计工时成本
-     */
-    @RequestMapping("/departmentStatistic")
-    public HttpRespMsg getDepartmentStatistics(Integer parentDeptId, String startDate, String endDate, HttpServletRequest request) {
-        return departmentService.getDepartmentStatistics(parentDeptId, startDate, endDate, request);
-    }
-
-    /**
-     * 获取某个部门或者公司全部的人员的统计
-     * departmentId 要查询的项目
-     */
-    @RequestMapping("/userStatistic")
-    public HttpRespMsg getUserStatistics(String startDate, String endDate, Integer departmentId, HttpServletRequest request) {
-        return departmentService.getUserStatistics(startDate, endDate, departmentId, request);
-    }
-
-    @RequestMapping("/getUserCustomDataStatistic")
-    public HttpRespMsg getUserCustomDataStatistic(String startDate, String endDate, Integer departmentId, HttpServletRequest request) {
-        return departmentService.getUserCustomDataStatistic(startDate, endDate, departmentId, request);
-    }
-
-    /**
-     * 按人员导出工时统计,可选人员
-     * departmentId 要查询的项目
-     */
-    @RequestMapping("/exportUserStatistic")
-    public HttpRespMsg exportUserStatistic(String startDate, String endDate, String userIds, HttpServletRequest request) {
-        return departmentService.exportUserStatistic(startDate, endDate, userIds, request);
-    }
-
-
-    @RequestMapping("/exportDeptStatistic")
-    public HttpRespMsg exportDeptStatistic(String startDate, String endDate, HttpServletRequest request) {
-        return departmentService.exportDeptStatistic(startDate, endDate, request);
-    }
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-27
- */
-@RestController
-@RequestMapping("/department-dingding")
-public class DepartmentDingdingController {
-
-}
-

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

@@ -1,283 +0,0 @@
-package com.management.platform.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dingtalk.api.DefaultDingTalkClient;
-import com.dingtalk.api.DingTalkClient;
-import com.dingtalk.api.request.OapiServiceGetSuiteTokenRequest;
-import com.dingtalk.api.request.OapiServiceGetUnactiveCorpRequest;
-import com.dingtalk.api.response.OapiServiceGetSuiteTokenResponse;
-import com.dingtalk.api.response.OapiServiceGetUnactiveCorpResponse;
-import com.management.platform.entity.CompanyDingding;
-import com.management.platform.entity.SysConfig;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.CompanyDingdingService;
-import com.management.platform.service.DingDingService;
-import com.management.platform.util.*;
-import com.taobao.api.ApiException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.http.*;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@RestController
-@RequestMapping("/dingding")
-public class DingDingController {
-
-    private final Logger bizLogger = LoggerFactory.getLogger(getClass());
-    String token = "cf776d62c5fb3508b5d8c2cbb9f3df0c";
-    String aesKey = "ktmbamhymjsf60ndwp6n81mnu92847oynsgj9e0zr9v";
-    String suiteKey = "suitejwoq9dw4bxv4stdb";
-    String suiteSecret = "o-TWFLkFe8YbJsa_025JOj_JEWydP5GR3eigt1Yn1rtx5dTcryTJiSA6KEih3Bi4";
-
-    @Resource
-    private DingDingService dingDingService;
-    static ExecutorService executorService = Executors.newCachedThreadPool();
-    @Resource
-    private CompanyDingdingService companyDingdingService;
-    @Resource
-    private UserMapper userMapper;
-
-    @RequestMapping("/callback")
-    public Map<String, String> dingCallback(
-            @RequestParam(value = "signature") String signature,
-            @RequestParam(value = "timestamp") String timestamp,
-            @RequestParam(value = "nonce") String nonce,
-            @RequestBody(required = false) JSONObject body
-    ) {
-        System.out.println("接收到ding call back");
-        bizLogger.info("接收到ding call back=" + body.toJSONString());
-        try {
-            // 1. 从http请求中获取加解密参数
-
-            // 2. 使用加解密类型
-            // Constant.OWNER_KEY 说明：
-            // 1、开发者后台配置的订阅事件为应用级事件推送，
-            //      此时OWNER_KEY为应用的APP_KEY（企业内部应用）或SUITE_KEY（三方应用）。
-            // 2、调用订阅事件接口订阅的事件为企业级事件推送，
-            //      此时OWNER_KEY为：企业的CORP_ID（企业内部应用）或SUITE_KEY（三方应用）
-            DingCallbackCrypto callbackCrypto = new DingCallbackCrypto(token, aesKey, suiteKey);
-            String encryptMsg = body.getString("encrypt");
-            String decryptMsg = callbackCrypto.getDecryptMsg(signature, timestamp, nonce, encryptMsg);
-
-            // 3. 反序列化回调事件json数据
-            JSONObject eventJson = JSON.parseObject(decryptMsg);
-            String eventType = eventJson.getString("EventType");
-            bizLogger.info("DingDing回调触发了");
-            bizLogger.info(eventJson.toJSONString());
-            // 4. 根据EventType分类处理
-            if ("check_url".equals(eventType)) {
-                // 测试回调url的正确性
-                bizLogger.info("测试回调url的正确性");
-            } else if ("user_add_org".equals(eventType)) {
-                // 处理通讯录用户增加事件
-                bizLogger.info("发生了：" + eventType + "事件");
-            } else {
-                // 添加其他已注册的
-                bizLogger.info("发生了：" + eventType + "事件");
-                //推送suit ticket事件
-                /**
-                 * {
-                 *   "SuiteKey": "xxxxxx",
-                 *   "EventType": "suite_ticket ",
-                 *   "TimeStamp": 123456,
-                 *   "SuiteTicket": "xxxxxx"
-                 * }
-                 */
-                if ("suite_ticket".equals(eventType)) {
-                    System.out.println("==推送SuiteTicket===");
-                    dingDingService.updateSuiteTicket(eventJson.getString("SuiteTicket"));
-                } else if ("tmp_auth_code".equals(eventType)) {
-                    //企业授权开通应用
-                    /**
-                     * {
-                     *    "TimeStamp":1553709079062,
-                     *    "AuthCode": "xxxxxx",
-                     *    "AuthCorpId":"xxxxxx",
-                     *    "EventType":"tmp_auth_code",
-                     *    "SuiteKey":"xxxxxx"
-                     *  }
-                     */
-                    System.out.println("==企业授权开通应用===");
-
-                } else if ("SYNC_HTTP_PUSH_HIGH".equals(eventType)) {
-                    /**
-                     * {"EventType":"SYNC_HTTP_PUSH_HIGH",
-                     * "bizData":[{"gmt_create":1624757980000,"biz_type":2,"open_cursor":0,
-                     * "subscribe_id":"16822005_0","id":15275,"gmt_modified":1624757980000,
-                     * "biz_id":"16822005",
-                     * "biz_data":"{\"syncAction\":\"suite_ticket\",
-                     * \"suiteTicket\":\"IaIbq7a9S36R2uAbUh02VNlWoMB2LkorhyFCFhdpSWxJPZhIsIEhxIoIS7HQRn0zxMGh57gGd56RRh2Ntmcuzq\",
-                     * \"syncSeq\":\"AE815E12E6908BDEE8CA8D33A9\"}","corp_id":"ding169917db7f1ee5f435c2f4657eb6378f","status":0}]}
-                     */
-                    JSONArray bizData = eventJson.getJSONArray("bizData");
-                    if (bizData.size() > 0) {
-                        for (int i=0;i<bizData.size(); i++) {
-                            JSONObject bizItem = bizData.getJSONObject(i);
-                            int bizType = bizItem.getInteger("biz_type");
-                            if (bizType == 2) {
-                                //SuteTicket推送事件
-                                JSONObject biz_data = JSONObject.parseObject(bizItem.getString("biz_data"));
-                                String syncAction = biz_data.getString("syncAction");
-                                if ("suite_ticket".equals(syncAction)) {
-                                    System.out.println("==Push 推送事件 suite_ticket===");
-                                    dingDingService.updateSuiteTicket(biz_data.getString("suiteTicket"));
-                                }
-                            } else if (bizType == 4) {
-                                //企业授权变更，包含授权、解除授权、授权变更。
-                                JSONObject biz_data = JSONObject.parseObject(bizItem.getString("biz_data"));
-                                System.out.println("授权变更数据===@@");
-                                System.out.println(biz_data);
-                                String syncAction = biz_data.getString("syncAction");
-                                if ("org_suite_auth".equals(syncAction) || "org_suite_change".equals(syncAction)) {
-                                    //开通授权应用
-                                    JSONObject authCorpInfo = biz_data.getJSONObject("auth_corp_info");
-                                    String corp_name = authCorpInfo.getString("corp_name");
-                                    boolean isAuthenticated = authCorpInfo.getBooleanValue("is_authenticated");
-                                    Long agentId = null;
-                                    if ("org_suite_auth".equals(syncAction)) {
-                                        System.out.println("==Push 推送事件 开通授权应用===" + corp_name);
-                                        //此处在授权开通时强制赋值
-                                        isAuthenticated = true;
-                                        JSONObject authInfo = biz_data.getJSONObject("auth_info");
-
-                                        if (authInfo != null) {
-                                            JSONArray agents = authInfo.getJSONArray("agent");
-                                            for (int j=0;j<agents.size(); j++) {
-                                                JSONObject item = agents.getJSONObject(j);
-                                                if (item.getString("agent_name").equals("工时管家")) {
-                                                    agentId = item.getLong("agentid");
-                                                }
-                                            }
-                                        }
-                                    } else {
-                                        System.out.println("==Push 推送事件 授权变更==="+ corp_name+"=="+(isAuthenticated?"启用":"停用"));
-                                    }
-                                    if (isAuthenticated) {
-                                        String corpid = authCorpInfo.getString("corpid");
-                                        String authUserId = biz_data.getJSONObject("auth_user_info").getString("userId");
-                                        try {
-                                            dingDingService.corpAuth(corpid, corp_name, authUserId, agentId);
-                                        } catch (ApiException e) {
-                                            e.printStackTrace();
-                                            System.out.println(e.getMessage());
-                                        }
-                                    } else {
-                                        System.out.println("===未授权启用===");
-                                    }
-
-                                } else {
-                                    System.out.println("==Push 推送授权类型 ==="+syncAction);
-
-                                }
-                            } else if (bizType == 7) {
-                                JSONObject biz_data = JSONObject.parseObject(bizItem.getString("biz_data"));
-                                String syncAction = biz_data.getString("syncAction");
-                                if ("org_micro_app_scope_update".equals(syncAction)) {
-                                    //授权范围变更，我们尝试重新获取组织结构
-                                    String corpid = bizItem.getString("corp_id");
-                                    System.out.println("==Push 推送事件 使用范围变更=调用syncCorpMembs, corpid==="+corpid);
-                                    try {
-                                        dingDingService.syncCorpMembs(corpid);
-                                    } catch (ApiException e) {
-                                        e.printStackTrace();
-                                    }
-                                } else if ("org_micro_app_restore".equals(syncAction)) {
-                                    String corpid = bizItem.getString("corp_id");
-                                    System.out.println("==Push 推送事件 app 工时管家恢复启用, corpid==="+corpid);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            // 5. 返回success的加密数据
-            Map<String, String> successMap = callbackCrypto.getEncryptedMap("success");
-            LocalDateTime now = LocalDateTime.now();
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-            System.out.println(dtf.format(now)+" 给钉钉返回数据了："+successMap);
-            return successMap;
-        } catch (DingCallbackCrypto.DingTalkEncryptException e) {
-            e.printStackTrace();
-            System.out.println(e.getMessage());
-        }
-        return null;
-    }
-
-
-    @RequestMapping("/syncCorpMembs")
-    public HttpRespMsg syncCorpMembs(String corpid) {
-        try {
-            System.out.println("===========手动调用syncCorpMembs请求接口===========");
-            String rest = dingDingService.syncCorpMembs(corpid);
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.data = rest;
-            return msg;
-        } catch (ApiException e) {
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError(e.getMessage());
-            return msg;
-        }
-
-    }
-
-    @RequestMapping("/getUserByCode")
-    public HttpRespMsg getUserByCode(String code, String corpid) {
-        return dingDingService.getUserByCode(code, corpid);
-    }
-
-    @RequestMapping("/testAsync")
-    public HttpRespMsg testAsync() {
-        HttpRespMsg msg = new HttpRespMsg();
-        dingDingService.testAsync();
-        return msg;
-    }
-
-    @RequestMapping("/syncCorpInfo")
-    public HttpRespMsg syncCorpInfo(String corpid) {
-        return dingDingService.syncCorpInfo(corpid);
-    }
-
-
-    @RequestMapping("/syncCorpAgent")
-    public HttpRespMsg syncCorpAgent(String corpid) {
-        return dingDingService.syncCorpAgent(corpid);
-
-    }
-
-    @RequestMapping("/getUnActiveCorp")
-    public HttpRespMsg getUnActiveCorp() {
-        return dingDingService.getUnActiveCorp();
-    }
-
-    @RequestMapping("/reAuthCorp")
-    public HttpRespMsg reAuthCorp(String corpid) {
-        return dingDingService.reAuthCorp(corpid);
-    }
-
-    @RequestMapping("/pushLeaveAuditAlert")
-    public HttpRespMsg pushLeaveAuditAlert(String userId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        User user = userMapper.selectById(userId);
-        System.out.println("测试发送审批给=="+user.getName());
-        CompanyDingding dingding = companyDingdingService.getOne(new QueryWrapper<CompanyDingding>().eq("company_id", user.getCompanyId()));
-
-        companyDingdingService.sendLeaveApplyAlertMsg(dingding.getCompanyId(), dingding.getAgentId(), "", user.getDingdingUserid());
-
-        return msg;
-    }
-}

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

@@ -1,47 +0,0 @@
-package com.management.platform.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Report;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/clean")
-public class DirtyCleanController {
-    @Resource
-    private ReportService reportService;
-    @Resource
-    private ReportMapper reportMapper;
-
-
-
-    @RequestMapping("/removeDuplicate")
-    public HttpRespMsg removeDuplicate(Integer companyId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<Map<String, Object>> list = reportMapper.getDuplicate(companyId);
-        System.out.println("共=="+list.size()+"条重复记录");
-        List<Integer> reportIds = new ArrayList<>();
-        for(int i=0;i<list.size(); i++) {
-            Map map = list.get(i);
-            String ids = (String)map.get("reportIds");
-            reportIds.addAll(ListUtil.convertIntegerIdsArrayToList(ids));
-        }
-        System.out.println(reportIds);
-        System.out.println("日报记录report ="+reportIds.size());
-//        QueryWrapper<Report> queryWrapper = new QueryWrapper<Report>().in("id", reportIds).eq("company_id", companyId);
-//        reportMapper.delete(queryWrapper);
-//        List<Report> rList = reportMapper.selectList();
-//        System.out.println("去查找的日报数量="+rList.size());
-
-        return msg;
-    }
-}

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

@@ -1,99 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.EarningSnapshot;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ProjectBasecost;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.EarningSnapshotService;
-import com.management.platform.service.FinanceService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-15
- */
-@RestController
-@RequestMapping("/earning-snapshot")
-public class EarningSnapshotController {
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private EarningSnapshotService earningSnapshotService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private ProjectMapper projectMapper;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(Integer projectId) {
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-        HttpRespMsg msg = new HttpRespMsg();
-        Project project = projectMapper.selectById(projectId);
-
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看成本基线");
-        if (userId.equals(project.getInchargerId()) || userId.equals(project.getCreatorId()) || functionList.size() > 0) {
-            List<EarningSnapshot> list = earningSnapshotService.list(new QueryWrapper<EarningSnapshot>().eq("project_id", projectId).orderByDesc("id"));
-            for (EarningSnapshot snapshot : list) {
-                if (snapshot.getCostData() != null) {
-                    JSONArray array = JSONArray.parseArray(snapshot.getCostData());
-                    List<ProjectBasecost> costList = new ArrayList<>();
-                    for (int i=0;i<array.size();i++) {
-                        ProjectBasecost projectBasecost = JSONObject.toJavaObject(array.getJSONObject(i), ProjectBasecost.class);
-                        costList.add(projectBasecost);
-                    }
-                    snapshot.setCostList(costList);
-                    snapshot.setCostData(null);
-                }
-            }
-            msg.data = list;
-        } else {
-            msg.setError("无权查看");
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer projectId, String ids) {
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "校正成本基线");
-        HttpRespMsg msg = new HttpRespMsg();
-        Project project = projectMapper.selectById(projectId);
-        if (userId.equals(project.getInchargerId()) || userId.equals(project.getCreatorId()) || functionList.size() > 0) {
-            List<Integer> idArray = ListUtil.convertIntegerIdsArrayToList(ids);
-            earningSnapshotService.removeByIds(idArray);
-        } else {
-            msg.setError("无权操作");
-        }
-
-        return msg;
-    }
-}
-

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

@@ -1,39 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ExpenseItem;
-import com.management.platform.entity.vo.ExpenseItemVO;
-import com.management.platform.mapper.ExpenseItemMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-@RestController
-@RequestMapping("/expense-item")
-public class ExpenseItemController {
-
-    @Resource
-    private ExpenseItemMapper expenseItemMapper;
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ExpenseItemVO> userExpenseDetail = expenseItemMapper.getUserExpenseDetail(projectId);
-        msg.data = userExpenseDetail;
-        return msg;
-    }
-}
-

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

@@ -1,94 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ExpenseSheet;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ExpenseSheetService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-@RestController
-@RequestMapping("/expense-sheet")
-public class ExpenseSheetController {
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ExpenseSheetService expenseSheetService;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-
-    @RequestMapping("/getNextCode")
-    public HttpRespMsg getNextCode() {
-        String userId = request.getHeader("Token");
-        return expenseSheetService.getNextCode(userId);
-    }
-
-    @RequestMapping("/add")
-    public HttpRespMsg add(ExpenseSheet sheet, String items) {
-        String userId = request.getHeader("Token");
-        return expenseSheetService.add(sheet, items, userId);
-
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        return expenseSheetService.delete(id);
-
-    }
-
-    @RequestMapping("/list")
-    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);
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部报销单");
-        if (functionList.size() == 0) {
-            //普通员工只能看自己的
-            sheet.setOwnerId(user.getId());
-        }
-        sheet.setCompanyId(user.getCompanyId());
-        return expenseSheetService.queryList(sheet, startDate, endDate, pageIndex, pageSize);
-    }
-
-    @RequestMapping("/getDetail")
-    public HttpRespMsg getDetail(Integer id) {
-
-        return expenseSheetService.getDetail(id);
-
-    }
-
-    @RequestMapping("/approve")
-    public HttpRespMsg approve(Integer id) {
-
-        return expenseSheetService.approve(id);
-
-    }
-    @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id) {
-
-        return expenseSheetService.deny(id);
-
-    }
-
-}
-

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

@@ -1,36 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ExpenseType;
-import com.management.platform.mapper.ExpenseTypeMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-18
- */
-@RestController
-@RequestMapping("/expense-type")
-public class ExpenseTypeController {
-    @Resource
-    private ExpenseTypeMapper expenseTypeMapper;
-
-    @RequestMapping("/getList")
-    public HttpRespMsg getList() {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = expenseTypeMapper.selectList(new QueryWrapper<>());
-        return msg;
-    }
-
-}
-

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

@@ -1,48 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.Finance;
-import com.management.platform.entity.FinanceAuditor;
-import com.management.platform.mapper.FinanceAuditorMapper;
-import com.management.platform.service.FinanceAuditorService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-@RestController
-@RequestMapping("/finance-auditor")
-public class FinanceAuditorController {
-
-    @Resource
-    private FinanceAuditorService financeAuditorService;
-    @Resource
-    private HttpServletRequest request;
-
-    @RequestMapping("/save")
-    public HttpRespMsg save(FinanceAuditor item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        financeAuditorService.saveOrUpdate(item);
-        return msg;
-    }
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer companyId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceAuditor item = financeAuditorService.getById(companyId);
-        msg.data = item;
-        return msg;
-    }
-}
-

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

@@ -1,125 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Company;
-import com.management.platform.entity.FinanceFixedcolname;
-import com.management.platform.entity.FinanceTblcuscol;
-import com.management.platform.mapper.CompanyMapper;
-import com.management.platform.mapper.FinanceTblcuscolMapper;
-import com.management.platform.service.FinanceFixedcolnameService;
-import com.management.platform.service.FinanceService;
-import com.management.platform.util.ExcelUtil;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-02-18
- */
-@RestController
-@RequestMapping("/finance")
-public class FinanceController {
-
-    @Resource
-    private FinanceService financeService;
-    @Resource
-    private FinanceTblcuscolMapper financeTblcuscolMapper;
-    @Resource
-    private CompanyMapper companyMapper;
-    @Resource
-    private FinanceFixedcolnameService financeFixedcolnameService;
-
-    @Value(value = "${upload.path}")
-    private String path;
-
-    @RequestMapping("/getByMonth")
-    public HttpRespMsg getByMonth(Integer companyId, String yearMonth) {
-        return financeService.getByMonth(companyId, yearMonth);
-    }
-
-    @RequestMapping("/getProjects")
-    public HttpRespMsg getProjects(Integer companyId, String yearMonth) {
-        return financeService.getProjects(companyId, yearMonth);
-    }
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(Integer companyId, String yearMonth,
-                                  Boolean syncUserCost, Boolean syncHistoryReport,
-                                  MultipartFile file, HttpServletRequest request) {
-        return financeService.importData(companyId, yearMonth, syncUserCost, syncHistoryReport, file, request);
-    }
-
-    @RequestMapping("/exportData")
-    public HttpRespMsg exportData(@RequestParam String date, Boolean assignNoProUser,HttpServletRequest request) {
-        return financeService.exportData(date, assignNoProUser, request);
-    }
-
-    @RequestMapping("/exportFinance")
-    public HttpRespMsg exportFinance(@RequestParam String date, HttpServletRequest request) {
-        return financeService.exportFinance(date, request);
-    }
-
-    //按照项目分配财务成本
-    @RequestMapping("/getTimeCost")
-    public HttpRespMsg getTimeCost(String yearMonth, Boolean assignNoProUser,HttpServletRequest request) {
-        return financeService.getTimeCost(yearMonth, assignNoProUser,request);
-    }
-
-    @RequestMapping("/getNoProjectUsers")
-    public HttpRespMsg getNoProjectUsers(String yearMonth, HttpServletRequest request) {
-        return financeService.getNoProjectUsers(yearMonth, request);
-    }
-
-
-    /**
-     * 获取财务报表模板
-     * @param companyId
-     * @return
-     */
-    @RequestMapping("/getTemplate")
-    public HttpRespMsg getTemplate(Integer companyId) {
-        List<FinanceTblcuscol> list = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceFixedcolname item = financeFixedcolnameService.getById(companyId);
-
-        List<String> heads = new ArrayList<>();
-        Company company = companyMapper.selectById(companyId);
-        heads.add("姓名");
-        heads.add(item.getMonthCost());//heads.add("工资");
-        heads.add(item.getBonus());//heads.add("奖金");
-        heads.add(item.getAllowance());//heads.add("津贴");
-        heads.add(item.getInsuranceOld());//heads.add("养老保险");
-        heads.add(item.getInsuranceMedical());//heads.add("医疗保险");
-        heads.add(item.getInsuranceLosejob());//heads.add("失业保险");
-        heads.add(item.getInsuranceInjury());//heads.add("工伤保险");
-        heads.add(item.getHouseFund());//heads.add("住房公积金");
-//            heads.add("其他");
-        if (list.size() > 0) {
-            List<String> collect = list.stream().map(FinanceTblcuscol::getFieldName).collect(Collectors.toList());
-            heads.addAll(collect);
-        }
-        List<List<String>> allList = new ArrayList<>();
-        allList.add(heads);
-        String fileName = company.getCompanyName()+"_财务人员成本模板";
-        msg.data = ExcelUtil.exportGeneralExcelByTitleAndList(fileName, allList, path);
-
-        return msg;
-    }
-}
-

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

@@ -1,23 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-15
- */
-@RestController
-@RequestMapping("/finance-fixedcolname")
-public class FinanceFixedcolnameController {
-
-}
-

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

@@ -1,94 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.FinanceImport;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.FinanceImportService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-@RestController
-@RequestMapping("/finance-import")
-public class FinanceImportController {
-
-    @Resource
-    private FinanceImportService financeImportService;
-    @Resource
-    private UserMapper userMapper;
-
-    @RequestMapping("submitImport")
-    public HttpRespMsg submitImport(Integer companyId, String yearMonth,
-                                  Boolean syncUserCost, Boolean syncHistoryReport,
-                                  MultipartFile file, HttpServletRequest request) {
-        return financeImportService.submitImport(companyId, yearMonth, syncUserCost, syncHistoryReport, file, request);
-    }
-
-    @RequestMapping("list")
-    public HttpRespMsg list(Integer companyId, HttpServletRequest request) {
-        return financeImportService.list(companyId, request);
-    }
-
-    @RequestMapping("/agree")
-    public HttpRespMsg agree(Integer id, HttpServletRequest request) {
-
-        return financeImportService.agree(id, request);
-    }
-
-    @RequestMapping("/getStatus")
-    public HttpRespMsg getStatus(Integer companyId, String yearMonth) {
-        FinanceImport item = financeImportService.getOne(new QueryWrapper<FinanceImport>().eq("company_id", companyId).eq("ymonth", yearMonth).orderByDesc("indate").last("limit 1"));
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = item;
-        return msg;
-    }
-
-    @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceImport item = new FinanceImport();
-        item.setId(id);
-        item.setState(2);
-        FinanceImport old = financeImportService.getById(id);
-        if (old.getState() == 0) {
-            User auditor = userMapper.selectById(request.getHeader("TOKEN"));
-            item.setAuditorId(auditor.getId());
-            item.setAuditorName(auditor.getName());
-            financeImportService.updateById(item);
-        } else {
-            msg.setError("只有待审核状态才可以操作");
-        }
-        return msg;
-    }
-
-    @RequestMapping("/cancel")
-    public HttpRespMsg cancel(Integer id, HttpServletRequest request) {
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceImport item = new FinanceImport();
-        item.setId(id);
-        item.setState(-1);
-        FinanceImport old = financeImportService.getById(id);
-        if (old.getState() == 1) {
-            financeImportService.updateById(item);
-        } else {
-            msg.setError("只有审核通过状态才可以撤销");
-        }
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-02-26
- */
-@RestController
-@RequestMapping("/finance-projects")
-public class FinanceProjectsController {
-
-}
-

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

@@ -1,128 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Finance;
-import com.management.platform.entity.FinanceFixedcolname;
-import com.management.platform.entity.FinanceTblcuscol;
-import com.management.platform.mapper.FinanceFixedcolnameMapper;
-import com.management.platform.mapper.FinanceTblcuscolMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.FinanceFixedcolnameService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-12-17
- */
-@RestController
-@RequestMapping("/finance-tblcuscol")
-public class FinanceTblcuscolController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private FinanceTblcuscolMapper financeTblcuscolMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private FinanceFixedcolnameService financeFixedcolnameService;
-
-//    @RequestMapping("/get")
-//    public HttpRespMsg get(Integer companyId) {
-//        List<FinanceTblcuscol> list = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-//        HttpRespMsg msg = new HttpRespMsg();
-//        msg.data = list;
-//        return msg;
-//    }
-
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll(Integer companyId) {
-        List<FinanceTblcuscol> list = financeTblcuscolMapper.selectList(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-        HttpRespMsg msg = new HttpRespMsg();
-        FinanceFixedcolname item = financeFixedcolnameService.getFixed(companyId);
-        if (list.size() > 0) {
-            item.setField1(list.get(0).getFieldName());
-        }
-        if (list.size() > 1) {
-            item.setField2(list.get(1).getFieldName());
-        }
-        if (list.size() > 2) {
-            item.setField3(list.get(2).getFieldName());
-        }
-        msg.data = item;
-
-        return msg;
-    }
-//
-//    @RequestMapping("/getFixed")
-//    public HttpRespMsg getFixed(Integer companyId) {
-//        HttpRespMsg msg = new HttpRespMsg();
-//        msg.data = financeFixedcolnameService.getFixed(companyId);
-//        return msg;
-//    }
-
-    @RequestMapping("/save")
-    public HttpRespMsg addOrMod(FinanceFixedcolname item) {
-        String token = request.getHeader("TOKEN");
-        int companyId = userMapper.selectById(token).getCompanyId();
-        financeTblcuscolMapper.delete(new QueryWrapper<FinanceTblcuscol>().eq("company_id", companyId));
-        if (!StringUtils.isEmpty(item.getField1())) {
-            FinanceTblcuscol col = new FinanceTblcuscol();
-            col.setCompanyId(companyId);
-            col.setFieldName(item.getField1());
-            financeTblcuscolMapper.insert(col);
-        }
-
-        if (!StringUtils.isEmpty(item.getField2())) {
-            FinanceTblcuscol col = new FinanceTblcuscol();
-            col.setCompanyId(companyId);
-            col.setFieldName(item.getField2());
-            financeTblcuscolMapper.insert(col);
-        }
-
-        if (!StringUtils.isEmpty(item.getField3())) {
-            FinanceTblcuscol col = new FinanceTblcuscol();
-            col.setCompanyId(companyId);
-            col.setFieldName(item.getField3());
-            financeTblcuscolMapper.insert(col);
-        }
-
-        //存储自定义的固定字段
-        if (item.getMonthCost() != null || item.getBonus() != null || item.getAllowance() != null || item.getInsuranceInjury() != null
-            || item.getInsuranceLosejob() != null || item.getInsuranceMedical() != null || item.getInsuranceOld() != null || item.getHouseFund() != null) {
-            item.setCompanyId(companyId);
-            financeFixedcolnameService.saveOrUpdate(item);
-        }
-
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        int companyId = userMapper.selectById(token).getCompanyId();
-        FinanceTblcuscol financeTblcuscol = financeTblcuscolMapper.selectById(id);
-        if (financeTblcuscol.getCompanyId() == companyId) {
-            financeTblcuscolMapper.deleteById(id);
-        } else {
-            msg.setError("无权操作");
-        }
-        return msg;
-    }
-}
-

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

@@ -1,105 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.GroupTemplate;
-import com.management.platform.entity.GroupTmpstages;
-import com.management.platform.entity.User;
-import com.management.platform.service.GroupTemplateService;
-import com.management.platform.service.GroupTmpstagesService;
-import com.management.platform.service.UserService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-05
- */
-@RestController
-@RequestMapping("/group-template")
-public class GroupTemplateController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private GroupTemplateService groupTemplateService;
-    @Resource
-    private GroupTmpstagesService groupTmpstagesService;
-    @Resource
-    private UserService userService;
-
-    @RequestMapping("/initData")
-    public HttpRespMsg initData() {
-        if (groupTemplateService.count() == 0) {
-            //系统中没有数据，需要初始化
-            String[] templateNames = {"工程设计","软硬件研发","客服工单处理"};
-            String[][] stages = {{"信息收集","策划","原型图","效果图","审核中","修改调整","完成"},
-                                {"需求分析","设计中","研发中","测试中","修改BUG","已发布"},
-                                {"用户问题","解决中","已解决","反馈用户&问题解决"}
-                                };
-            for (int i=0;i<templateNames.length;i++) {
-                String s = templateNames[i];
-                GroupTemplate template = new GroupTemplate();
-                template.setName(s);
-                template.setIsSystem(1);
-                groupTemplateService.save(template);
-                String[] curStages = stages[i];
-                int seq = 1;
-                for(String name:curStages) {
-                    GroupTmpstages sItem = new GroupTmpstages();
-                    sItem.setSequence(seq);
-                    sItem.setTemplateId(template.getId());
-                    sItem.setStagesName(name);
-                    groupTmpstagesService.save(sItem);
-                    seq++;
-                }
-            }
-        }
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/getList")
-    public HttpRespMsg getList() {
-        if (groupTemplateService.count() == 0) {
-            initData();
-        }
-        String uid = request.getHeader("Token");
-        User user = userService.getById(uid);
-        QueryWrapper<GroupTemplate> templateQueryWrapper = new QueryWrapper<>();
-        templateQueryWrapper.eq("company_id", user.getCompanyId()).or().eq("is_system",1).orderByDesc("id");
-        List<GroupTemplate> list = groupTemplateService.list(templateQueryWrapper);
-        //查找任务列表名称
-        for (GroupTemplate template:list) {
-            List<GroupTmpstages> groupTmpstages = groupTmpstagesService.list(new QueryWrapper<GroupTmpstages>().eq("template_id", template.getId()));
-            template.setStagesList(groupTmpstages);
-
-            //TODO: 查找每个阶段模板任务/里程碑/风险
-
-        }
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = list;
-        return msg;
-    }
-
-    @RequestMapping("/addTemplate")
-    public HttpRespMsg addTemplate(Integer groupId, String name, Boolean saveTask, Boolean saveMileStone, Boolean saveRisk) {
-        String uid = request.getHeader("Token");
-        return groupTemplateService.addTemplate(uid, groupId, name, saveTask, saveMileStone, saveRisk);
-    }
-
-    @RequestMapping("/deleteTemplate")
-    public HttpRespMsg deleteTemplate(Integer id) {
-        groupTemplateService.removeById(id);
-        return new HttpRespMsg();
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-05
- */
-@RestController
-@RequestMapping("/group-tmpstages")
-public class GroupTmpstagesController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-27
- */
-@RestController
-@RequestMapping("/gtemplate-task")
-public class GtemplateTaskController {
-
-}
-

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

@@ -1,37 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.InformationService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-02-18
- */
-@RestController
-@RequestMapping("/information")
-public class InformationController {
-    @Autowired
-    private InformationService informationService;
-
-    @RequestMapping("/list")
-    public HttpRespMsg getInformationList(HttpServletRequest request) {
-        return informationService.getInformationList(request);
-    }
-
-    @RequestMapping("/check")
-    public HttpRespMsg checkInformation(@RequestParam Integer id, HttpServletRequest request) {
-        return informationService.checkInformation(id, request);
-    }
-}
-

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

@@ -1,98 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.ExpenseSheet;
-import com.management.platform.entity.LeaveSheet;
-import com.management.platform.entity.SysFunction;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ExpenseSheetService;
-import com.management.platform.service.LeaveSheetService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-12-09
- */
-@RestController
-@RequestMapping("/leave-sheet")
-public class LeaveSheetController {
-
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    LeaveSheetService leaveSheetService;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-
-
-    @RequestMapping("/add")
-    public HttpRespMsg add(LeaveSheet sheet) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.add(sheet, userId);
-
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        return leaveSheetService.delete(id);
-
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(LeaveSheet sheet, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部报销单");
-        if (functionList.size() == 0) {
-            //普通员工只能看自己的
-            sheet.setOwnerId(user.getId());
-        }
-        sheet.setCompanyId(user.getCompanyId());
-        return leaveSheetService.queryList(sheet, pageIndex, pageSize);
-    }
-
-    @RequestMapping("/approve")
-    public HttpRespMsg approve(Integer id) {
-
-        return leaveSheetService.approve(id);
-
-    }
-    @RequestMapping("/deny")
-    public HttpRespMsg deny(Integer id) {
-
-        return leaveSheetService.deny(id);
-
-    }
-
-    /**
-     *
-     * @param keyword 姓名（模糊匹配）
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return
-     */
-    @RequestMapping("/summaryData")
-    public HttpRespMsg summaryData(String keyword, String startDate, String endDate) {
-        String userId = request.getHeader("Token");
-        return leaveSheetService.summaryData(keyword, startDate, endDate, userId);
-
-    }
-}
-

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

@@ -1,20 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 人员参与项目的情况 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-02-12
- */
-@RestController
-@RequestMapping("/participation")
-public class ParticipationController {
-
-}
-

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

@@ -1,48 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.PdfFile;
-import com.management.platform.service.PdfFileService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-27
- */
-@RestController
-@RequestMapping("/pdf-file")
-public class PdfFileController {
-    @Resource
-    private PdfFileService pdfFileService;
-
-    /**
-     * 获取项目文档
-     * @param fileId
-     * @return
-     */
-    @RequestMapping("/getProjectFile")
-    public HttpRespMsg getProjectFile(Integer fileId) {
-        List<PdfFile> pdfFileList = pdfFileService.list(new QueryWrapper<PdfFile>().eq("type", 1).eq("file_id", fileId));
-        HttpRespMsg msg = new HttpRespMsg();
-        if (pdfFileList.size() > 0) {
-            msg.data = pdfFileList.get(0).getPdfUrl();
-        } else {
-            msg.setError("该格式不支持在线预览");
-        }
-
-        return msg;
-    }
-}
-

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

@@ -3,7 +3,6 @@ package com.management.platform.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.management.platform.entity.SysRole;
-import com.management.platform.service.PermissionService;
 import com.management.platform.service.SysRoleService;
 import com.management.platform.util.HttpRespMsg;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,6 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/permission")
 public class PermissionController {
-    @Autowired
-    private PermissionService permissionService;
     @Resource
     private HttpServletRequest httpServletRequest;
     @Resource
@@ -43,54 +40,5 @@ public class PermissionController {
         return msg;
     }
 
-    @RequestMapping("/getCrewByPage")
-    public HttpRespMsg getCrewByPage(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return permissionService.getCrewByPage(pageIndex, pageSize);
-    }
-
-    @RequestMapping("/switchRole")
-    public HttpRespMsg switchRole(@RequestParam Integer[] ids, @RequestParam Integer roleId) {
-        return permissionService.switchRole(ids, roleId, httpServletRequest);
-    }
-
-    @RequestMapping("/getSimpleUserList")
-    public HttpRespMsg getSimpleUserList() {
-        return permissionService.getSimpleUserList();
-    }
-
-    @RequestMapping("/getRoleList")
-    public HttpRespMsg getRoleList(Integer companyId) {
-        return permissionService.getRoleList(companyId);
-    }
-
-    @RequestMapping("/editRole")
-    public HttpRespMsg editRole(Integer id, @RequestParam String name, @RequestParam String description, Integer companyId) {
-        return permissionService.editRole(id, name, description, companyId);
-    }
-
-    @RequestMapping("/setDefaultRole")
-    public HttpRespMsg setDefaultRole(Integer id, Integer companyId) {
-        return permissionService.setDefaultRole(id, companyId);
-    }
-
-    @RequestMapping("/deleteRole")
-    public HttpRespMsg deleteRole(@RequestParam Integer id) {
-        return permissionService.deleteRole(id);
-    }
-
-    @RequestMapping("/getAuthority")
-    public HttpRespMsg getAuthority(@RequestParam Integer role, @RequestParam Integer companyId) {
-        return permissionService.getAuthority(role, companyId);
-    }
-
-    @RequestMapping("/switchAuthority")
-    public HttpRespMsg switchAuthority(@RequestParam Integer role, @RequestParam Integer id) {
-        return permissionService.switchAuthority(role, id);
-    }
-
-    @RequestMapping(value = "/savePermission", method = RequestMethod.POST)
-    public HttpRespMsg savePermission(@RequestParam Integer role, @RequestParam String moduleList) {
-        return permissionService.savePermission(role, moduleList);
-    }
 }
 

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-01-08
- */
-@RestController
-@RequestMapping("/pic-content-keywords")
-public class PicContentKeywordsController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@RestController
-@RequestMapping("/pp-membs")
-public class PpMembsController {
-
-}
-

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

@@ -1,115 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.*;
-import com.management.platform.mapper.ProfessionMapper;
-import com.management.platform.mapper.ProjectProfessionMapper;
-import com.management.platform.mapper.ReportProfessionProgressMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@RestController
-@RequestMapping("/profession")
-public class ProfessionController {
-    @Resource
-    HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ProfessionMapper professionMapper;
-    @Resource
-    ReportProfessionProgressMapper reportProfessionProgressMapper;
-    @Resource
-    ProjectProfessionMapper projectProfessionMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(Profession info) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        if (info.getId() == null) {
-            info.setCompanyId(user.getCompanyId());
-            professionMapper.insert(info);
-        } else {
-            info.setCompanyId(user.getCompanyId());
-            professionMapper.updateById(info);
-            //更新项目专业表中的专业名称
-            ProjectProfession p = new ProjectProfession();
-            p.setProfessionName(info.getName());
-            projectProfessionMapper.update(p, new QueryWrapper<ProjectProfession>().eq("profession_id", info.getId()));
-        }
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        //检查，该专业是否已经被日报使用
-        Integer cnt = reportProfessionProgressMapper.selectCount(new QueryWrapper<ReportProfessionProgress>().eq("profession_id", id));
-        if (cnt > 0) {
-            msg.setError("该专业已经存在相关日报，无法删除");
-        } else {
-            int r = professionMapper.delete(new QueryWrapper<Profession>().eq("id", id).eq("company_id", user.getCompanyId()));
-            if (r <= 0) {
-                msg.setError("无权删除");
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, String keyword) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        QueryWrapper<Profession> queryWrapper = new QueryWrapper<Profession>().eq("company_id", user.getCompanyId()).orderByDesc("id");
-        if (!StringUtils.isEmpty(keyword)) {
-            queryWrapper.like("name", keyword);
-        }
-        IPage<Profession> projectIPage = professionMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<Profession> list = projectIPage.getRecords();
-        Long total = projectIPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll() {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<Profession> all = professionMapper.selectList(new QueryWrapper<Profession>().eq("company_id", user.getCompanyId()));
-        msg.data = all;
-        return msg;
-    }
-}
-

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

@@ -1,40 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectAuditor;
-import com.management.platform.mapper.ProjectAuditorMapper;
-import com.management.platform.service.ProjectAuditorService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-13
- */
-@RestController
-@RequestMapping("/project-auditor")
-public class ProjectAuditorController {
-
-    @Resource
-    private ProjectAuditorMapper projectAuditorMapper;
-
-    @RequestMapping("/getList")
-    private HttpRespMsg getList(Integer projectId) {
-        List<ProjectAuditor> auditorList = projectAuditorMapper.selectList(new QueryWrapper<ProjectAuditor>().eq("project_id", projectId));
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = auditorList;
-        return msg;
-    }
-}
-

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

@@ -1,69 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectBasecost;
-import com.management.platform.entity.ProjectBasecostSetting;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.ProjectBasecostMapper;
-import com.management.platform.mapper.ProjectBasecostSettingMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-02
- */
-@RestController
-@RequestMapping("/project-basecost")
-public class ProjectBasecostController {
-
-    @Resource
-    ProjectBasecostMapper projectBasecostMapper;
-    @Resource
-    ProjectBasecostSettingMapper projectBasecostSettingMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    HttpServletRequest request;
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ProjectBasecost> list = projectBasecostMapper.selectList(new QueryWrapper<ProjectBasecost>().eq("project_id", projectId));
-        //检查最新的字段是否有
-        User user = userMapper.selectById(request.getHeader("TOKEN"));
-        List<ProjectBasecostSetting> allSettings = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", user.getCompanyId()));
-        List<ProjectBasecost> additionalList = new ArrayList<>();
-        allSettings.forEach(all->{
-            if (!list.stream().filter(costItem->costItem.getBaseId().equals(all.getId())).findAny().isPresent()) {
-                ProjectBasecost add = new ProjectBasecost();
-                add.setBaseName(all.getName());
-                add.setBaseId(all.getId());
-                add.setProjectId(projectId);
-                add.setBaseAmount(0.0);
-                additionalList.add(add);
-            }
-        });
-        if (additionalList.size() > 0) {
-            list.addAll(additionalList);
-        }
-        msg.data = list;
-        return msg;
-    }
-
-
-}
-

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

@@ -1,120 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.constant.Constant;
-import com.management.platform.entity.ProjectBasecost;
-import com.management.platform.entity.ProjectBasecostSetting;
-import com.management.platform.mapper.ProjectBasecostMapper;
-import com.management.platform.mapper.ProjectBasecostSettingMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-02
- */
-@RestController
-@RequestMapping("/project-basecost-setting")
-public class ProjectBasecostSettingController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ProjectBasecostSettingMapper projectBasecostSettingMapper;
-
-    @Resource
-    ProjectBasecostMapper projectBasecostMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(ProjectBasecostSetting setting) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
-            return msg;
-        }
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        if (setting.getId() == null) {
-            setting.setCompanyId(companyId);
-            int count = projectBasecostSettingMapper.selectCount(new QueryWrapper<ProjectBasecostSetting>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
-            if (count > 0) {
-                msg.setError("该名称已存在");
-            } else {
-                projectBasecostSettingMapper.insert(setting);
-                msg.data = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId));
-            }
-        } else {
-            int count = projectBasecostSettingMapper.selectCount(new QueryWrapper<ProjectBasecostSetting>().eq("name", setting.getName())
-                    .eq("company_id", companyId).ne("id", setting.getId()));
-            if (count > 0) {
-                msg.setError("该名称已存在");
-            } else {
-                //检查名称是否有变化
-                ProjectBasecostSetting oldSetting = projectBasecostSettingMapper.selectById(setting.getId());
-                if (!setting.getName().equals(oldSetting.getName())) {
-                    projectBasecostSettingMapper.updateById(setting);
-                    ProjectBasecost cost = new ProjectBasecost();
-                    cost.setBaseName(setting.getName());
-                    projectBasecostMapper.update(cost, new QueryWrapper<ProjectBasecost>().eq("base_id", setting.getId()));
-                }
-                msg.data = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId));
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list() {
-        HttpRespMsg msg = new HttpRespMsg();
-
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        List<ProjectBasecostSetting> list = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId));
-        if (list.size() == 0) {
-            //生成项目的成本基线默认条目
-            String[] array = Constant.DEFAULT_BASE_COST_ITEMS;
-            for (String baseItem : array) {
-                ProjectBasecostSetting setting = new ProjectBasecostSetting();
-                setting.setName(baseItem);
-                setting.setCompanyId(companyId);
-                projectBasecostSettingMapper.insert(setting);
-            }
-            list = projectBasecostSettingMapper.selectList(new QueryWrapper<ProjectBasecostSetting>().eq("company_id", companyId));
-        }
-        msg.data = list;
-
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectBasecostSetting projectBasecostSetting = projectBasecostSettingMapper.selectById(id);
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        if (!projectBasecostSetting.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
-        } else {
-            projectBasecostSettingMapper.deleteById(id);
-        }
-
-        return msg;
-    }
-
-
-
-
-}
-

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

@@ -1,106 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ProjectBasecost;
-import com.management.platform.entity.ProjectCategory;
-import com.management.platform.entity.ProjectCategory;
-import com.management.platform.mapper.*;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-24
- */
-@RestController
-@RequestMapping("/project-category")
-public class ProjectCategoryController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ProjectCategoryMapper projectCategoryMapper;
-
-    @Resource
-    ProjectMapper projectMapper;
-
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(ProjectCategory setting) {
-        HttpRespMsg msg = new HttpRespMsg();
-        if (StringUtils.isEmpty(setting.getName())) {
-            msg.setError("名称不能为空");
-            return msg;
-        }
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        if (setting.getId() == null) {
-            setting.setCompanyId(companyId);
-            int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName()).eq("company_id", setting.getCompanyId()));
-            if (count > 0) {
-                msg.setError("该名称已存在");
-            } else {
-                projectCategoryMapper.insert(setting);
-                msg.data = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
-            }
-        } else {
-            int count = projectCategoryMapper.selectCount(new QueryWrapper<ProjectCategory>().eq("name", setting.getName())
-                    .eq("company_id", companyId).ne("id", setting.getId()));
-            if (count > 0) {
-                msg.setError("该名称已存在");
-            } else {
-                //检查名称是否有变化
-                ProjectCategory oldSetting = projectCategoryMapper.selectById(setting.getId());
-                if (!setting.getName().equals(oldSetting.getName())) {
-                    projectCategoryMapper.updateById(setting);
-                    Project cost = new Project();
-                    cost.setCategoryName(setting.getName());
-                    projectMapper.update(cost, new QueryWrapper<Project>().eq("category", setting.getId()));
-                }
-                msg.data = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
-            }
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list() {
-        HttpRespMsg msg = new HttpRespMsg();
-
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        List<ProjectCategory> list = projectCategoryMapper.selectList(new QueryWrapper<ProjectCategory>().eq("company_id", companyId));
-        msg.data = list;
-
-        return msg;
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectCategory ProjectCategory = projectCategoryMapper.selectById(id);
-        Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-        if (!ProjectCategory.getCompanyId().equals(companyId)) {
-            msg.setError("无权操作");
-        } else {
-            projectCategoryMapper.deleteById(id);
-        }
-
-        return msg;
-    }
-
-}
-

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

@@ -1,386 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.Project;
-import com.management.platform.service.ProjectService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-01-03
- */
-@RestController
-@RequestMapping("/project")
-public class ProjectController {
-    @Autowired
-    private ProjectService projectService;
-    @Resource
-    private HttpServletRequest request;
-
-
-    /**
-     * 获取项目列表
-     */
-    @RequestMapping("/getProjectList")
-    public HttpRespMsg getProjectList() {
-        return projectService.getProjectList(request);
-    }
-
-    /**
-     * 分页获取项目列表
-     * pageIndex 页数
-     * pageSize 页面大小
-     */
-    @RequestMapping("/getProjectPage")
-    public HttpRespMsg getProjectPage(@RequestParam Integer pageIndex, @RequestParam Integer pageSize, String keyword,
-                                      @RequestParam(required = false, defaultValue = "1") Integer searchField,
-                                      Integer status, Integer category) {
-        return projectService.getProjectPage(pageIndex, pageSize, keyword,searchField, status, category, request);
-    }
-
-    /**
-     * 添加或编辑项目
-     * id 要编辑项目的id 可填
-     * name 项目的名称
-     * userId 用户id数组
-     */
-    @RequestMapping("/editProject")
-    public HttpRespMsg editProject(Integer id, @RequestParam String name, String code, String[] userId, String inchargerId,
-                                   Integer isPublic,
-                                   String planStartDate,
-                                   String planEndDate,
-                                   Integer level,
-                                   Double contractAmount,
-                                   Double budget,
-                                   Integer customerId,
-                                   String projectBaseCostData,
-                                   String chosenLeaders,
-                                   String associateDegrees,
-                                   String associateDegreeNames,
-                                   Integer taskGpIncharge,
-                                   String auditUserIds,
-                                   Integer category
-                                   ) {
-        return projectService.editProject(id, name, code, userId, inchargerId, isPublic, planStartDate, planEndDate, level, contractAmount,
-                projectBaseCostData,
-                 budget,customerId,chosenLeaders, associateDegrees, associateDegreeNames, taskGpIncharge,auditUserIds, category, request);
-    }
-
-    @RequestMapping("/adjustBase")
-    public HttpRespMsg adjustBase(String baseCostData, Project project, String remark
-    ) {
-        return projectService.adjustBase(baseCostData, project, remark, request);
-    }
-
-
-    /**
-     * 更新项目进度
-     * @param id
-     * @param progress
-     * @return
-     */
-    @RequestMapping("/updateProgress")
-    public HttpRespMsg updateProgress(Integer id,
-                                   Integer progress) {
-
-        return projectService.updateProgress(id, progress,request);
-    }
-
-    @RequestMapping("/updateStatus")
-    public HttpRespMsg updateStatus(Integer id,
-                                      Integer status, LocalDate finishDate) {
-
-        return projectService.updateStatus(id, status,finishDate, request);
-    }
-
-
-    /**
-     * 删除项目
-     * id 要删除的项目的id
-     */
-    @RequestMapping("/deleteProject")
-    public HttpRespMsg deleteProject(@RequestParam Integer id, @RequestParam(required = false, defaultValue = "0") Integer force) {
-        return projectService.deleteProject(id, force);
-    }
-
-    /**
-     * 获取查询者所在公司每个项目的工时成本
-     */
-    @RequestMapping("/getTimeCost")
-    public HttpRespMsg getTimeCost(String startDate, String endDate, String userId) {
-        return projectService.getTimeCost(startDate, endDate, userId, request);
-    }
-
-    /**
-     * 导出查询者所在公司每个项目的工时成本
-     */
-    @RequestMapping("/exportTimeCost")
-    public HttpRespMsg exportTimeCost(String startDate, String endDate, Integer projectId, String userId, Boolean projectSum) {
-        return projectService.exportTimeCost(startDate, endDate, projectId, userId, projectSum, request);
-    }
-
-    /**
-     * 获取查询者所在公司每个项目的自定义数值累计
-     */
-    @RequestMapping("/getCustomDataSum")
-    public HttpRespMsg getCustomDataSum(String startDate, String endDate, String userId) {
-        return projectService.getCustomDataSum(startDate, endDate, userId, request);
-    }
-
-    @RequestMapping("/exportCustomDataSum")
-    public HttpRespMsg exportCustomDataSum(String startDate, String endDate, Integer projectId, String userId) {
-        return projectService.exportCustomDataSum(startDate, endDate, projectId, userId, request);
-    }
-
-    /**
-     * 获取某个项目每个人分别需要的工时
-     * id 项目id
-     */
-    @RequestMapping("/getProjectCost")
-    public HttpRespMsg getProjectCost(String startDate, String endDate, @RequestParam Integer id) {
-        return projectService.getProjectCost(startDate, endDate, id, request);
-    }
-
-    /**
-     * 获取项目内的阶段汇总统计工时成本
-     * @param startDate
-     * @param endDate
-     * @param id 项目id
-     * @return
-     */
-    @RequestMapping("/getCostInStage")
-    public HttpRespMsg getCostInStage(String startDate, String endDate, @RequestParam Integer id) {
-        return projectService.getCostInStage(startDate, endDate, id, request);
-    }
-
-    @RequestMapping("/getAllMembCost")
-    public HttpRespMsg getAllMembCost(String startDate, String endDate, Integer id) {
-        return projectService.getAllMembCost(startDate, endDate, id, request);
-    }
-
-    /**
-     * 获取项目详细信息
-     * @param id
-     * @return
-     */
-    @RequestMapping("/detail")
-    public HttpRespMsg detail(@RequestParam Integer id) {
-        return projectService.detail(id, request);
-    }
-
-    /**
-     * 项目统计任务数量分布
-     * @param id
-     * @return
-     */
-    @RequestMapping("/taskSum")
-    public HttpRespMsg taskSum(@RequestParam Integer id) {
-        return projectService.taskSum(id, request);
-    }
-
-    @RequestMapping("/finish")
-    public HttpRespMsg finish(Integer id) {
-        Project project = new Project();
-        project.setId(id);
-        project.setStatus(2);
-        project.setFinishDate(LocalDate.now());
-        projectService.updateById(project);
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/cancel")
-    public HttpRespMsg cancel(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        Project old = projectService.getById(id);
-        if (old.getStatus() == 2) {
-            msg.setError("该项目已完成，无法撤销");
-        } else {
-            Project project = new Project();
-            project.setId(id);
-            project.setStatus(3);
-            projectService.updateById(project);
-        }
-
-        return msg;
-    }
-
-    @RequestMapping("/start")
-    public HttpRespMsg start(Integer id) {
-        projectService.restartProject(id);
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/addMemb")
-    public HttpRespMsg addMemb(Integer id, String[] userId) {
-        return projectService.addMemb(id, userId);
-    }
-
-    @RequestMapping("/exportProfit")
-    public HttpRespMsg exportProfit() {
-        return projectService.exportProfit(request);
-    }
-
-    //导出项目报表
-    @RequestMapping("/exportProject")
-    public HttpRespMsg exportProject() {
-        return projectService.exportProject(request);
-    }
-
-    //分页查询项目任务报表
-    @RequestMapping("/getProjectTask")
-    public HttpRespMsg getProjectTask(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getProjectTask(pageIndex, pageSize, request);
-    }
-
-    //分页查询项目各个阶段的汇总工时成本
-    @RequestMapping("/getProjectStagesCost")
-    public HttpRespMsg getProjectStagesCost(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getProjectStagesCost(pageIndex, pageSize, request);
-    }
-    @RequestMapping("/exportProjectStagesCost")
-    public HttpRespMsg exportProjectStagesCost() {
-        return projectService.exportProjectStagesCost(request);
-    }
-    //导出项目任务报表
-    @RequestMapping("/exportProjectTask")
-    public HttpRespMsg exportProjectTask() {
-        return projectService.exportProjectTask(request);
-    }
-
-    //分页查询项目成本报表
-    @RequestMapping("/getAllProjectCost")
-    public HttpRespMsg getAllProjectCost(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getAllProjectCost(pageIndex, pageSize, request);
-    }
-    //导出项目成本报表
-    @RequestMapping("/exportAllProjectCost")
-    public HttpRespMsg exportAllProjectCost() {
-        return projectService.exportAllProjectCost(request);
-    }
-
-
-    //分页查询项目收支平衡表
-    @RequestMapping("/getProjectInAndOut")
-    public HttpRespMsg getProjectInAndOut(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getProjectInAndOut(pageIndex, pageSize, request);
-    }
-
-
-    //导出项目收支平衡表
-    @RequestMapping("/exportProjectInAndOut")
-    public HttpRespMsg exportProjectInAndOut() {
-        return projectService.exportProjectInAndOut(request);
-    }
-
-    //分页查询客户项目统计报表
-    @RequestMapping("/getCustomerProjectInAndOut")
-    public HttpRespMsg getCustomerProjectInAndOut(@RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        return projectService.getCustomerProjectInAndOut(pageIndex, pageSize, request);
-    }
-    //导出项目收支平衡表
-    @RequestMapping("/exportCustomerProjectInAndOut")
-    public HttpRespMsg exportCustomerProjectInAndOut() {
-        return projectService.exportCustomerProjectInAndOut(request);
-    }
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(String userId, MultipartFile file, HttpServletRequest request) {
-        return projectService.importData(userId, file, request);
-    }
-
-    @RequestMapping("/getGanttData")
-    public HttpRespMsg getGanttData(@RequestParam(required = false, defaultValue = "0") Integer type, String startDate, String endDate, String userId, Integer projectId, HttpServletRequest request) {
-        return projectService.getGanttData(type, startDate, endDate, userId, projectId, request);
-    }
-
-    /**
-     *
-     * @param projectId 项目id, 非必传
-     * @param startDate 开始日期 必传
-     * @param endDate  结束日期 必传
-     * @return
-     */
-    @RequestMapping("/getOvertimeList")
-    public HttpRespMsg getOvertimeList(Integer projectId, String startDate, String endDate) {
-        return projectService.getOvertimeList(projectId, startDate, endDate, request);
-    }
-
-
-    /**
-     * 导出加班统计报表
-     * @param projectId
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    @RequestMapping("/exportOvertimeList")
-    public HttpRespMsg exportOvertimeList(Integer projectId, String startDate, String endDate) {
-        return projectService.exportOvertimeList(projectId, startDate, endDate, request);
-    }
-
-    /**
-     * 获取项目相关的维度数据列表
-     * @param projectId
-     * @return
-     */
-    @RequestMapping("/getDegreeList")
-    public HttpRespMsg getDegreeList(Integer projectId) {
-        Project project = projectService.getById(projectId);
-        String associateDegrees = project.getAssociateDegrees();
-        String names = project.getAssociateDegreeNames();
-        HttpRespMsg msg = new HttpRespMsg();
-        List<HashMap> list = new ArrayList<>();
-        if (!StringUtils.isEmpty(associateDegrees)) {
-            String[] id = associateDegrees.split("\\,");
-            String[] n = names.split("\\,");
-            for (int i=0;i<id.length; i++) {
-                HashMap map = new HashMap();
-                map.put("id", id[i]);
-                map.put("name", n[i]);
-                list.add(map);
-            }
-        }
-        msg.data = list;
-        return msg;
-    }
-
-    /**
-     * 获取查询者所在公司每个自定义维度的工时成本
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @param projectId 项目id, 可不传
-     */
-    @RequestMapping("/getDegreeCost")
-    public HttpRespMsg getDegreeCost(String startDate, String endDate, Integer projectId) {
-        return projectService.getDegreeCost(startDate, endDate, projectId, request);
-    }
-
-    @RequestMapping("exportData")
-    public HttpRespMsg exportData() {
-        return projectService.exportData(request);
-    }
-
-    @RequestMapping("/getMyUsers")
-    public HttpRespMsg getMyUsers() {
-        return projectService.getMyUsers(request);
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/project-docfolder")
-public class ProjectDocfolderController {
-
-}
-

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

@@ -1,321 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.constant.Constant;
-import com.management.platform.entity.PdfFile;
-import com.management.platform.entity.ProjectDocfolder;
-import com.management.platform.entity.ProjectDocument;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.PdfFileMapper;
-import com.management.platform.mapper.ProjectDocfolderMapper;
-import com.management.platform.mapper.ProjectDocumentMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectDocumentService;
-import com.management.platform.util.DocumentTypeUtil;
-import com.management.platform.util.FileUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.OpenOfficeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/document")
-public class ProjectDocumentController {
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private ProjectDocumentMapper projectDocumentMapper;
-    @Resource
-    private ProjectDocumentService projectDocumentService;
-    @Resource
-    private ProjectDocfolderMapper projectDocfolderMapper;
-    @Resource
-    private PdfFileMapper pdfFileMapper;
-    @Value("${upload.path}")
-    private String uploadPath;
-
-    /**
-     * 上传文件
-     * @param projectId 项目id
-     * @param folderId 文件夹id
-     * @param files 上传的文件
-     * @param response
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value="uploadDocument")
-    public HttpRespMsg uploadDocument(
-            @RequestParam Integer projectId,
-            @RequestParam(required=false) Integer folderId,
-            @RequestParam("file") MultipartFile[] files,
-            HttpServletResponse response) throws Exception {
-        HttpRespMsg msg = new HttpRespMsg();
-        User user = (User) userMapper.selectById(request.getHeader("Token"));
-
-//        OpenOfficeService openOfficeService = new OpenOfficeService();
-//        List<Part> partLists = partMapper.selectList(new QueryWrapper<Part>().eq("mould_id", userVO.getMouldId()));
-//        openOfficeService.start();
-        ExecutorService fixedThreadPool = Executors.newFixedThreadPool(3);
-        for (MultipartFile file : files) {
-            ProjectDocument record = new ProjectDocument();
-            record.setCreatorId(user.getId());
-            record.setCreatorName(user.getName());
-            record.setDocumentName(file.getOriginalFilename());
-            record.setFolderId(folderId);
-            record.setProjectId(projectId);
-            if (file != null && !file.isEmpty()) {
-                //截取文件后缀
-                String fileSuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
-                record.setDocumentType(DocumentTypeUtil.DocumentType(fileSuffix));
-                //处理文件
-                File dir = new File(uploadPath);
-                if (!dir.exists()) {
-                    dir.mkdir();
-                }
-                String fileName= "";
-                if (file!=null && !file.isEmpty()) {
-                    fileName = file.getOriginalFilename();
-
-                    int pos = fileName.lastIndexOf(".");
-                    String suffix = fileName.substring(pos).toLowerCase();
-                    //用uuid替换原始的文件名
-                    String purFName = UUID.randomUUID().toString().replaceAll("-", "");
-                    fileName = purFName + suffix;
-                    File saveFile = new File(dir, fileName);
-                    try {
-                        saveFile.createNewFile();
-                        file.transferTo(saveFile);
-                        //计算文件大小
-                        long fileSize = saveFile.length();
-                        String fileLength = FileUtil.getReadableFileSize(fileSize);
-                        record.setServerName(uploadPath + fileName);
-                        record.setSize(fileLength);
-                        String pathPrefix = "/upload/";
-                        record.setUrl(pathPrefix + fileName);
-                        //上传图片到OSS
-//                        OSSClient ossClient=AliyunOSSClientUtil.getOSSClient();
-//                        String md5key = AliyunOSSClientUtil.uploadObject2OSS(ossClient, saveFile, OSSClientConstants.BUCKET_NAME, OSSClientConstants.FOLDER);
-//                        String url = AliyunOSSClientUtil.getFullUrl(fileName);
-//                        record.setUrl(url);
-                        projectDocumentMapper.insert(record);
-                        String path = uploadPath;
-//                        if (OpenOfficeService.canTransferToPdf(suffix)) {
-//                            //上传完，需要生成pdf
-//                            String dFile1 = path + UUID.randomUUID().toString().replaceAll("-", "") + ".pdf";
-//                            File newFile = new File(dFile1);
-//                            if (!newFile.exists()) {
-//                                openOfficeService.office2PDF(path + fileName, dFile1);
-//                                PdfFile pdfFile = new PdfFile();
-//                                pdfFile.setPdfUrl(pathPrefix + dFile1.substring(path.length()));
-//                                pdfFile.setFileId(record.getId());
-//                                pdfFile.setType(1);
-//                                pdfFile.setSourceFileUrl(record.getUrl());
-//                                pdfFileMapper.insert(pdfFile);
-//                            }
-//                        }
-
-                        //生成原文件名称与服务器文件名称对应
-                        msg.data = record;
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        fileName = null;
-                        msg.setError(e.getMessage()+", path="+dir.getAbsolutePath());
-                    }
-                } else {
-                    msg.setError("文件不存在");
-                }
-            }
-        }
-
-        return msg;
-    }
-    //在线预览
-    //inputFilePath 文件路径
-    @RequestMapping(value="onlineShow")
-    public HttpRespMsg onlineShow(@RequestParam String inputFilePath) {
-        String destFileName = inputFilePath.substring(0, inputFilePath.lastIndexOf(".")+1)+"pdf";
-        File dir = new File(uploadPath);
-        if (!dir.exists()) {
-            dir.mkdir();
-        }
-
-        HttpRespMsg msg = new HttpRespMsg();
-        Map<String,String> map = new HashMap<String,String>();
-        File destFile = new File(dir, destFileName);
-        if(destFile.exists()) {
-            //文件已存在直接显示
-            map.put("pdfFileName", uploadPath + destFile.getName());
-        }else {
-            //文件不存在，转化后显示
-            OpenOfficeService service = new OpenOfficeService();
-            service.start();
-            File inputFile = new File(dir, inputFilePath);
-            Integer state = service.office2PDF(inputFile.getAbsolutePath(),destFile.getAbsolutePath());
-            if(state == 0){
-                //转换成功
-                map.put("pdfFileName", uploadPath + destFile.getName());
-            }else {
-                //转换失败
-            }
-            service.shutdown();
-        }
-        msg.data = map;
-        return msg;
-    }
-    @RequestMapping(value="delete")
-    public HttpRespMsg delDocument(@RequestParam Integer id, Integer isFolder) {
-        ProjectDocument record = new ProjectDocument();
-        record.setId(id);
-        record.setIsDeleted(1);
-        projectDocumentMapper.updateById(record);
-        //全部子文件都移到回收站
-        if (isFolder == 1) {
-            deleteSubFiles(record);
-        }
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data="删除成功";
-        return msg;
-    }
-
-    private void deleteSubFiles(ProjectDocument record) {
-        List<ProjectDocument> projectDocumentList = projectDocumentMapper.selectList(new QueryWrapper<ProjectDocument>().eq("folder_id", record.getId()));
-        projectDocumentList.forEach(p->{
-            //删除自己
-            ProjectDocument d = new ProjectDocument();
-            d.setId(p.getId());
-            d.setIsDeleted(1);
-            projectDocumentMapper.updateById(d);
-
-            if (p.getIsFolder() == 1) {
-                deleteSubFiles(p);
-            }
-        });
-    }
-
-    @RequestMapping(value="createDocument")
-    public HttpRespMsg createDocument(Integer id, Integer projectId, String documentName, Integer folderId, Integer isFolder) {
-        User user = userMapper.selectById(request.getHeader("Token"));
-        ProjectDocument record = new ProjectDocument();
-        record.setId(id);
-        record.setIsFolder(isFolder);
-        record.setDocumentName(documentName);
-        record.setFolderId(folderId);
-        record.setProjectId(projectId);
-        record.setCreatorId(user.getId());
-        record.setCreatorName(user.getName());
-        projectDocumentService.saveOrUpdate(record);
-        HttpRespMsg msg = new HttpRespMsg();
-        return msg;
-    }
-
-    /**
-     * 最近更新文件列表
-     * projectId 项目id
-     */
-    @RequestMapping(value="recentlyList")
-    public HttpRespMsg getRecentlyList(@RequestParam String projectId) {
-        QueryWrapper<ProjectDocument> exp = new QueryWrapper<ProjectDocument>();
-        exp.eq("project_id", projectId).eq("is_deleted", 0).eq("is_folder", 0).orderByDesc("indate").last("limit 20");
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = projectDocumentMapper.selectList(exp);
-        return msg;
-    }
-    /**
-     * 所有文件列表
-     * projectId 项目id
-     */
-    @RequestMapping(value="allList")
-    public HttpRespMsg getAllList(Integer projectId, Integer parentFid) {
-        //检查，如果是首次使用没有数据，需要创建数据
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-        if (parentFid == null) {
-            QueryWrapper<ProjectDocument> firstQuery = new QueryWrapper<ProjectDocument>();
-            firstQuery.eq("project_id", projectId);
-            if (projectDocumentMapper.selectCount(firstQuery) == 0) {
-                String[] names = new String[]{"立项准备材料","项目过程文档","项目交付件"};
-                for (String name : names) {
-                    ProjectDocument doc = new ProjectDocument();
-                    doc.setProjectId(projectId);
-                    doc.setIsFolder(1);
-                    doc.setDocumentName(name);
-                    doc.setCreatorId(userId);
-                    doc.setCreatorName(user.getName());
-                    projectDocumentMapper.insert(doc);
-                }
-            }
-        }
-
-
-        QueryWrapper<ProjectDocument> exp = new QueryWrapper<ProjectDocument>();
-        exp.eq("project_id", projectId).ne("is_deleted",1);
-
-        if (parentFid != null) {
-            exp.eq("folder_id", parentFid);
-        } else {
-            exp.isNull("folder_id");
-        }
-        exp.orderByDesc("is_folder","indate");
-        List<ProjectDocument> docList = projectDocumentMapper.selectList(exp);
-        Map<String,Object> map = new HashMap<String,Object>();
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data=docList;
-        return msg;
-    }
-    /**
-     * 子文件及文件夹列表
-     * projectId 项目id
-     */
-    @RequestMapping(value="sonList")
-    public HttpRespMsg getsonList(@RequestParam("parentFid") Integer folderId, @RequestParam String projectId) {
-        QueryWrapper<ProjectDocument> exp = new QueryWrapper<ProjectDocument>();
-        exp.eq("project_id", projectId).ne("is_deleted",1).eq("folder_id", folderId);
-        exp.orderByDesc("indate");
-        List<ProjectDocument> docList = projectDocumentMapper.selectList(exp);
-        QueryWrapper<ProjectDocfolder> gde = new QueryWrapper<ProjectDocfolder>();
-        gde.eq("project_id", projectId).eq("parent_fid", folderId);
-        gde.orderByDesc("update_time");
-        List<ProjectDocfolder> folderList = projectDocfolderMapper.selectList(gde);
-        Map<String,Object>map = new HashMap<String,Object>();
-        map.put("docList", docList);
-        map.put("folderList", folderList);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data=map;
-        return msg;
-    }
-}
-

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

@@ -1,72 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectNotifyUser;
-import com.management.platform.service.ProjectNotifyUserService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-09-01
- */
-@RestController
-@RequestMapping("/project-notify-user")
-public class ProjectNotifyUserController {
-    @Resource
-    ProjectNotifyUserService projectNotifyUserService;
-
-    @RequestMapping("/modify")
-    public HttpRespMsg add(Integer projectId, String chosenLeaders) {
-        HttpRespMsg msg = new HttpRespMsg();
-        projectNotifyUserService.remove(new QueryWrapper<ProjectNotifyUser>().eq("project_id", projectId));
-
-        if (chosenLeaders != null && chosenLeaders.length() > 0) {
-            JSONArray array = JSONArray.parseArray(chosenLeaders);
-            List<ProjectNotifyUser> notifyUsers = new ArrayList<>();
-            for (int i = 0;i<array.size(); i++) {
-                JSONObject jsonObject = array.getJSONObject(i);
-                ProjectNotifyUser projectNotifyUser = JSONObject.toJavaObject(jsonObject, ProjectNotifyUser.class);
-                projectNotifyUser.setProjectId(projectId);
-                notifyUsers.add(projectNotifyUser);
-            }
-            projectNotifyUserService.saveBatch(notifyUsers);
-        }
-        return msg;
-
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        boolean success = projectNotifyUserService.removeById(id);
-        if (!success) {
-            msg.setError("记录不存在，操作失败");
-        }
-        return msg;
-    }
-
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data= projectNotifyUserService.list(new QueryWrapper<ProjectNotifyUser>().eq("project_id", projectId));
-        return msg;
-    }
-
-
-
-}
-

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

@@ -1,45 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.ProjectPercentageService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-02-26
- */
-@RestController
-@RequestMapping("/project-percentage")
-public class ProjectPercentageController {
-
-    @Resource
-    private ProjectPercentageService projectPercentageService;
-
-    @RequestMapping("/saveMonthSetting")
-    public HttpRespMsg saveMonthSetting(String projectCols, String userSettings, String ymonth) {
-        return projectPercentageService.saveMonthSetting(projectCols, userSettings, ymonth);
-    }
-
-    @RequestMapping("/getMonthSetting")
-    public HttpRespMsg getMonthSetting(String ymonth) {
-        return projectPercentageService.getMonthSetting(ymonth);
-    }
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(Integer companyId, Integer withCheckIn,
-                                  MultipartFile file, HttpServletRequest request){
-        return projectPercentageService.importData(companyId,withCheckIn, file, request);
-    }
-}
-

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

@@ -1,57 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.PpMembs;
-import com.management.platform.entity.ProjectProfession;
-import com.management.platform.mapper.ProjectProfessionMapper;
-import com.management.platform.service.ProjectProfessionService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-28
- */
-@RestController
-@RequestMapping("/project-profession")
-public class ProjectProfessionController {
-    @Resource
-    ProjectProfessionService projectProfessionService;
-    @RequestMapping("/modify")
-    public HttpRespMsg modify(Integer projectId, String json) {
-        projectProfessionService.modify(projectId, json);
-        return projectProfessionService.get(projectId);
-    }
-
-    //获取项目相关的工程专业列表
-    @RequestMapping("/get")
-    public HttpRespMsg get(Integer projectId) {
-        return projectProfessionService.get(projectId);
-    }
-
-    //获取项目相关的工程专业列表
-    @RequestMapping("/getMyProfession")
-    public HttpRespMsg getMyProfession(Integer projectId) {
-        return projectProfessionService.getMyProfession(projectId);
-    }
-
-    @RequestMapping("/getProgressData")
-    public HttpRespMsg getProgressData(Integer projectId) {
-        return projectProfessionService.getProgressData(projectId);
-    }
-
-}
-

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

@@ -1,148 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectTimer;
-import com.management.platform.entity.Report;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.ProjectTimerMapper;
-import com.management.platform.mapper.ReportMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
-import com.management.platform.util.HttpRespMsg;
-import org.apache.log4j.helpers.DateTimeDateFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-03-17
- */
-@RestController
-@RequestMapping("/project-timer")
-public class ProjectTimerController {
-    @Resource
-    private ProjectTimerMapper projectTimerMapper;
-    @Resource
-    private ReportMapper reportMapper;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private HttpServletRequest request;
-
-    /**
-     * 获取定时器
-     */
-    @RequestMapping("/getMyTimer")
-    public HttpRespMsg getMyTimer() {
-        QueryWrapper<ProjectTimer> query = new QueryWrapper<ProjectTimer>();
-        String userId = request.getHeader("Token");
-
-        query.eq("user_id", userId);
-        query.orderByDesc("id");
-        HttpRespMsg msg = new HttpRespMsg();
-        List<ProjectTimer> list = projectTimerMapper.selectList(query);
-        LocalDateTime now = LocalDateTime.now();
-        list.forEach(t->{
-            if (t.getEndTime() == null) {
-                t.setTimer(now.toEpochSecond(ZoneOffset.ofHours(8)) - t.getStartTime().toEpochSecond(ZoneOffset.ofHours(8)));
-            } else {
-                t.setTimer(t.getEndTime().toEpochSecond(ZoneOffset.ofHours(8)) - t.getStartTime().toEpochSecond(ZoneOffset.ofHours(8)));
-            }
-        });
-        msg.data = list;
-        return msg;
-    }
-
-    @RequestMapping("/addTimer")
-    public HttpRespMsg addTimer(ProjectTimer timer) {
-        String userId = request.getHeader("Token");
-        timer.setUserId(userId);
-        timer.setStartTime(LocalDateTime.now());
-        projectTimerMapper.insert(timer);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = timer;
-        return msg;
-    }
-
-
-    @RequestMapping("/deleteTimer")
-    public HttpRespMsg deleteTimer(Integer id) {
-        String userId = request.getHeader("Token");
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权删除");
-        } else {
-            projectTimerMapper.deleteById(id);
-        }
-        return msg;
-    }
-
-
-    @RequestMapping("/endTimer")
-    public HttpRespMsg endTimer(Integer id) {
-        String userId = request.getHeader("Token");
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权结束");
-        } else {
-            timer.setEndTime(LocalDateTime.now());
-            projectTimerMapper.updateById(timer);
-            msg.data = timer;
-        }
-        return msg;
-    }
-
-    @RequestMapping("/tranferToReport")
-    public HttpRespMsg tranferToReport(Integer id, String content) {
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-        HttpRespMsg msg = new HttpRespMsg();
-        ProjectTimer timer = projectTimerMapper.selectById(id);
-        if (!timer.getUserId().equals(userId)) {
-            msg.setError("非创建人无权操作");
-        } else {
-            //创建日报
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("HH:mm");
-            Report report = new Report();
-            report.setSubProjectId(timer.getSubProjectId());
-            report.setProjectId(timer.getProjectId());
-            report.setCreatorId(timer.getUserId());
-            report.setContent(content);
-            report.setCreateDate(timer.getStartTime().toLocalDate());
-            report.setStartTime(df.format(timer.getStartTime()));
-            report.setEndTime(df.format(timer.getEndTime()));
-            report.setReportTimeType(2);//2-按时间段录入
-            //计算时长
-            long time = timer.getEndTime().toEpochSecond(ZoneOffset.ofHours(8)) - timer.getStartTime().toEpochSecond(ZoneOffset.ofHours(8));
-            int minutes = (int)time/60;
-            double hours = (minutes*1.0f/60);
-            report.setWorkingTime(hours);
-            report.setCost(user.getCost().multiply(new BigDecimal(hours)));
-
-            reportMapper.insert(report);
-            timer.setReportId(report.getId());
-            projectTimerMapper.updateById(timer);
-            msg.data = timer;
-        }
-        return msg;
-    }
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-19
- */
-@RestController
-@RequestMapping("/project-user-salary")
-public class ProjectUserSalaryController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-24
- */
-@RestController
-@RequestMapping("/report-alog-membdate")
-public class ReportAlogMembdateController {
-
-}
-

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

@@ -1,89 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.ReportAlogMembdate;
-import com.management.platform.entity.ReportAuditLog;
-import com.management.platform.entity.ReportImportLog;
-import com.management.platform.entity.User;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.ReportAlogMembdateMapper;
-import com.management.platform.mapper.ReportAuditLogMapper;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-24
- */
-@RestController
-@RequestMapping("/report-audit-log")
-public class ReportAuditLogController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    ReportAuditLogMapper reportAuditLogMapper;
-    @Resource
-    ReportAlogMembdateMapper reportAlogMembdateMapper;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-
-    @RequestMapping("getImportAuditLog")
-    public HttpRespMsg getImportAuditLog(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        HttpRespMsg msg = new HttpRespMsg();
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "导入日报审核记录");
-        if (functionList.size() > 0) {
-            QueryWrapper<ReportAuditLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("company_id", companyId).eq("audit_channel", 0).orderByDesc("indate");
-            IPage<ReportAuditLog> iPage = reportAuditLogMapper.selectPage(new Page<>(pageIndex, pageSize),
-                    queryWrapper);
-            List<ReportAuditLog> list = iPage.getRecords();
-            if (list.size() > 0) {
-                //还有获取各项的人员日期名单
-                List<Integer> ids = list.stream().map(ReportAuditLog::getId).collect(Collectors.toList());
-
-                List<ReportAlogMembdate> membList = reportAlogMembdateMapper.selectList(new QueryWrapper<ReportAlogMembdate>().in("rlog_id", ids));
-                list.forEach(l->{
-                    l.setMembdateList(membList.stream().filter(m->m.getRlogId().equals(l.getId())).collect(Collectors.toList()));
-                });
-            }
-
-            Long total = iPage.getTotal();
-            Map<String, Object> map = new HashMap<>();
-            map.put("records", list);
-            map.put("total", total);
-            msg.data = map;
-        } else {
-            Map<String, Object> map = new HashMap<>();
-            map.put("records", new ArrayList<>());
-            map.put("total", 0);
-            msg.data = map;
-        }
-        return msg;
-    }
-}
-

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

@@ -1,885 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.util.StringUtil;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.entity.vo.WorktimeItem;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ReportService;
-import com.management.platform.service.UserSalaryService;
-import com.management.platform.service.UserService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import com.management.platform.util.WorkDayCalculateUtils;
-import org.apache.log4j.helpers.DateTimeDateFormat;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.DayOfWeek;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2019-12-31
- */
-@RestController
-@RequestMapping("/report")
-public class ReportController {
-    @Autowired
-    private ReportService reportService;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private AuditWorkflowTimeSettingMapper auditWorkflowTimeSettingMapper;
-    @Resource
-    private UserService userService;
-    @Resource
-    private DepartmentMapper departmentMapper;
-    @Resource
-    private UserSalaryService userSalaryService;
-    @Resource
-    private TimeTypeMapper timeTypeMapper;
-    @Resource
-    private ProjectMapper projectMapper;
-    @Resource
-    private SysFunctionMapper sysFunctionMapper;
-
-
-
-    /**
-     * 根据时间 按照人分类 获取报告信息
-     * date 日期 格式yyyy-mm-dd
-     */
-    @RequestMapping("/getReportFillStatus")
-    public HttpRespMsg getReportFillStatus(String startDate, String endDate, String userId) {
-        return reportService.getReportFillStatus(startDate, endDate, userId, request);
-    }
-
-    @RequestMapping("/getReportList")
-    public HttpRespMsg getReportList(@RequestParam String date, @RequestParam(required = false) Integer deptId, @RequestParam(required = false) String userId) {
-        return reportService.getReportList(date, deptId, userId, request);
-    }
-
-    /**
-     * 导出报告
-     * date 日期 格式yyyy-mm-dd
-     */
-    @RequestMapping("/exportReport")
-    public HttpRespMsg exportReport(String startDate, String endDate, Integer projectId) {
-        return reportService.exportReport(startDate, endDate, projectId, request);
-    }
-
-
-    /**
-     * 根据时间 获取本人报告信息 以及工时
-     * date 日期 格式yyyy-mm-dd
-     */
-    @RequestMapping("/getReport")
-    public HttpRespMsg getReport(@RequestParam String date) {
-        return reportService.getReport(date, request);
-    }
-
-    private void fillReportProgress(Report report, String professionProgress) {
-        if (!StringUtil.isEmpty(professionProgress)) {
-            professionProgress = professionProgress.replaceAll("@",",");
-            System.out.println("JSON=="+professionProgress);
-            JSONArray array = JSONArray.parseArray(professionProgress);
-            List<ReportProfessionProgress> list = new ArrayList<ReportProfessionProgress>();
-            for(int i=0;i<array.size();i++) {
-                JSONObject jsonObject = array.getJSONObject(i);
-                ReportProfessionProgress item = new ReportProfessionProgress();
-                item.setProfessionId(jsonObject.getInteger("professionId"));
-                item.setProgress(jsonObject.getInteger("progress"));
-                item.setProjectId(report.getProjectId());
-                list.add(item);
-            }
-            report.setProfessionProgressList(list);
-        }
-    }
-
-
-    /**
-     * 新增或编辑报告
-     * id 报告id 数组
-     * projectId 报告相关项目id 数组
-     * workingTime 工作时间 数组
-     * content 工作内容 数组
-     * createDate 报告日期 数组
-     * draft 草稿
-     */
-    @RequestMapping("/editReport")
-    public HttpRespMsg editReport(Integer[] id, Integer[] projectId,
-                                  Integer[] subProjectId,
-                                  Double[] workingTime,
-                                  String[] content,
-                                  Integer[] timeType,
-                                  String[] startTime,
-                                  String[] endTime,
-                                  Integer[] reportTimeType,
-                                  String[] createDate,
-                                  Integer[] taskId,
-                                  Integer[] isOvertime,
-                                  Integer[] progress,
-                                  String[] targetUids,
-                                  String[] professionProgress,
-                                  String[] stage,
-                                  String[] pics,
-                                  Integer[] multiWorktime,
-                                  Integer[] degreeId,
-                                  @RequestParam(required = false, defaultValue = "0") Integer draft,
-                                  Integer[] groupId,//任务分组id
-                                  Double[] customData,//自定义的数值
-                                  String[] projectAuditorId
-                                    ) {
-        List<Report> reportList = new ArrayList<>();
-        String token = request.getHeader("Token");
-        List<String> targetUidList = null;
-        List<User> targetUserList = null;
-        if (projectId == null) {
-            HttpRespMsg msg = new HttpRespMsg();
-            msg.setError("项目不能为空");
-            return msg;
-        }
-        if (subProjectId == null) {
-            System.out.println("!!===!!有空的子项目");
-            subProjectId = new Integer[projectId.length];
-            for(int i=0;i<subProjectId.length; i++) {
-                subProjectId[i] = 0;
-            }
-        }
-        //初始化，防止老版本无此字段奔溃报错
-        if (multiWorktime == null) {
-            multiWorktime = new Integer[projectId.length];
-            for(int i=0;i<multiWorktime.length; i++) {
-                multiWorktime[i] = 0;
-            }
-        }
-        if (degreeId == null) {
-            degreeId = new Integer[projectId.length];
-            for(int i=0;i<degreeId.length; i++) {
-                degreeId[i] = -1;
-            }
-        }
-        if (groupId == null) {
-            groupId = new Integer[projectId.length];
-            for(int i=0;i<groupId.length; i++) {
-                groupId[i] = 0;
-            }
-        }
-        if (customData == null) {
-            customData = new Double[projectId.length];
-            for(int i=0;i<customData.length; i++) {
-                customData[i] = 0.0;
-            }
-        }
-        if (projectAuditorId == null) {
-            projectAuditorId = new String[projectId.length];
-            for(int i=0;i<projectAuditorId.length; i++) {
-                projectAuditorId[i] = null;
-            }
-        }
-
-        //检查项目是否截止
-        List<Integer> integers = Arrays.asList(projectId);
-        DateTimeFormatter localDtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", integers));
-        for (int i=0;i<projectId.length; i++) {
-            int pid = projectId[i];
-            Optional<Project> findP = projectList.stream().filter(p->p.getId().equals(pid)).findFirst();
-            if (findP.isPresent()) {
-                Project curP = findP.get();
-                if (!createDate[i].contains("@")) {
-                    if (curP.getStatus() == 2) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+curP.getProjectName()+"]已完成。");
-                        return msg;
-                    }
-                    if (curP.getStatus() == 3) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+curP.getProjectName()+"]已撤销。");
-                        return msg;
-                    }
-                    if (curP.getPlanEndDate() != null && curP.getPlanEndDate().isBefore(LocalDate.parse(createDate[i], localDtf))) {
-                        HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("项目["+curP.getProjectName()+"]截止于"+localDtf.format(curP.getPlanEndDate())+"，请修改。");
-                        return msg;
-                    }
-                } else {
-                    //批量填报
-                    String[] dateArr = createDate[i].split("@");
-                    for (String curDate : dateArr) {
-                        if (curP.getStatus() == 2) {
-                            HttpRespMsg msg = new HttpRespMsg();
-                            msg.setError("项目["+curP.getProjectName()+"]已完成。");
-                            return msg;
-                        }
-                        if (curP.getStatus() == 3) {
-                            HttpRespMsg msg = new HttpRespMsg();
-                            msg.setError("项目["+curP.getProjectName()+"]已撤销。");
-                            return msg;
-                        }
-                        if (curP.getPlanEndDate() != null && curP.getPlanEndDate().isBefore(LocalDate.parse(curDate, localDtf))) {
-                            HttpRespMsg msg = new HttpRespMsg();
-                            msg.setError("项目["+curP.getProjectName()+"]截止于"+localDtf.format(curP.getPlanEndDate())+"，请修改。");
-                            return msg;
-                        }
-                    }
-                }
-            }
-        }
-
-        //自动填充项目审核人
-        for (int i=0;i<projectAuditorId.length; i++) {
-            if (projectAuditorId[i] == null) {
-                final int index = i;
-                projectAuditorId[i] = projectList.stream().filter(p->p.getId().equals(projectId[index])).findFirst().get().getInchargerId();
-            }
-        }
-
-        //代填
-        if (targetUids != null && targetUids.length > 0) {
-            String val = targetUids[0];
-            String[] ids = val.split("@");
-            targetUidList = new ArrayList<>();
-            for (int i = 0; i < ids.length; i++) {
-                targetUidList.add(ids[i]);
-            }
-            targetUserList = userService.list(new QueryWrapper<User>().in("id", targetUidList));
-        }
-        User user = userService.getById(token);
-        LocalDate now = LocalDate.now();
-        DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        BigDecimal hourCost = null;
-        //自己填写的情况，计算个人自己的时薪
-        if (targetUidList == null) {
-            if (user.getCostApplyDate() != null) {
-                //检查有效期
-                if (user.getCostApplyDate().compareTo(dtf.format(now)) > 0) {
-                    //取上一个历史成本
-                    List<UserSalary> list = userSalaryService.list(new QueryWrapper<UserSalary>().eq("user_id", user.getId()).orderByDesc("indate").last("limit 2"));
-                    if (list.size() > 1) {
-                        hourCost = list.get(1).getCost();
-                    } else {
-                        //没有记录，又没有达到预设的起效时间，则默认为0
-                        hourCost = new BigDecimal(0);
-                    }
-                } else {
-                    hourCost = user.getCost();
-                }
-            } else {
-                hourCost = user.getCost();
-            }
-
-            if (hourCost == null) {
-                hourCost = new BigDecimal(0);
-            }
-        } else {
-            //代填的情况，计算每个人的时薪
-            for (User subsUser : targetUserList) {
-                BigDecimal tempCost = new BigDecimal(0);
-                if (subsUser.getCostApplyDate() != null) {
-                    //检查有效期
-                    if (subsUser.getCostApplyDate().compareTo(dtf.format(now)) > 0) {
-                        //取上一个历史成本
-                        List<UserSalary> list = userSalaryService.list(new QueryWrapper<UserSalary>().eq("user_id", subsUser.getId()).orderByDesc("indate").last("limit 2"));
-                        if (list.size() > 1) {
-                            tempCost = list.get(1).getCost();
-                        } else {
-                            //没有记录，又没有达到预设的起效时间，则默认为0
-                            tempCost = new BigDecimal(0);
-                        }
-                    } else {
-                        tempCost = subsUser.getCost();
-                    }
-                } else {
-                    tempCost = subsUser.getCost();
-                }
-
-                if (tempCost == null) {
-                    tempCost = new BigDecimal(0);
-                }
-                //设置好时薪
-                subsUser.setCost(tempCost);
-            }
-        }
-
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-        //判断当前操作的人员，是不是系统管理员
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "代填日报");
-        if (functionList.size() == 0) {
-            //非系统管理员，检查填报时间
-            TimeType compTimeType = timeTypeMapper.selectById(user.getCompanyId());
-            Integer fillMonths = compTimeType.getFillMonths();
-
-            if (fillMonths > 0) {
-                //有限制的情况
-                LocalDate curMonth = LocalDate.now();
-                LocalDate targetDate = null;
-                if (fillMonths <=3) {
-                    targetDate = curMonth.minusMonths(fillMonths-1);
-                    targetDate = targetDate.withDayOfMonth(1);//修改日期为1号
-                } else if (fillMonths == 4) {
-                    //7天内
-                    targetDate = curMonth.minusDays(7);
-                }else if(fillMonths ==5){
-                    //前一天
-                    targetDate=curMonth.minusDays(1);
-                }
-
-                DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-                //检查填报日期，是否早于限制的日期
-                boolean isForbidden = false;
-                if (createDate.length > 0) {
-                    //日期都是一样的，取第一个就行了
-                    String createDateOne = createDate[0];
-                    if (createDateOne.contains("@")) {
-                        String[] dateArray = createDateOne.split("@");
-                        String startDate = dateArray[0];
-                        LocalDate localStartDate = LocalDate.parse(startDate, dateTimeFormatter);
-                        if (localStartDate.isBefore(targetDate)) {
-                            isForbidden = true;
-                        }
-                    } else {
-                        //单日填报，检查日期是否早于限制时间
-                        if (LocalDate.parse(createDateOne, dateTimeFormatter).isBefore(targetDate)) {
-                            isForbidden = true;
-                        }
-                    }
-                }
-                if (isForbidden) {
-                    HttpRespMsg msg = new HttpRespMsg();
-                    msg.setError("补填日报不可早于"+dateTimeFormatter.format(targetDate)+"，请联系系统管理员代填。");
-                    return msg;
-                }
-            }
-        }
-        try {
-            List<AuditWorkflowTimeSetting> auditWorkflowList
-                    = auditWorkflowTimeSettingMapper.selectList(
-                    new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", user.getDepartmentId()).orderByAsc("seq"));
-            List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
-
-            for (int i = 0; i < id.length; i++) {
-                if (createDate[i].contains("@")) {
-                    DateTimeFormatter mdFormatter = DateTimeFormatter.ofPattern("MM-dd");
-                    System.out.println("============这是批量填报=");
-                    //这是批量填报的情况，日期有范围
-                    String[] dateArray = createDate[i].split("@");
-                    String startDate = dateArray[0];
-                    String endDate = dateArray[1];
-                    //检查该时间范围是否已经有填写过的日报了
-                    List<Report> oldReportList = reportService.list(new QueryWrapper<Report>().between("create_date", startDate, endDate).eq("creator_id", token));
-                    if (oldReportList.size() > 0) {
-                        List<LocalDate> collect = oldReportList.stream().map(Report::getCreateDate).collect(Collectors.toList());
-                        StringBuilder sb = new StringBuilder();
-                        collect.forEach(c->{
-                            sb.append(mdFormatter.format(c)).append(",");
-                        });
-                        String s = sb.toString();
-                        s = s.substring(0, s.length() -1);
-                        HttpRespMsg msg = new HttpRespMsg();
-                        msg.setError("已存在填写日报: " + s+", 请重新选择日期范围");
-                        return msg;
-                    }
-
-//                    LocalDate localStartDate = LocalDate.parse(startDate, ddtf);
-//                    LocalDate localEndDate = LocalDate.parse(endDate, ddtf);
-                    List<LocalDate> workDaysListInRange = WorkDayCalculateUtils.getWorkDaysListInRange(startDate, endDate);
-                    //获取当前填报人所在部门的自定义审核流程
-                    for (LocalDate localStartDate : workDaysListInRange) {
-                        if (targetUserList == null) {
-                            Report report = new Report();
-                            report.setId(id[i] == -1 ? null : id[i]);
-                            report.setProjectId(projectId[i]);
-                            report.setSubProjectId(subProjectId[i]);
-                            report.setGroupId(groupId[i]);
-                            report.setReportTimeType(reportTimeType[i]);
-                            report.setMultiWorktime(multiWorktime[i]);
-                            report.setContent(content[i]);
-                            report.setDegreeId(degreeId.length > 0?degreeId[i]:null);
-                            report.setCustomData(customData[i]);
-                            report.setState(draft==0?0:3);
-                            report.setCompanyId(user.getCompanyId());
-                            report.setPicAdd(pics!=null?pics[i]:null);
-                            report.setStage(stage[i]);
-                            report.setCreateDate(localStartDate);
-                            report.setCreatorId(token);
-                            report.setProjectAuditState(0);
-                            report.setProjectAuditorId(projectAuditorId[i]);
-                            if (auditWorkflowList.size() == 0) {
-                                //没有自定义审核流，默认的直接是项目负责人审核
-                                report.setIsDeptAudit(0);
-                                report.setIsFinalAudit(1);
-                            } else {
-                                //取第一个审核节点
-                                AuditWorkflowTimeSetting firstNode = auditWorkflowList.get(0);
-                                report.setIsFinalAudit(auditWorkflowList.size() > 1?0:1);
-                                report.setIsDeptAudit(firstNode.getIsDeptAudit());
-                                report.setAuditDeptid(firstNode.getAuditDeptId());
-                                report.setAuditDeptManagerid(firstNode.getAuditDeptId() != null?allDeptList.stream().filter(d->d.getDepartmentId().equals(firstNode.getAuditDeptId())).findFirst().get().getManagerId(): null);
-                            }
-                            if (taskId != null && taskId[i] != null && taskId[i] != 0) {
-                                report.setTaskId(taskId[i]);
-                            }
-                            if (isOvertime != null && isOvertime[i] != null) {
-                                report.setIsOvertime(isOvertime[i]);
-                            }
-                            if (progress != null && progress[i] != null) {
-                                report.setProgress(progress[i]);
-                            }
-                            //计算工时和成本
-                            if (report.getMultiWorktime() == 0) {
-                                fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], startTime==null?null:startTime[i], endTime==null?null:endTime[i],  sdf);
-                            } else {
-                                fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], null, null, sdf);
-                            }
-
-                            //项目专业的进展
-                            fillReportProgress(report, professionProgress[i]);
-                            reportList.add(report);
-                        } else {
-                            //批量代填报的
-                            for (User subsUser : targetUserList) {
-                                Report report = new Report()
-                                        .setId(id[i] == -1 ? null : id[i])
-                                        .setProjectId(projectId[i])
-                                        .setSubProjectId(subProjectId[i])
-                                        .setGroupId(groupId[i])
-                                        .setReportTimeType(reportTimeType[i])
-                                        .setMultiWorktime(multiWorktime[i])
-                                        .setContent(content[i])
-                                        .setDegreeId(degreeId.length > 0?degreeId[i]:null)
-                                        .setCustomData(customData[i])
-                                        .setStage(stage[i])
-                                        .setState(1)//代填，直接是审核通过状态
-                                        .setCompanyId(user.getCompanyId())
-                                        .setPicAdd(pics!=null?pics[i]:null)
-                                        .setCreateDate(localStartDate)
-                                        .setCreatorId(subsUser.getId())
-                                        .setProjectAuditorId(projectAuditorId[i]);;
-                                report.setProjectAuditState(0);
-                                if (auditWorkflowList.size() == 0) {
-                                    //没有自定义审核流，默认的直接是项目负责人审核
-                                    report.setIsDeptAudit(0);
-                                    report.setIsFinalAudit(1);
-                                } else {
-                                    //取第一个审核节点
-                                    AuditWorkflowTimeSetting firstNode = auditWorkflowList.get(0);
-                                    report.setIsFinalAudit(auditWorkflowList.size() > 1?0:1);
-                                    report.setIsDeptAudit(firstNode.getIsDeptAudit());
-                                    report.setAuditDeptid(firstNode.getAuditDeptId());
-                                    report.setAuditDeptManagerid(firstNode.getAuditDeptId() != null?allDeptList.stream().filter(d->d.getDepartmentId().equals(firstNode.getAuditDeptId())).findFirst().get().getManagerId(): null);
-                                }
-                                if (taskId != null && taskId[i] != null && taskId[i] != 0) {
-                                    report.setTaskId(taskId[i]);
-                                }
-                                if (isOvertime != null && isOvertime[i] != null) {
-                                    report.setIsOvertime(isOvertime[i]);
-                                }
-                                if (progress != null && progress[i] != null) {
-                                    report.setProgress(progress[i]);
-                                }
-                                //计算工时和成本
-                                if (report.getMultiWorktime() == 0) {
-                                    fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], startTime==null?null:startTime[i], endTime==null?null:endTime[i],  sdf);
-                                } else {
-                                    fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], null, null, sdf);
-                                }
-
-                                fillReportProgress(report, professionProgress[i]);
-                                reportList.add(report);
-                            }
-                        }
-                    }
-                } else {
-                    if (targetUidList == null) {
-                        Report report = new Report();
-                        report.setId(id[i] == -1 ? null : id[i]);
-                        report.setProjectId(projectId[i]);
-                        report.setSubProjectId(subProjectId[i]);
-                        report.setGroupId(groupId[i]);
-                        report.setReportTimeType(reportTimeType[i]);
-                        report.setMultiWorktime(multiWorktime.length > 0?multiWorktime[i]:0);
-                        report.setContent(content.length > 0?content[i]:"-");
-                        report.setDegreeId(degreeId.length > 0?degreeId[i]:null);
-                        report.setCustomData(customData[i]);
-                        report.setStage(stage != null && stage.length>0?stage[i]:"-");
-                        report.setState(draft==0?0:3);
-                        report.setCompanyId(user.getCompanyId());
-                        report.setPicAdd(pics!=null && pics.length>0?pics[i]:null);
-                        report.setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")));
-                        report.setCreatorId(token);
-                        report.setProjectAuditState(0);
-                        report.setProjectAuditorId(projectAuditorId[i]);
-                        if (auditWorkflowList.size() == 0) {
-                            //没有自定义审核流，默认的直接是项目负责人审核
-                            report.setIsDeptAudit(0);
-                            report.setIsFinalAudit(1);
-                        } else {
-                            //取第一个审核节点
-                            AuditWorkflowTimeSetting firstNode = auditWorkflowList.get(0);
-                            report.setIsFinalAudit(auditWorkflowList.size() > 1?0:1);
-                            report.setIsDeptAudit(firstNode.getIsDeptAudit());
-                            report.setAuditDeptid(firstNode.getAuditDeptId());
-                            report.setAuditDeptManagerid(firstNode.getAuditDeptId() != null?allDeptList.stream().filter(d->d.getDepartmentId().equals(firstNode.getAuditDeptId())).findFirst().get().getManagerId(): null);
-                        }
-                        if (taskId != null && taskId[i] != null && taskId[i] != 0) {
-                            report.setTaskId(taskId[i]);
-                        }
-                        if (isOvertime != null && isOvertime[i] != null) {
-                            report.setIsOvertime(isOvertime[i]);
-                        }
-                        if (progress != null && progress[i] != null) {
-                            report.setProgress(progress[i]);
-                        }
-                        //计算工时和成本
-                        if (report.getMultiWorktime() == 0) {
-                            fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], startTime==null?null:startTime[i], endTime==null?null:endTime[i], sdf);
-                        } else {
-                            fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], null, null, sdf);
-                        }
-
-                        fillReportProgress(report, professionProgress[i]);
-                        reportList.add(report);
-                        /*后续需要加入状态*/
-                        if (createDate[i] == null || projectId[i] == null) {
-                            HttpRespMsg httpRespMsg = new HttpRespMsg();
-                            httpRespMsg.setError("缺少数据");
-                            return httpRespMsg;
-                        }
-                    } else {
-                        //批量代填的情况
-                        for (User subsUser : targetUserList) {
-                            Report report = new Report()
-                                    .setId(id[i] == -1 ? null : id[i])
-                                    .setProjectId(projectId[i])
-                                    .setSubProjectId(subProjectId[i])
-                                    .setGroupId(groupId[i])
-                                    .setReportTimeType(reportTimeType[i])
-                                    .setMultiWorktime(multiWorktime[i])
-                                    .setContent(content[i])
-                                    .setDegreeId(degreeId.length > 0?degreeId[i]:null)
-                                    .setCustomData(customData[i])
-                                    .setStage(stage[i])
-//                                    .setState(auditWorkflowList.size() == 0?1:0)//代填的如果没有自定义审核流程就直接审核通过了
-                                    .setCompanyId(user.getCompanyId())
-                                    .setPicAdd(pics!=null?pics[i]:null)
-                                    .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                                    .setCreatorId(subsUser.getId())
-                                    .setProjectAuditorId(projectAuditorId[i])
-                                    .setFillUserid(token);
-                            report.setProjectAuditState(1);
-                            if (auditWorkflowList.size() == 0) {
-                                //没有自定义审核流，直接代填的，就算审核通过
-                                report.setIsDeptAudit(0);
-                                report.setIsFinalAudit(1);
-                                report.setState(1);
-                            } else {
-                                //有审核流程的，取项目经理后面的流程节点
-                                int projectLeaderNodeIndex = 0;
-                                for (int t=0;t<auditWorkflowList.size(); t++) {
-                                    if (auditWorkflowList.get(t).getIsDeptAudit() == 0) {
-                                        projectLeaderNodeIndex = t;
-                                        break;
-                                    }
-                                }
-                                if (projectLeaderNodeIndex == auditWorkflowList.size() -1) {
-                                    //最后一个节点就是项目经理，那就不用审核了，直接通过
-                                    report.setState(1);
-                                } else {
-                                    //否则取下一个节点，待审核
-                                    report.setState(0);
-                                    int nextIndex = projectLeaderNodeIndex + 1;
-                                    AuditWorkflowTimeSetting nextNode = auditWorkflowList.get(nextIndex);
-                                    report.setIsFinalAudit((nextIndex == auditWorkflowList.size()-1)?1:0);
-                                    report.setIsDeptAudit(nextNode.getIsDeptAudit());
-                                    report.setAuditDeptid(nextNode.getAuditDeptId());
-                                    report.setAuditDeptManagerid(nextNode.getAuditDeptId() != null?allDeptList.stream().filter(d->d.getDepartmentId().equals(nextNode.getAuditDeptId())).findFirst().get().getManagerId(): null);
-                                }
-                            }
-
-                            if (taskId != null && taskId[i] != null && taskId[i] != 0) {
-                                report.setTaskId(taskId[i]);
-                            }
-                            if (isOvertime != null && isOvertime[i] != null) {
-                                report.setIsOvertime(isOvertime[i]);
-                            }
-                            if (progress != null && progress[i] != null) {
-                                report.setProgress(progress[i]);
-                            }
-                            hourCost = subsUser.getCost();
-                            //计算工时和成本
-                            if (report.getMultiWorktime() == 0) {
-                                fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], startTime==null?null:startTime[i], endTime==null?null:endTime[i],  sdf);
-                            } else {
-                                fillReportHours(report, hourCost, workingTime==null?null:workingTime[i], timeType==null?null:timeType[i], null, null, sdf);
-                            }
-
-                            fillReportProgress(report, professionProgress[i]);
-                            reportList.add(report);
-                            /*后续需要加入状态*/
-                            if (createDate[i] == null || projectId[i] == null) {
-                                HttpRespMsg httpRespMsg = new HttpRespMsg();
-                                httpRespMsg.setError("缺少数据");
-                                return httpRespMsg;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (NullPointerException e) {
-            e.printStackTrace();
-            HttpRespMsg httpRespMsg = new HttpRespMsg();
-            httpRespMsg.setError("验证失败");
-            return httpRespMsg;
-        }
-        //校验工作时长
-        for (Report report : reportList) {
-            if (report.getWorkingTime() == null || report.getWorkingTime() <= 0.0) {
-                HttpRespMsg httpRespMsg = new HttpRespMsg();
-                httpRespMsg.setError("请填写工作时长");
-                return httpRespMsg;
-            }
-        }
-
-        return reportService.editReport(reportList, createDate.length > 0 ? createDate[0] : null, targetUserList, hourCost, user.getCompanyId());
-    }
-
-    private void fillReportHours(Report report, BigDecimal hourCost, Double workingTime, Integer timeType, String startTime, String endTime, SimpleDateFormat sdf) {
-        if (report.getMultiWorktime() == 0) {
-            //普通工时成本计算
-            if (report.getReportTimeType() == 0) {
-                report.setWorkingTime(workingTime)
-                        .setCost(hourCost.multiply(new BigDecimal(workingTime)))
-                        .setTimeType(timeType);
-            } else if (report.getReportTimeType() == 1|| report.getReportTimeType() == 3) {
-                report.setWorkingTime(workingTime)
-                        .setCost(hourCost.multiply(new BigDecimal(workingTime)));
-            } else if (report.getReportTimeType() == 2) {
-                //时间范围填报， 计算一下时长
-                try {
-                    report.setStartTime(startTime).setEndTime(endTime);
-                    long time = sdf.parse(report.getEndTime()).getTime() - sdf.parse(report.getStartTime()).getTime();
-                    int minutes = (int)time/1000/60;
-                    double hours = minutes*1.0f/60;
-                    report.setWorkingTime(hours);
-                    report.setCost(hourCost.multiply(new BigDecimal(hours)));
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-            }
-        } else {
-            //getMultiWorktime==1， content中含有多个工时
-            String str = report.getContent().replaceAll("@",",");
-            JSONArray array = JSONArray.parseArray(str);
-            try {
-                double totalHours = 0;
-                for (int t=0;t<array.size(); t++) {
-                    JSONObject jsonObject = array.getJSONObject(t);
-                    WorktimeItem item = JSONObject.toJavaObject(jsonObject, WorktimeItem.class);
-                    long time = sdf.parse(item.getEndTime()).getTime() - sdf.parse(item.getStartTime()).getTime();
-                    int minutes = (int)time/1000/60;
-                    double hours = minutes*1.0f/60;
-                    item.setTime(hours);
-                    jsonObject.put("time", hours);
-                    totalHours += hours;
-                }
-                report.setWorkingTime(totalHours);
-                report.setCost(hourCost.multiply(new BigDecimal(totalHours)));
-                report.setContent(array.toJSONString());
-            } catch (ParseException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    /**
-     * 删除报告
-     * id 要删除的报告的id
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg deleteReport(String userId, String date) {
-        return reportService.deleteReport(userId, date);
-    }
-
-    /**
-     * 根据审核状态获取报告
-     * state 筛选状态 0-未审核 1-已通过 2-未通过
-     */
-    @RequestMapping("/listByState")
-    public HttpRespMsg getListByState(@RequestParam Integer state,
-                                      Integer departmentId,
-                                      Integer projectId,
-                                      String date,
-                                      String startDate,
-                                      String endDate,
-                                      String userId,
-                                      HttpServletRequest request) {
-        return reportService.getListByState(state, departmentId,
-                projectId,
-                date, startDate, endDate, userId,
-                request);
-    }
-
-    /**
-     * 获取专业待审核的报告
-     * @param state
-     * @param departmentId
-     * @param projectId
-     * @param date
-     * @param request
-     * @return
-     */
-    @RequestMapping("/listByStateProfession")
-    public HttpRespMsg listByStateProfession(@RequestParam Integer state,
-                                      Integer departmentId,
-                                      Integer projectId,
-                                      String date,
-                                      HttpServletRequest request) {
-        return reportService.listByStateProfession(state, departmentId,
-                projectId,
-                date,request);
-    }
-
-    @RequestMapping("/listByStateDepartment")
-    public HttpRespMsg listByStateDepartment(@RequestParam Integer state,
-                                             Integer projectId,
-                                             String date,
-                                             HttpServletRequest request) {
-        return reportService.listByStateDepartment(state,
-                projectId,
-                date,request);
-    }
-
-    /**
-     * 按某人某日期审批通过报告
-     * id 要通过的报告的用户id
-     * reportIds 报告id
-     */
-    @RequestMapping("/approve")
-    public HttpRespMsg approveReport(@RequestParam String reportIds, Integer isDepartment, HttpServletRequest request) {
-        return reportService.approveReport(reportIds,isDepartment, request);
-    }
-
-
-    /**
-     * 按某人某日期审批未通过报告 撤销通过报告
-     * id 要未通过的报告的用户id
-     * date 日期 格式yyyy-mm-dd
-     */
-    @RequestMapping("/deny")
-    public HttpRespMsg denyReport(@RequestParam String date, @RequestParam String reportIds, String reason, Integer isDepartment, HttpServletRequest request) {
-        return reportService.denyReport(date,reportIds, reason, isDepartment, request);
-    }
-
-    /**
-     * 撤回报告
-     * @param reportIds
-     * @param request
-     * @return
-     */
-    @RequestMapping("/cancel")
-    public HttpRespMsg cancelReport(@RequestParam String userId, @RequestParam String reportIds,HttpServletRequest request) {
-        return reportService.cancelReport(userId, reportIds, request);
-    }
-
-
-    @RequestMapping("/getMembList")
-    public HttpRespMsg getMembList(@RequestParam(required=false) String date, Integer manageDeptId, HttpServletRequest request) {
-        if (date == null) {
-            //默认获取今天的
-            date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-        }
-        return reportService.getMembList(date, manageDeptId, request);
-    }
-
-    @RequestMapping("/batchApproveReport")
-    public HttpRespMsg batchApproveReport(@RequestParam String ids, Integer isDepartment, HttpServletRequest request) {
-        return reportService.batchApproveReport(ids, isDepartment, request);
-    }
-
-    @RequestMapping("/batchDenyReport")
-    public HttpRespMsg batchDenyReport(@RequestParam String ids, Integer isDepartment, HttpServletRequest request) {
-        return reportService.batchDenyReport(ids, isDepartment, request);
-    }
-
-    @RequestMapping("/getUserDailyWorkTime")
-    public HttpRespMsg getUserDailyWorkTime(HttpServletRequest request, String startDate, String endDate) {
-        return reportService.getUserDailyWorkTime(request, startDate, endDate);
-    }
-
-    @RequestMapping("/getNoReportUserList")
-    public HttpRespMsg getNoReportUserList(HttpServletRequest request, String startDate, String endDate) {
-        return reportService.getNoReportUserList(request, startDate, endDate);
-    }
-
-    @RequestMapping("/exportNoReportUserList")
-    public HttpRespMsg exportNoReportUserList(HttpServletRequest request, String startDate, String endDate) {
-        return reportService.exportNoReportUserList(request, startDate, endDate);
-    }
-
-    @RequestMapping("/exportUserDailyWorkTime")
-    public HttpRespMsg exportUserDailyWorkTime(HttpServletRequest request, String startDate, String endDate) {
-        return reportService.exportUserDailyWorkTime(request, startDate, endDate);
-    }
-
-    /**
-     * 计算给定时间段内的工作日数量
-     * @param startDate 开始日期
-     * @param endDate 结束日期
-     * @return
-     */
-    @RequestMapping("/getWorkDays")
-    public HttpRespMsg getWorkDays(String startDate, String endDate) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = WorkDayCalculateUtils.getWorkDaysCountInRange(startDate, endDate);
-        return msg;
-    }
-
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(Integer companyId, Integer withCheckIn,
-                                  MultipartFile file, HttpServletRequest request) {
-        return reportService.importData(companyId,withCheckIn, file, request);
-    }
-
-    @RequestMapping("/listImportByState")
-    public HttpRespMsg listDeptImportByState(
-                                      Integer projectId,
-                                      @RequestParam(required = false, defaultValue = "0") Integer dateType,
-                                      String date,
-                                      Integer departmentId,
-                                      HttpServletRequest request) {
-        String token = request.getHeader("TOKEN");
-        User user = userService.getById(token);
-        return reportService.listDeptImportByState(user.getId(),
-                projectId,dateType,
-                date, departmentId, request);
-    }
-
-    @RequestMapping("/getlastWeekFillTime")
-    public HttpRespMsg getlastWeekFillTime(String userId) {
-        return reportService.getlastWeekFillTime(userId);
-    }
-}
-

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

@@ -1,151 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.CustomerInfo;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ReportExtraDegree;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.CustomerInfoMapper;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.ReportExtraDegreeMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
-import com.management.platform.service.ReportExtraDegreeService;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.HttpRespMsg;
-import org.apache.poi.util.StringUtil;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-12-16
- */
-@RestController
-@RequestMapping("/report-extra-degree")
-public class ReportExtraDegreeController {
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ReportExtraDegreeMapper reportExtraDegreeMapper;
-    @Resource
-    ProjectMapper projectMapper;
-    @Resource
-    ProjectService projectService;
-
-    /**
-     * addOrMod添加或者修改
-     * @param info
-     * @return
-     */
-    @RequestMapping("/addOrMod")
-    public HttpRespMsg addOrMod(ReportExtraDegree info) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        if (info.getId() == null) {
-            info.setCompanyId(user.getCompanyId());
-            reportExtraDegreeMapper.insert(info);
-        } else {
-            info.setCompanyId(user.getCompanyId());
-            //检查名字是否发生变化
-            ReportExtraDegree reportExtraDegree = reportExtraDegreeMapper.selectById(info.getId());
-            if (!reportExtraDegree.getName().equals(info.getName())) {
-                //检查是否已经被使用
-                int id = info.getId();
-                List<Project> existsProjects = projectMapper.selectList(new QueryWrapper<Project>()
-                        .eq("company_id", user.getCompanyId())
-                        .and(wrapper->wrapper.eq("associate_degrees", id)
-                                .or().like("associate_degrees", id+",%")
-                                .or().like("associate_degrees", "%,"+id+",%")
-                                .or().like("associate_degrees", "%,"+id)));
-                if (existsProjects.size() > 0) {
-                    List<Project> updateList = new ArrayList<>();
-                    for (Project p : existsProjects) {
-                        String associateDegrees = p.getAssociateDegrees();
-                        String[] split = associateDegrees.split("\\,");
-                        String[] names = p.getAssociateDegreeNames().split("\\,");
-
-                        for (int i=0;i<split.length; i++) {
-                            if (split[i].equals(id+"")) {
-                                names[i] = info.getName();//更换新名字
-                            }
-                        }
-                        String replaceNames = StringUtil.join(names, ",");
-                        Project newP = new Project();
-                        newP.setId(p.getId());
-                        newP.setAssociateDegreeNames(replaceNames);
-                        updateList.add(newP);
-                    }
-                    projectService.updateBatchById(updateList);
-                }
-                reportExtraDegreeMapper.updateById(info);
-            }
-        }
-        return msg;
-    }
-
-    /**
-     * delete删除
-     * @param id
-     * @return
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        //检查是否已经被使用
-        List<Project> existsProjects = projectMapper.selectList(new QueryWrapper<Project>()
-                        .eq("associate_degrees", id)
-                        .or().like("associate_degrees", id+",%")
-                        .or().like("associate_degrees", "%,"+id+",%")
-                        .or().like("associate_degrees", "%,"+id));
-        if (existsProjects.size() > 0) {
-            String names = existsProjects.stream().map(Project::getProjectName).collect(Collectors.joining(","));
-            msg.setError("该数据已经被以下项目关联，无法删除："+names);
-            return msg;
-        }
-        int r = reportExtraDegreeMapper.delete(new QueryWrapper<ReportExtraDegree>().eq("id", id).eq("company_id", user.getCompanyId()));
-        if (r <= 0) {
-            msg.setError("无权删除");
-        }
-        return msg;
-    }
-
-    /**
-     * 获取全部getAll
-     * @return
-     */
-    @RequestMapping("/getAll")
-    public HttpRespMsg getAll() {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<ReportExtraDegree> all = reportExtraDegreeMapper.getAll(user.getCompanyId());
-        msg.data = all;
-        return msg;
-    }
-}
-

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

@@ -1,52 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.Project;
-import com.management.platform.entity.ReportImportLog;
-import com.management.platform.mapper.ReportImportLogMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-20
- */
-@RestController
-@RequestMapping("/report-import-log")
-public class ReportImportLogController {
-
-    @Resource
-    private ReportImportLogMapper reportImportLogMapper;
-
-    @RequestMapping("/getList")
-    public HttpRespMsg getList(Integer companyId, @RequestParam Integer pageIndex, @RequestParam Integer pageSize) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<ReportImportLog> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("company_id", companyId).orderByDesc("indate");
-        IPage<ReportImportLog> iPage = reportImportLogMapper.selectPage(new Page<>(pageIndex, pageSize),
-                queryWrapper);
-        List<ReportImportLog> list = iPage.getRecords();
-        Long total = iPage.getTotal();
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-08-29
- */
-@RestController
-@RequestMapping("/report-profession-progress")
-public class ReportProfessionProgressController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-10-22
- */
-@RestController
-@RequestMapping("/simple-finance")
-public class SimpleFinanceController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-10-22
- */
-@RestController
-@RequestMapping("/simple-projectime")
-public class SimpleProjectimeController {
-
-}
-

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

@@ -1,71 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.SimpleReport;
-import com.management.platform.service.FinanceService;
-import com.management.platform.service.SimpleReportService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-10-22
- */
-@RestController
-@RequestMapping("/simple-report")
-public class SimpleReportController {
-
-    @Resource
-    HttpServletRequest request;
-
-    @Resource
-    private SimpleReportService simpleReportService;
-
-    @RequestMapping("/getByMonth")
-    public HttpRespMsg getByMonth(Integer companyId, String yearMonth) {
-        return simpleReportService.getByMonth(companyId, yearMonth);
-    }
-
-    @RequestMapping("/getReportByMonth")
-    public HttpRespMsg getReportByMonth(Integer companyId, String yearMonth) {
-        return simpleReportService.getReportByMonth(companyId, yearMonth);
-    }
-
-    @RequestMapping("/importData")
-    public HttpRespMsg importData(Integer companyId, String yearMonth,
-                                  MultipartFile file, HttpServletRequest request) {
-        return simpleReportService.importData(companyId, yearMonth, file, request);
-    }
-
-    @RequestMapping("/exportData")
-    public HttpRespMsg exportData(String yearMonth, Integer companyId, String type, HttpServletRequest request) {
-        return simpleReportService.exportData(yearMonth, companyId, type, request);
-    }
-
-    //按照项目分配财务成本
-    @RequestMapping("/getTimeCost")
-    public HttpRespMsg getTimeCost(String yearMonth, Integer companyId, String type, HttpServletRequest request) {
-        return simpleReportService.getTimeCost(yearMonth, companyId, type, request);
-    }
-
-    public static void main(String[] args) {
-        LocalDate now = LocalDate.now();
-        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy/M/d");
-        now = LocalDate.parse("2021/1/02",dateTimeFormatter);
-        System.out.println(dateTimeFormatter.format(now));
-    }
-}
-

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

@@ -1,292 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.api.R;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.ProjectMapper;
-import com.management.platform.mapper.SysFunctionMapper;
-import com.management.platform.mapper.TaskGroupMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.StagesService;
-import com.management.platform.service.TaskGroupService;
-import com.management.platform.service.TaskService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/stages")
-public class StagesController {
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private StagesService stagesService;
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private TaskGroupMapper taskGroupMapper;
-    @Resource
-    private ProjectMapper projectMapper;
-    @Resource
-    private SysFunctionMapper sysFunctionMapper;
-    /**
-     * 保存任务列表
-     */
-    @RequestMapping("/save")
-    public HttpRespMsg save(Stages item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        //检查名称是否已经存在
-        boolean findSameName = false;
-        if (item.getId() == null) {
-            QueryWrapper<Stages> queryWrapper = new QueryWrapper<Stages>();
-            queryWrapper.eq("group_id", item.getGroupId()).eq("stages_name", item.getStagesName());
-            int cnt = stagesService.count(queryWrapper);
-            findSameName = cnt>0?true: false;
-        } else {
-            QueryWrapper<Stages> queryWrapper = new QueryWrapper<Stages>();
-            queryWrapper.eq("group_id", item.getGroupId()).eq("stages_name", item.getStagesName()).ne("id", item.getId());
-            int cnt = stagesService.count(queryWrapper);
-            findSameName = cnt>0?true: false;
-        }
-        if (findSameName) {
-            msg.setError("当前分组中已存在该任务列表，无法重复添加");
-            return msg;
-        }
-        //给seq排序
-        QueryWrapper<Stages> queryWrapper = new QueryWrapper<Stages>();
-        queryWrapper.eq("group_id", item.getGroupId());
-        queryWrapper.orderByDesc("sequence");
-        queryWrapper.last("limit 1");
-        if (item.getId() == null) {
-            List<Stages> one = stagesService.list(queryWrapper);
-            if (one.size() == 0) {
-                item.setSequence(1);
-            } else {
-                item.setSequence(one.get(0).getSequence() + 1);
-            }
-        }
-
-        stagesService.saveOrUpdate(item);
-        queryWrapper = new QueryWrapper<Stages>();
-        queryWrapper.eq("group_id", item.getGroupId());
-        queryWrapper.orderByAsc("sequence");
-
-        List<Stages> list = stagesService.list(queryWrapper);
-
-        QueryWrapper<Task> taskQueryWrapper = new QueryWrapper<Task>();
-        taskQueryWrapper.in("group_id", item.getGroupId());
-        taskQueryWrapper.isNull("parent_tid");
-        taskQueryWrapper.orderByAsc("task_status","seq");
-
-        List<Task> tasks = taskService.list(taskQueryWrapper);
-        List<Integer> collect = tasks.stream().map(Task::getId).collect(Collectors.toList());
-        collect.add(-1);
-        List<Task> subTasks = taskService.list(new QueryWrapper<Task>().in("parent_tid", collect));
-
-        list.forEach(stages -> {
-            List<Task> taskList = tasks.stream().filter(t -> t.getStagesId().equals(stages.getId())).collect(Collectors.toList());
-            stages.setTaskList(taskList);
-            //设置子任务
-            taskList.forEach(t->{
-                List<Task> subList = subTasks.stream().filter(s -> s.getParentTid().equals(t.getId())).collect(Collectors.toList());
-                t.setSubTaskList(subList);
-                long count = subList.stream().filter(s -> s.getTaskStatus() == 1).count();
-                t.setSubTaskFinishNum((int)count);
-            });
-        });
-
-        msg.data = list;
-        return msg;
-    }
-
-    /**
-     * 删除任务列表
-     * @param item
-     * @return
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Stages item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        //检查，如果分组下有任务，不得删除
-        int cnt = taskService.count(new QueryWrapper<Task>().eq("stages_id", item.getId()));
-        if (cnt > 0) {
-            msg.setError("该任务列表下存在任务，不可删除");
-        } else {
-            //查询当前要删除的任务列表的位置排序，重新调整后面的列表排序
-            Stages stages = stagesService.getById(item.getId());
-            stages.getSequence();
-            QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<>();
-            stagesQueryWrapper.eq("group_id", item.getGroupId()).gt("sequence", stages.getSequence());
-            stagesService.removeById(item.getId());
-            List<Stages> afterList = stagesService.list(stagesQueryWrapper);
-            if (afterList.size() > 0) {
-                afterList.forEach(a->{
-                    a.setSequence(a.getSequence() -1);
-                });
-                stagesService.updateBatchById(afterList);
-            }
-
-
-            return msg;
-        }
-
-        return msg;
-    }
-
-    /**
-     * 查看任务列表
-     * @param item
-     * @return
-     */
-    @RequestMapping("/list")
-    public HttpRespMsg list(Stages item, String order, boolean isDesc) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<Stages> stagesQueryWrapper = new QueryWrapper<Stages>();
-        stagesQueryWrapper.eq("group_id", item.getGroupId());
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-
-        stagesQueryWrapper.orderByAsc("sequence");
-        if (stagesService.count(stagesQueryWrapper) == 0) {
-            //创建默认列表
-            Stages stage = new Stages();
-            stage.setGroupId(item.getGroupId());
-            stage.setSequence(1);
-            stage.setProjectId(item.getProjectId());
-            stage.setStagesName("工作开展");
-            stagesService.save(stage);
-        }
-        List<Stages> list = stagesService.list(stagesQueryWrapper);
-        Integer projectId = taskGroupMapper.selectById(item.getGroupId()).getProjectId();
-        Project project = projectMapper.selectById(projectId);
-        QueryWrapper<Task> queryWrapper = new QueryWrapper<Task>();
-        //按任务分组查看
-        queryWrapper.eq("group_id", item.getGroupId());
-        queryWrapper.isNull("parent_tid");
-        //排序根据前端传过来的字段
-        if (isDesc) {
-            queryWrapper.orderByDesc(order);
-        } else {
-            queryWrapper.orderByAsc(order);
-        }
-        List<Task> tasks = taskService.simpleList(queryWrapper);
-        //没有权限只能看到自己创建的，负责的和待分配的任务
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
-        if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
-            tasks = tasks.stream().filter(t->t.getExecutorId() == null || t.getExecutorId().contains(userId) || t.getCreaterId().equals(userId)).collect(Collectors.toList());
-        }
-        List<Task> subTasks = new ArrayList<>();
-        if (tasks.size() > 0) {
-            List<Integer> collect = tasks.stream().map(Task::getId).collect(Collectors.toList());
-            List<Task> subLists = taskService.simpleList(new QueryWrapper<Task>().in("parent_tid", collect));
-            if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
-                subLists = subLists.stream().filter(t->t.getExecutorId() == null || t.getExecutorId().contains(userId) || t.getCreaterId().equals(userId)).collect(Collectors.toList());
-            }
-            subTasks.addAll(subLists);
-        }
-        for (int i = 0; i < list.size(); i++) {
-            Stages stages = list.get(i);
-            List<Task> taskList = tasks.stream().filter(t -> t.getStagesId().equals(stages.getId())).collect(Collectors.toList());
-            stages.setTaskList(taskList);
-            if (taskList.size() > 0) {
-                //设置子任务
-                taskList.forEach(t->{
-                    List<Task> subList = subTasks.stream().filter(s -> s.getParentTid().equals(t.getId())).collect(Collectors.toList());
-                    t.setSubTaskList(subList);
-                    long count = subList.stream().filter(s -> s.getTaskStatus() == 1).count();
-                    t.setSubTaskFinishNum((int)count);
-                });
-            }
-        }
-
-        msg.data = list;
-        return msg;
-    }
-
-    @RequestMapping("/changeStageOrder")
-    public HttpRespMsg changeStageOrder(Integer groupId, Integer oldIndex, Integer newIndex) {
-        QueryWrapper<Stages> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("group_id", groupId).orderByAsc("sequence").last("limit " + oldIndex+",1");
-        List<Stages> sList = stagesService.list(queryWrapper);
-        //先按顺序取到移动的元素
-        Stages curItem = sList.get(0);
-
-        queryWrapper = new QueryWrapper<>();
-        int startSeq = 0;
-        if (newIndex > 0) {
-            int beforeItemIndex = 0;
-            beforeItemIndex = newIndex > oldIndex?newIndex:newIndex-1;
-
-            queryWrapper.eq("group_id", groupId).orderByAsc("sequence").last("limit " +beforeItemIndex+", 1");
-            List<Stages> dataList = stagesService.list(queryWrapper);
-            if (dataList.size() > 0) {
-                Stages beforeItem = dataList.get(0);
-                startSeq = beforeItem.getSequence() + 1;
-            } else {
-                startSeq = 1;
-            }
-        } else {
-            //移动到了第一个位置
-            startSeq = 1;
-        }
-
-        curItem.setSequence(startSeq);
-        //在新位置下面的包括原来占据新位置的，全部调整，从startSeq开始递增
-        queryWrapper = new QueryWrapper<Stages>();
-        queryWrapper.eq("group_id", groupId).ge("sequence", startSeq).orderByAsc("sequence");
-        List<Stages> dataList = stagesService.list(queryWrapper);
-        if (dataList.size() > 0) {
-            List<Stages> batchList = new ArrayList<>();
-            for (Stages t:dataList) {
-                Stages item = new Stages();
-                item.setId(t.getId());
-                startSeq++;
-                item.setSequence(startSeq);
-                batchList.add(item);
-            }
-            stagesService.updateBatchById(batchList);
-        }
-
-        stagesService.updateById(curItem);
-
-        return new HttpRespMsg();
-    }
-
-    //按照项目选择任务列表名称，也可以做为工序/工种/岗位来筛选
-    @RequestMapping("/getProjectStages")
-    public HttpRespMsg changeStageOrder(Integer projectId) {
-        return stagesService.getProjectStages(projectId);
-    }
-
-    //获取分组下的阶段列表
-    @RequestMapping("/getProjectStagesByGroup")
-    public HttpRespMsg getProjectStagesByGroup(Integer groupId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = stagesService.list(new QueryWrapper<Stages>().eq("group_id", groupId));
-        return msg;
-    }
-}
-

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

@@ -1,95 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.ProjectTimer;
-import com.management.platform.entity.SubProject;
-import com.management.platform.mapper.ProjectTimerMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.ProjectService;
-import com.management.platform.service.SubProjectService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-03-17
- */
-@RestController
-@RequestMapping("/sub-project")
-public class SubProjectController {
-    @Autowired
-    private SubProjectService subProjectService;
-    @Resource
-    private ProjectTimerMapper projectTimerMapper;
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private UserMapper userMapper;
-
-    /**
-     * 获取子项目列表
-     */
-    @RequestMapping("/list")
-    public HttpRespMsg list(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = subProjectService.list(new QueryWrapper<SubProject>().eq("project_id", projectId));
-        return msg;
-    }
-
-    /**
-     * 添加或编辑项目
-     * id 要编辑项目的id 可填
-     * name 子项目的名称
-     * projectId 父项目id
-     */
-    @RequestMapping("/saveOrUpdate")
-    public HttpRespMsg saveOrUpdate(SubProject item) {
-        if (item.getId() == null) {
-            //赋予公司id
-            Integer companyId = userMapper.selectById(request.getHeader("TOKEN")).getCompanyId();
-            item.setCompanyId(companyId);
-        }
-        subProjectService.saveOrUpdate(item);
-        if (item.getId() != null) {
-            //修改相关表
-            ProjectTimer timer = new ProjectTimer();
-            timer.setSubProjectName(item.getName());
-            projectTimerMapper.update(timer, new QueryWrapper<ProjectTimer>().eq("sub_project_id", item.getId()));
-        }
-        return new HttpRespMsg();
-    }
-
-    /**
-     * 删除项目
-     * id 要删除的项目的id
-     */
-    @RequestMapping("/deleteProject")
-    public HttpRespMsg deleteProject(@RequestParam Integer id) {
-        subProjectService.removeById(id);
-        return new HttpRespMsg();
-    }
-
-    /**
-     * 查询某个项目内子项目的统计成本
-     * @param startDate
-     * @param endDate
-     * @return
-     */
-    @RequestMapping("/getTimeCost")
-    public HttpRespMsg getTimeCost(String startDate, String endDate, Integer id) {
-        return subProjectService.getTimeCost(startDate, endDate,id);
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-26
- */
-@RestController
-@RequestMapping("/sys-config")
-public class SysConfigController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 菜单功能权限关联表 前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-03
- */
-@RestController
-@RequestMapping("/sys-function")
-public class SysFunctionController {
-
-}
-

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

@@ -1,36 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.SysModule;
-import com.management.platform.mapper.SysModuleMapper;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- * 菜单表 前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-03
- */
-@RestController
-@RequestMapping("/sys-module")
-public class SysModuleController {
-
-    @Resource
-    SysModuleMapper sysModuleMapper;
-
-    @RequestMapping("/getList")
-    public HttpRespMsg getList() {
-        HttpRespMsg msg = new HttpRespMsg();
-
-
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 角色菜单关联表 前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-03
- */
-@RestController
-@RequestMapping("/sys-role-function")
-public class SysRoleFunctionController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 角色操作功能权限关联表 前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-03
- */
-@RestController
-@RequestMapping("/sys-role-module")
-public class SysRoleModuleController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-12
- */
-@RestController
-@RequestMapping("/t-sensitive-words")
-public class TSensitiveWordsController {
-
-}
-

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

@@ -1,69 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.TaskComment;
-import com.management.platform.entity.User;
-import com.management.platform.service.TaskCommentService;
-import com.management.platform.service.UserService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- *  任务留言接口
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/task-comment")
-public class TaskCommentController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private TaskCommentService taskCommentService;
-    @Resource
-    private UserService userService;
-    /**
-     * 添加任务留言
-     * @param taskId 任务id
-     * @param userId 用户id
-     * @param content 内容
-     * @return
-     */
-    @RequestMapping("/add")
-    public HttpRespMsg add(TaskComment comment) {
-        String userId = request.getHeader("Token");
-        User user = userService.getById(userId);
-        comment.setCreateTime(LocalDateTime.now());
-        comment.setUserColor(user.getColor());
-        comment.setUserName(user.getName());
-        taskCommentService.save(comment);
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = comment;
-        return msg;
-    }
-
-    /**
-     * 获取留言列表
-     * @param taskId 任务id
-     * @return
-     */
-    @RequestMapping("getList")
-    public HttpRespMsg getList(Integer taskId) {
-        List<TaskComment> taskComments = taskCommentService.list(new QueryWrapper<TaskComment>().eq("task_id", taskId));
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = taskComments;
-        return msg;
-    }
-}
-

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

@@ -1,617 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.*;
-import com.management.platform.service.*;
-import com.management.platform.util.HttpRespMsg;
-import org.opencv.features2d.SimpleBlobDetector;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyEditor;
-import java.sql.Blob;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/task")
-public class TaskController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private StagesService stagesService;
-    @Resource
-    private ProjectService projectService;
-    @Resource
-    private UserMapper userMapper;
-    @Resource
-    private TaskLogService taskLogService;
-    @Resource
-    private TaskCommentService taskCommentService;
-    @Resource
-    private InformationService informationService;
-    @Resource
-    private TaskProgressService taskProgressService;
-    @Resource
-    private SysFunctionMapper sysFunctionMapper;
-    @Resource
-    private TprogressPaticipatorsService tprogressPaticipatorsService;
-    @Resource
-    private TaskCommentMapper taskCommentMapper;
-    @Resource
-    private TaskMapper taskMapper;
-    @Resource
-    private TaskExecutorMapper taskExecutorMapper;
-    @Resource
-    private TaskExecutorService taskExecutorService;
-
-    @RequestMapping("/save")
-    @Transactional
-    public HttpRespMsg save(Task task) {
-        String userId = request.getHeader("Token");
-        String executorListStr = task.getExecutorListStr();
-
-        //当前用户
-        User user = userMapper.selectById(userId);
-        HttpRespMsg msg = new HttpRespMsg();
-
-        //新建的任务，需要设置创建人，创建时间
-        if (task.getId() == null) {
-            task.setCreateDate(LocalDate.now());
-            task.setCreaterId(userId);
-            task.setCreaterName(user.getName());
-            task.setCreatorColor(user.getColor());
-            task.setCompanyId(user.getCompanyId());
-        }
-
-        if (!StringUtils.isEmpty(executorListStr)) {
-            List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
-            List<TaskExecutor> executorList = JSONArray.parseArray(executorListStr, TaskExecutor.class);
-            task.setExecutorList(executorList);
-            executorList.stream().filter(ex->!StringUtils.isEmpty(ex.getExecutorId())).forEach(ex->{
-                User exeUser = allUsers.stream().filter(al->al.getId().equals(ex.getExecutorId())).findFirst().get();
-                ex.setExecutorName(exeUser.getName());
-                ex.setExecutorColor(exeUser.getColor());
-                ex.setProjectId(task.getProjectId());
-            });
-            String ids = executorList.stream().filter(f->!StringUtils.isEmpty(f.getExecutorId())).map(TaskExecutor::getExecutorId).collect(Collectors.joining(","));
-            task.setExecutorId(StringUtils.isEmpty(ids)?null:ids);
-            String names = executorList.stream().filter(f->!StringUtils.isEmpty(f.getExecutorId())).map(TaskExecutor::getExecutorName).collect(Collectors.joining(","));
-            task.setExecutorName(StringUtils.isEmpty(names)?null:names);
-            String colors = executorList.stream().filter(f->!StringUtils.isEmpty(f.getExecutorId())).map(TaskExecutor::getExecutorColor).collect(Collectors.joining(","));
-            task.setExecutorColor(StringUtils.isEmpty(colors)?null:colors);
-            //总时长
-            task.setPlanHours(executorList.stream().mapToInt(TaskExecutor::getPlanHours).sum());
-        }
-        //有父任务，需要设置名称
-        if (task.getParentTid() != null && task.getParentTname() == null) {
-            task.setParentTname(taskService.getById(task.getParentTid()).getName());
-        }
-        boolean isNew = false;
-        List<String> msgRecepientList = new ArrayList<>();
-        //新建的任务需要计算排序
-        if (task.getId() == null) {
-            isNew = true;
-            QueryWrapper<Task> queryWrapper = new QueryWrapper<Task>();
-            queryWrapper.eq("stages_id", task.getStagesId()).orderByDesc("seq").last("limit 1");
-            List<Task> taskList = taskService.list(queryWrapper);
-            if (taskList.size() == 0) {
-                task.setSeq(1);
-            } else {
-                task.setSeq(taskList.get(0).getSeq() + 1);
-            }
-            if (task.getExecutorId() != null) {
-                msgRecepientList = task.getExecutorList().stream().filter(exe->exe.getExecutorId() != null).map(TaskExecutor::getExecutorId).collect(Collectors.toList());
-            }
-        } else {
-            //更新的情况，需要对比是否修改了任务标题，更新子任务的parentTname
-            Task oldTask = taskService.getById(task.getId());
-            if (!oldTask.getName().equals(task.getName())) {
-                Task sample = new Task();
-                sample.setParentTname(task.getName());
-                taskService.update(sample, new QueryWrapper<Task>().eq("parent_tid", task.getId()));
-            }
-            List<TaskExecutor> oldExeList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", task.getId()));
-            //计算需要移除的执行人
-            List<Integer> ids = oldExeList.stream().filter(old->!task.getExecutorList().stream().anyMatch(newT->newT.getExecutorId().equals(old.getExecutorId())))
-                        .map(TaskExecutor::getId).collect(Collectors.toList());
-            if (ids.size() > 0) {
-                taskExecutorService.removeByIds(ids);
-            }
-
-            task.getExecutorList().forEach(exe->exe.setTaskId(task.getId()));
-            taskExecutorService.saveOrUpdateBatch(task.getExecutorList());
-
-            //新增的执行人
-            msgRecepientList = task.getExecutorList().stream().filter(newT->newT.getExecutorId() != null && !oldExeList.stream().anyMatch(old->newT.getExecutorId().equals(old.getExecutorId())))
-                    .map(TaskExecutor::getExecutorId).collect(Collectors.toList());
-        }
-        taskService.saveOrUpdate(task);
-        if (isNew) {
-            //保存任务执行人
-            task.getExecutorList().forEach(exe->exe.setTaskId(task.getId()));
-            taskExecutorService.saveBatch(task.getExecutorList());
-        }
-
-
-        TaskComment comment = new TaskComment();
-        comment.setTaskId(task.getId());
-        comment.setUserId(user.getId());
-        comment.setUserName(user.getName());
-        comment.setType(isNew?1:2);
-        comment.setContent(user.getName()+(isNew?"创建":"编辑")+"了任务");
-        taskCommentMapper.insert(comment);
-
-        //新增任务，需要重新计算项目进度
-        if (isNew) {
-            updateProjectProgress(task.getProjectId());
-        }
-        if (msgRecepientList.size() > 0) {
-            //发消息通知执行人, 带项目id
-            msgRecepientList.forEach(msgRecepient->{
-                informationService.save(new Information().setType(1).setContent(String.valueOf(task.getProjectId())).setUserId(msgRecepient));
-            });
-        }
-        return msg;
-    }
-
-    private void updateProjectProgress(Integer projectId) {
-        //更新项目完成度
-        //只有第一级任务才更新项目进度, 非已撤销状态的
-        List<Task> all = taskMapper.simpleList(new QueryWrapper<Task>().eq("project_id", projectId).isNull("parent_tid").ne("task_status", 2));
-
-        if (all.size() > 0) {
-            long running = all.stream().filter(a -> a.getTaskStatus() == 1).count();
-            int progress = ((int) running) * 100 / all.size();
-            Project project = new Project();
-            project.setId(projectId);
-            project.setProgress(progress);
-            projectService.updateById(project);
-        }
-    }
-
-    @RequestMapping("/finish")
-    public HttpRespMsg finish(Task task) {
-        HttpRespMsg msg = new HttpRespMsg();
-        //进行完成操作时需要检查子任务是否全部完成
-        if (task.getTaskStatus() == 0) {
-            QueryWrapper<Task> subQuery = new QueryWrapper<Task>();
-            subQuery.eq("parent_tid", task.getId()).eq("task_status", 0);
-            int count = taskService.count(subQuery);
-            if (count > 0) {
-                msg.setError("请先完成全部子任务");
-                return msg;
-            }
-        }
-
-        if (task.getTaskStatus() == 0) {
-            task.setTaskStatus(1);
-            task.setFinishDate(LocalDate.now());
-            //计算排序，需要移动到最后
-            Task old = taskService.getById(task.getId());
-            if (task.getParentTid() == null) {
-                QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("stages_id", old.getStagesId()).isNull("parent_tid").orderByDesc("seq").last("limit 1");
-                List<Task> afterList = taskService.list(queryWrapper);
-                if (afterList.size() > 0) {
-                    //取第一个，也就是正序排序的最后一个
-                    Task lastItem = afterList.get(0);
-                    if (!lastItem.getId().equals(old.getId())) {
-                        task.setSeq(lastItem.getSeq() + 1);//当前操作的任务不是最后一个的情况下，需要把它排到最后，+1
-                    }
-                }
-            }
-
-        } else if (task.getTaskStatus() == 1) {
-            task.setTaskStatus(0);
-        } else {
-            msg.setError("状态不对，无法操作");
-            return msg;
-        }
-
-        taskService.updateById(task);
-        //更新项目完成度
-        Task item = taskService.getById(task.getId());
-        if (item.getParentTid() == null) {
-            //只有第一级任务才更新项目进度, 非已撤销状态的
-            List<Task> all = taskService.list(new QueryWrapper<Task>().eq("project_id", item.getProjectId()).isNull("parent_tid").ne("task_status", 2));
-
-            if (all.size() > 0) {
-                long running = all.stream().filter(a -> a.getTaskStatus() == 1).count();
-                int progress = ((int) running) * 100 / all.size();
-                Project project = new Project();
-                project.setId(item.getProjectId());
-                project.setProgress(progress);
-                projectService.updateById(project);
-            }
-
-        }
-        return msg;
-    }
-
-    @RequestMapping("/changeOrder")
-    public HttpRespMsg changeOrder(Integer id, Integer oldIndex, Integer newIndex, Integer oldStagesId, Integer newStagesId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        Task curItem = new Task();
-        curItem.setId(id);
-        if (!oldStagesId.equals(newStagesId)) {
-            //获取移动到的目标位置上一个数据的seq,计算当前任务的新seq
-            //跨stage移动,旧的stage上移除，切换stages后，旧的任务列表自动会重新排序，不需要再操作
-            curItem.setStagesId(newStagesId);
-            curItem.setStagesName(stagesService.getById(newStagesId).getStagesName());
-        }
-
-        QueryWrapper<Task> queryWrapper = new QueryWrapper<Task>();
-        int startSeq = 0;
-        if (newIndex > 0) {
-            int beforeItemIndex = 0;
-            if (oldStagesId.equals(newStagesId)) {
-                beforeItemIndex = newIndex > oldIndex?newIndex:newIndex-1;
-            } else {
-                //跨stages移动，相当于从下往上移动
-                beforeItemIndex = newIndex-1;
-            }
-            queryWrapper.eq("stages_id", newStagesId).isNull("parent_tid").orderByAsc("seq").last("limit " +beforeItemIndex+", 1");
-            List<Task> taskList = taskService.list(queryWrapper);
-            if (taskList.size() > 0) {
-                Task beforeItem = taskList.get(0);
-                startSeq = beforeItem.getSeq() + 1;
-            } else {
-                startSeq = 1;
-            }
-        } else {
-            //移动到了第一个位置
-            startSeq = 1;
-        }
-
-        curItem.setSeq(startSeq);
-        //在新位置下面的包括原来占据新位置的，全部调整，从startSeq开始递增
-        queryWrapper = new QueryWrapper<Task>();
-        queryWrapper.eq("stages_id", newStagesId).isNull("parent_tid").ge("seq", startSeq).orderByAsc("seq");
-        List<Task> taskList = taskService.list(queryWrapper);
-        if (taskList.size() > 0) {
-            List<Task> batchList = new ArrayList<>();
-            for (Task t:taskList) {
-                Task item = new Task();
-                item.setId(t.getId());
-                startSeq++;
-                item.setSeq(startSeq);
-                batchList.add(item);
-            }
-            taskService.updateBatchById(batchList);
-        }
-
-        taskService.updateById(curItem);
-        return msg;
-    }
-
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(Task task, Integer viewId, String order, boolean isDesc) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-        User user = userMapper.selectById(userId);
-        Project project = projectService.getById(task.getProjectId());
-        QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("project_id", task.getProjectId());
-        List<Stages> stagesList = stagesService.list(new QueryWrapper<Stages>().eq("project_id", task.getProjectId()));
-        if (isDesc) {
-            queryWrapper.orderByDesc(order);
-        } else {
-            queryWrapper.orderByAsc(order);
-        }
-
-        //按视图查看
-        if (viewId == 1) {
-            //全部任务
-        } else if (viewId == 2) {
-            //进行中的任务
-            queryWrapper.eq("task_status", 0);
-        } else if (viewId == 3) {
-            //已完成的任务
-            queryWrapper.eq("task_status", 1);
-        } else if (viewId == 4) {
-            //待安排的任务
-            queryWrapper.isNull("executor_id");
-        } else if (viewId == 5) {
-            //我创建的任务
-            queryWrapper.eq("creater_id", userId);
-        } else if (viewId == 6) {
-            //我执行的任务
-            queryWrapper.like("executor_id", userId);
-        } else if (viewId == 7) {
-            //今天的任务
-            queryWrapper.eq("end_date", LocalDate.now());
-        } else if (viewId == 8) {
-            //已超期的任务,未完成的任务
-            queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
-        }
-        List<Task> list = taskService.simpleList(queryWrapper);
-
-        //没有权限只能看到自己创建的，负责的和待分配的任务
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "查看全部任务");
-        if (functionList.size() == 0 && !userId.equals(project.getInchargerId())) {
-            list = list.stream().filter(t->t.getExecutorId() == null || t.getExecutorId().contains(userId) || t.getCreaterId().equals(userId)).collect(Collectors.toList());
-        }
-        //设置列表名称
-        list.forEach(item->{
-            Optional<Stages> first = stagesList.stream().filter(s -> s.getId().equals(item.getStagesId())).findFirst();
-            if (first.isPresent()) {
-                item.setStagesName(first.get().getStagesName());
-            }
-
-        });
-        msg.data = list;
-        return msg;
-    }
-
-
-
-
-    /**
-     * 认领任务
-     * @param id
-     * @return
-     */
-    @RequestMapping("/addAsMyTask")
-    public HttpRespMsg addAsMyTask(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-        Task task = new Task();
-        //检查是否已经被认领
-        Task t = taskService.getById(id);
-        if (t.getExecutorId() != null) {
-            if (t.getExecutorId().contains(userId)) {
-                msg.setError("您已认领过该任务，请勿重复操作");
-            } else {
-                msg.setError("该任务已被其他人认领");
-            }
-        } else {
-            task.setId(id);
-            task.setExecutorId(userId);
-            User user = userMapper.selectById(userId);
-            task.setExecutorName(user.getName());
-            task.setExecutorColor(user.getColor());
-            taskService.updateById(task);
-            //加入执行人表
-            List<TaskExecutor> executorList = taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", id));
-            if (executorList.size() > 0) {
-                TaskExecutor oldExe = executorList.get(0);
-                TaskExecutor.fromTask(task, oldExe);
-                taskExecutorMapper.updateById(oldExe);
-            } else {
-                //不存在，新增一条
-                TaskExecutor executor = TaskExecutor.fromTask(t);
-                taskExecutorMapper.insert(executor);
-            }
-        }
-        return msg;
-    }
-
-    /**
-     * 获取任务详情
-     * @param id
-     * @return
-     */
-    @RequestMapping("/getTask")
-    public HttpRespMsg getTask(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-        Task t = taskService.getById(id);
-        if (t == null) {
-            msg.setError("该任务已不存在");
-            return msg;
-        }
-        //查询直接子任务
-        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
-        t.setSubTaskList(taskService.list(subQuery));
-
-        //查询最新的一条任务进展
-        List<TaskProgress> list = taskProgressService.list(new QueryWrapper<TaskProgress>().eq("task_id", id).orderByDesc("id").last("limit 1"));
-        if (list.size() > 0) {
-            t.setProgress(list.get(0));
-            //设置创建人姓名
-            String name = userMapper.selectById(list.get(0).getCreatorId()).getName();
-            list.get(0).setCreatorName(name);
-        }
-        //查询任务的执行人
-        t.setExecutorList(taskExecutorMapper.selectList(new QueryWrapper<TaskExecutor>().eq("task_id", t.getId())));
-        msg.data = t;
-        return msg;
-    }
-
-    @RequestMapping("/getSubTask")
-    public HttpRespMsg getSubTask(Integer id) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-
-        //查询直接子任务
-        QueryWrapper<Task> subQuery = new QueryWrapper<Task>().eq("parent_tid", id);
-        msg.data = taskService.list(subQuery);
-        return msg;
-    }
-
-    @RequestMapping("/getRecentTask")
-    public HttpRespMsg getRecentTask(Integer projectId, Integer groupId, Integer stage,
-                                     @RequestParam(required = false, defaultValue = "0") Integer isSubstitude) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-        if (isSubstitude == 0) {
-            msg.data = taskMapper.recentSimpleList(projectId, userId);
-        } else {
-            //代填的情况，获取的是项目中的所有任务
-            msg.data = taskMapper.recentSimpleList(projectId, null);
-        }
-
-        return msg;
-    }
-
-
-    @RequestMapping("/getMileStoneList")
-    public HttpRespMsg getMileStoneList(Integer projectId) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-
-        QueryWrapper<Task> queryWrapper = new QueryWrapper<Task>().eq("project_id", projectId).eq("task_type", 1);
-        queryWrapper.orderByAsc("id");
-        msg.data = taskService.list(queryWrapper);
-        return msg;
-    }
-
-
-    @RequestMapping("/getExecutorPanel")
-    public HttpRespMsg getExecutorPanel(Integer projectId) {
-        return taskService.getExecutorPanel(projectId);
-    }
-
-    @RequestMapping("/getStagesPanel")
-    public HttpRespMsg getStagesPanel(Integer projectId) {
-        return taskService.getStagesPanel(projectId);
-    }
-    @RequestMapping("/getTopCostTask")
-    public HttpRespMsg getTopCostTask(Integer projectId) {
-        return taskService.getTopCostTask(projectId);
-    }
-
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(Integer id) {
-        Task task = taskService.getById(id);
-        if (task.getParentTid() == null) {
-            //删除的是第一级任务，需要调整顺序
-            List<Task> afterList = taskService.list(new QueryWrapper<Task>().eq("stages_id", task.getStagesId()).isNull("parent_tid").gt("seq", task.getSeq()));
-            if (afterList.size() > 0) {
-                List<Task> finalList = new ArrayList<>();
-                afterList.forEach(a->{
-                    Task t = new Task();
-                    t.setId(a.getId());
-                    t.setSeq(a.getSeq() -1);
-                    finalList.add(t);
-                });
-                taskService.updateBatchById(finalList);
-            }
-        }
-        taskService.removeById(id);
-        //删除任务日志
-        taskLogService.remove(new QueryWrapper<TaskLog>().eq("task_id",  id));
-        //删除留言
-        taskCommentService.remove(new QueryWrapper<TaskComment>().eq("task_id", id));
-        deleteSubTask(task);
-
-        //删除根任务，需要重新计算项目进度
-        if (task.getParentTid() == null) {
-            updateProjectProgress(task.getProjectId());
-        }
-        return new HttpRespMsg();
-    }
-
-    private void deleteSubTask(Task task) {
-        List<Task> subTasks = taskService.list(new QueryWrapper<Task>().eq("parent_tid", task.getId()));
-        if (subTasks.size() > 0) {
-            taskService.remove(new QueryWrapper<Task>().eq("parent_tid", task.getId()));
-            List<Integer> collect = subTasks.stream().map(Task::getId).collect(Collectors.toList());
-            //删除任务日志
-            taskLogService.remove(new QueryWrapper<TaskLog>().in("task_id",  collect));
-            //删除留言
-            taskCommentService.remove(new QueryWrapper<TaskComment>().in("task_id", collect));
-            subTasks.forEach(s->{
-                deleteSubTask(s);
-            });
-        }
-    }
-
-    @RequestMapping("/getTaskTimeCompare")
-    public HttpRespMsg getTaskTimeCompare(Integer projectId) {
-        return taskService.getTaskTimeCompare(projectId);
-    }
-
-    @RequestMapping("/exportTaskTimeCompare")
-    public HttpRespMsg exportTaskTimeCompare(Integer projectId) {
-        return taskService.exportTaskTimeCompare(projectId);
-    }
-
-    @RequestMapping("exportTask")
-    public HttpRespMsg exportTask(Integer projectId, Integer taskType) {
-        return taskService.exportTask(projectId, taskType);
-    }
-
-    @RequestMapping("/importTask")
-    public HttpRespMsg importUser(Integer projectId, Integer groupId, Integer stagesId, @RequestParam MultipartFile file) {
-        return taskService.importTask(projectId, groupId, stagesId, file, request);
-    }
-
-
-    /**
-     * task/listByPage获取待办任务列表
-     * @param status 0-进行中，1-已完成
-     * @param viewId 1-我执行的任务， 2-我创建的任务
-     * @param pageIndex
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping("/listByPage")
-    public HttpRespMsg listByPage(Integer status, Integer viewId, Integer pageIndex, Integer pageSize) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String userId = request.getHeader("Token");
-        QueryWrapper<Task> queryWrapper = new QueryWrapper<>();
-
-        //任务状态
-        queryWrapper.eq("task_status", status);
-        if (viewId == 1) {
-            //我执行的任务
-            queryWrapper.like("executor_id", userId);
-        } else if (viewId == 2) {
-            //我创建的任务
-            queryWrapper.eq("creater_id", userId);
-        }
-//        else if (viewId == 3) {
-//            //今天的任务
-//            queryWrapper.eq("end_date", LocalDate.now());
-//        } else if (viewId == 4) {
-//            //已超期的任务,未完成的任务
-//            queryWrapper.lt("end_date", LocalDate.now()).eq("task_status", 0);
-//        }
-        List<Task> list = taskMapper.getTaskWithProjectName(queryWrapper, (pageIndex-1)*pageSize, pageSize);
-
-        int total = taskMapper.selectCount(queryWrapper);;
-        Map<String, Object> map = new HashMap<>();
-        map.put("records", list);
-        map.put("total", total);
-        msg.data = map;
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-27
- */
-@RestController
-@RequestMapping("/task-executor")
-public class TaskExecutorController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/task-file")
-public class TaskFileController {
-
-}
-

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

@@ -1,144 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.service.*;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/task-group")
-public class TaskGroupController {
-    @Resource
-    private HttpServletRequest request;
-
-    @Resource
-    private TaskGroupService taskGroupService;
-    @Resource
-    private TaskService taskService;
-    @Resource
-    private StagesService stagesService;
-    @Resource
-    private GroupTmpstagesService groupTmpstagesService;
-    /**
-     * 保存任务分组
-     */
-    @RequestMapping("/save")
-    public HttpRespMsg save(TaskGroup item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        boolean hasSameName = false;
-        if (item.getId() == null) {
-            item.setNew(true);
-            int cnt = taskGroupService.count(new QueryWrapper<TaskGroup>().eq("project_id", item.getProjectId()).eq("name", item.getName()));
-            hasSameName = cnt>0;
-        } else {
-            int cnt = taskGroupService.count(new QueryWrapper<TaskGroup>()
-                    .eq("project_id", item.getProjectId()).eq("name", item.getName())
-                    .ne("id", item.getId()));
-            hasSameName = cnt>0;
-        }
-        //检查是否有同名的分组
-        if (hasSameName) {
-            msg.setError("分组存在重名");
-        } else {
-            taskGroupService.saveOrUpdate(item);
-            QueryWrapper<TaskGroup> queryWrapper = new QueryWrapper<TaskGroup>();
-            queryWrapper.eq("project_id", item.getProjectId());
-            List<TaskGroup> groupList = taskGroupService.list(queryWrapper);
-            groupList.stream().forEach(g->{
-                if (g.getId().equals(item.getId())) {
-                    g.setNew(item.isNew());
-                }
-            });
-            msg.data = groupList;
-        }
-        return msg;
-    }
-
-    /**
-     * 删除任务分组
-     * @param item
-     * @return
-     */
-    @RequestMapping("/delete")
-    public HttpRespMsg delete(TaskGroup item) {
-        return taskService.delete(item);
-    }
-
-    /**
-     * 获取任务分组
-     * @param item
-     * @return
-     */
-    @RequestMapping("/list")
-    public HttpRespMsg list(TaskGroup item) {
-        HttpRespMsg msg = new HttpRespMsg();
-        QueryWrapper<TaskGroup> queryWrapper = new QueryWrapper<TaskGroup>();
-        queryWrapper.eq("project_id", item.getProjectId());
-        if (taskGroupService.count(queryWrapper) == 0) {
-            //创建默认分组
-            TaskGroup group = new TaskGroup();
-            group.setProjectId(item.getProjectId());
-            group.setName("项目阶段");
-            taskGroupService.save(group);
-        }
-        msg.data = taskGroupService.list(queryWrapper);
-        return msg;
-    }
-
-
-    @RequestMapping("/copy")
-    public HttpRespMsg copy(Integer id) {
-        TaskGroup taskGroup = taskGroupService.getById(id);
-        //复制分组下的任务列表
-        List<Stages> stagesList = stagesService.list(new QueryWrapper<Stages>().eq("group_id", id).orderByAsc("sequence"));
-        TaskGroup copyItem = new TaskGroup();
-        copyItem.setProjectId(taskGroup.getProjectId());
-        copyItem.setName(taskGroup.getName()+"-复制");
-        taskGroupService.save(copyItem);
-        if (stagesList.size() > 0) {
-            for (Stages stages : stagesList) {
-                stages.setId(null);
-                stages.setGroupId(copyItem.getId());
-            }
-        }
-        stagesService.saveBatch(stagesList);
-
-        return new HttpRespMsg();
-    }
-
-
-    @RequestMapping("/createFromTemplate")
-    public HttpRespMsg createFromTemplate(GroupTemplate template, Integer projectId) {
-        return taskGroupService.createFromTemplate(template, projectId);
-    }
-
-
-    @RequestMapping("/saveGroupIncharger")
-    public HttpRespMsg saveGroupIncharger(TaskGroup taskGroup) {
-        taskGroupService.saveGroupIncharger(taskGroup);
-        HttpRespMsg msg = new HttpRespMsg();
-        return msg;
-    }
-
-
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-19
- */
-@RestController
-@RequestMapping("/task-log")
-public class TaskLogController {
-
-}
-

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

@@ -1,54 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.TaskProgress;
-import com.management.platform.entity.TprogressPaticipators;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.TaskProgressService;
-import com.management.platform.service.TprogressPaticipatorsService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.apache.poi.ss.formula.functions.T;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-@RestController
-@RequestMapping("/task-progress")
-public class TaskProgressController {
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private TaskProgressService taskProgressService;
-
-    @RequestMapping("/addProgress")
-    public HttpRespMsg addProgress(TaskProgress progress, String participatorIds) {
-        return taskProgressService.addProgress(progress, participatorIds, request);
-    }
-
-    @RequestMapping("/deleteProgress")
-    public HttpRespMsg deleteProgress(Integer id) {
-        return taskProgressService.deleteProgress(id, request);
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list(Integer taskId) {
-        return taskProgressService.getList(taskId);
-    }
-}
-

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

@@ -1,73 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.TimeCalculationService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-01-09
- */
-@RestController
-@RequestMapping("/time-calculation")
-public class TimeCalculationController {
-
-    @Autowired
-    private TimeCalculationService timeCalculationService;
-    @Autowired
-    private HttpServletRequest request;
-
-    /**
-     * 获取某人今日工作时间和其他信息
-     * userId 用户id
-     * date 日期
-     */
-    @RequestMapping("/getTodayWorkingTime")
-    public HttpRespMsg getTodayWorkingTime(@RequestParam String userId, @RequestParam String date) {
-        return timeCalculationService.getTodayWorkingTime(userId, date);
-    }
-
-    /**
-     * 分页获取异常列表
-     * pageIndex 分页页码
-     * pageSize 分页大小
-     * userId 筛选用户id 可传
-     * actionCode 筛选行为种类 可传 不传时默认6、7、8
-     * date 筛选日期 可传
-     */
-    @RequestMapping("/getDevianceList")
-    public HttpRespMsg getDevianceList(@RequestParam Integer pageIndex, @RequestParam Integer pageSize,
-                                       String userId, Integer actionCode, String date) {
-        return timeCalculationService.getDevianceList(pageIndex, pageSize, userId, actionCode, date, request);
-    }
-
-    /**
-     * 获取相同公司内所有人某天的时间统计
-     * date 日期
-     */
-    @RequestMapping("/getTimeStatistics")
-    public HttpRespMsg getTimeStatistics(@RequestParam String date) {
-        return timeCalculationService.getTimeStatistics(date, request);
-    }
-
-    /**
-     * 获取一段时间内某人的工作
-     * startDate 开始日期 格式yyyy-mm-dd
-     * endDate 结束日期 格式yyyy-mm-dd
-     */
-    @RequestMapping("/getDuration")
-    public HttpRespMsg getDuration(@RequestParam String startDate, @RequestParam String endDate) {
-        return timeCalculationService.getDuration(startDate, endDate, request);
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author 屈跃庭
- * @since 2020-02-05
- */
-@RestController
-@RequestMapping("/time-calculation-show")
-public class TimeCalculationShowController {
-
-}
-

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

@@ -1,45 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.TimeType;
-import com.management.platform.mapper.TimeTypeMapper;
-import com.management.platform.service.TimeTypeService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-02-07
- */
-@RestController
-@RequestMapping("/time-type")
-public class TimeTypeController {
-    @Resource
-    TimeTypeService timeTypeService;
-
-    @RequestMapping("/getCompanyTimeSetting")
-    public HttpRespMsg get(Integer companyId) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        httpRespMsg.data = timeTypeService.getById(companyId);
-        return httpRespMsg;
-    }
-
-    @RequestMapping("save")
-    public HttpRespMsg save(TimeType record) {
-        Boolean success = timeTypeService.updateById(record);
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        if (!success) {
-            httpRespMsg.setError("保存失败");
-        }
-        return httpRespMsg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-@RestController
-@RequestMapping("/tprogress-paticipators")
-public class TprogressPaticipatorsController {
-
-}
-

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

@@ -40,11 +40,6 @@ public class UserController {
         return userService.loginAdmin(username, password);
     }
 
-    @RequestMapping("/loginByUserId")
-    public HttpRespMsg loginByUserId(@RequestParam String userId) {
-        return userService.loginByUserId(userId, request);
-    }
-
     /**
      * 根据id获取用户信息
      * userId 用户id
@@ -70,127 +65,5 @@ public class UserController {
         return userService.getEmployeeList(departmentId, keyword, status, roleId, pageIndex, pageSize, request);
     }
 
-    /**
-     * 删除用户
-     * userId 用户id
-     */
-    @RequestMapping("/deleteUser")
-    public HttpRespMsg deleteUser(@RequestParam String userId) {
-        return userService.deleteUser(userId, request);
-    }
-
-    /**
-     * 修改密码
-     * originPassword 原密码
-     * newPassword 新密码
-     */
-    @RequestMapping("/editPassword")
-    public HttpRespMsg editPassword(@RequestParam String originPassword, @RequestParam String newPassword) {
-        return userService.editPassword(originPassword, newPassword, request);
-    }
-
-    @RequestMapping("/resetPwd")
-    public HttpRespMsg resetPwd(@RequestParam String userId) {
-        return userService.resetPwd(userId);
-    }
-
-    @RequestMapping("/sendVcode")
-    public HttpRespMsg sendVcode(@RequestParam String mobile) {
-        return userService.sendVcode(mobile);
-    }
-
-
-
-    /**
-     * 新增公司和负责人
-     * companyName 公司名
-     * name 姓名
-     * phone 电话号码
-     * type: 0-简易版，1-基础版，2-项目管理专业版，3-工程管理专业版
-     */
-    @RequestMapping("/insertCompany")
-    public HttpRespMsg insertCompany(
-            @RequestParam String companyName, @RequestParam String name, @RequestParam String phone,
-            String vcode, String password, @RequestParam(required = false, defaultValue = "2") Integer type) {
-        return userService.insertCompany(companyName, name, phone, vcode, password, type);
-    }
-
-    /**
-     * 新增或修改用户
-     * id 要修改的用户id 修改时传
-     * name 用户名
-     * phone 电话号码
-     * role 角色 0-普通员工 2-管理员
-     * cost 成本
-     * departmentId 部门id 不传或0-其他部门 其他部门id-相应部门
-     * departmentCascade 部门层叠关系字符串 默认"0"
-     */
-    @RequestMapping("/insertUser")
-    public HttpRespMsg insertUser(String id, @RequestParam String name, String phone,
-                                  @RequestParam Integer roleId, Double monthCost, Double cost, Integer departmentId, Integer salaryType, String costApplyDate) {
-        return userService.insertUser(id, name, phone, roleId, monthCost, cost, departmentId, salaryType, costApplyDate, request);
-    }
-
-    /**
-     * 使用文件导入用户信息
-     * departmentId 部门id 不传则默认0
-     * file Excel文件
-     */
-    @RequestMapping("/importUser")
-    public HttpRespMsg importUser(@RequestParam MultipartFile file) {
-        return userService.importUser(file, request);
-    }
-
-    /**
-     * 切换权限 负责人可以将本公司的管理员切换至普通员工或者反之
-     * id 目标id
-     */
-    @RequestMapping("/switchPermission")
-    public HttpRespMsg switchPermission(@RequestParam String id) {
-        return userService.switchPermission(id, request);
-    }
-
-    @RequestMapping("/getUserSalaryList")
-    public HttpRespMsg getUserSalaryList(String id) {
-        return userService.getUserSalaryList(id);
-    }
-
-
-    @RequestMapping("/setActive")
-    public HttpRespMsg setActive(String id, int isActive) {
-        return userService.setActive(id, isActive);
-    }
-
-    @RequestMapping("/exportUsers")
-    public HttpRespMsg exportUsers(Integer containInvalid) {
-        return userService.exportUsers(containInvalid,request);
-    }
-
-    @RequestMapping("/pushFillReport")
-    public HttpRespMsg pushFillReport(String ids, String date) {return userService.pushFillReport(ids, request, date); }
-
-    @RequestMapping("/exportMembList")
-    public HttpRespMsg exportMembList(boolean isFill, String ids, String date) {return userService.exportMembList(isFill, ids, request, date); }
-
-    @RequestMapping("/getHRList")
-    public HttpRespMsg getHRList() {return userService.getHRList(request); }
-
-    @RequestMapping("/changeSysManager")
-    public HttpRespMsg changeSysManager(String toUserId, Integer myRoleId) {return userService.changeSysManager(toUserId, myRoleId, request); }
-
-    @RequestMapping("/deactiveUser")
-    public HttpRespMsg deactiveUser(User user) {
-        user.setIsActive(0);
-        userService.updateById(user);
-        return new HttpRespMsg();
-    }
-
-
-    @RequestMapping("/batchUpdateDept")
-    public HttpRespMsg batchUpdateDept(String userIds, Integer deptId) {return userService.batchUpdateDept(userIds, deptId, request); }
-
-    @RequestMapping("/batchUpdateRole")
-    public HttpRespMsg batchUpdateRole(String userIds, Integer roleId) {return userService.batchUpdateRole(userIds, roleId, request); }
-
 }
 

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

@@ -1,289 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.management.platform.entity.*;
-import com.management.platform.entity.vo.SysRichFunction;
-import com.management.platform.mapper.*;
-import com.management.platform.service.ReportService;
-import com.management.platform.util.ExcelUtil;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.WorkDayCalculateUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-01-04
- */
-@RestController
-@RequestMapping("/user-corpwx-time")
-public class UserCorpwxTimeController {
-
-    @Value(value = "${upload.path}")
-    private String path;
-    @Resource
-    UserCorpwxTimeMapper userCorpwxTimeMapper;
-    @Resource
-    HttpServletRequest request;
-    @Resource
-    UserMapper userMapper;
-    @Resource
-    ParticipationMapper participationMapper;
-    @Resource
-    ProjectMapper projectMapper;
-    @Resource
-    ReportService reportService;
-    @Resource
-    DepartmentMapper departmentMapper;
-    @Resource
-    CompanyMapper companyMapper;
-    @Resource
-    SysFunctionMapper sysFunctionMapper;
-
-    @RequestMapping("/getMyDeptMembsData")
-    public HttpRespMsg getMyDeptMembsData(String startDate, String endDate) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        List<Map> list = new ArrayList<Map>();
-        int onlyWorkDays = 1;//只要工作日
-        List<SysRichFunction> functionList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "全部企微考勤");
-        if (functionList.size() > 0) {
-            //查看全部人员的
-            list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, null);
-        } else {
-            Integer manageDeptId = user.getManageDeptId();
-            if (manageDeptId != null && manageDeptId != 0) {
-                //一个人可能担任多个部门负责人
-                List<Department> departments = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-                if (departments.size() == 1) {
-                    list = userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, manageDeptId);
-                } else {
-                    for (Department d:departments) {
-                        list.addAll(userCorpwxTimeMapper.getUserDataList(user.getCompanyId(), startDate, endDate, d.getDepartmentId()));
-                    }
-                }
-            }
-        }
-
-        //工作日处理，排除常规周末和法定节假日
-        if (onlyWorkDays == 1) {
-            DateTimeFormatter dtf =  DateTimeFormatter.ofPattern("yyyy/MM/dd");
-            list = list.stream().filter(time->{
-                String date = (String)time.get("createDate");
-                if (WorkDayCalculateUtils.isWorkDay(LocalDate.parse(date, dtf))) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }).collect(Collectors.toList());
-        }
-        DateTimeFormatter standFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        HashMap item = new HashMap();
-        item.put("list", list);
-        if (list.size() > 0) {
-            List<String> userIdList = new ArrayList<>();
-            for (int i=0;i<list.size(); i++) {
-                Map map = list.get(i);
-                String userId = (String)map.get("userId");
-                userIdList.add(userId);
-            }
-            //员工参与的项目
-            List<Participation> participationList = participationMapper.selectList(new QueryWrapper<Participation>().in("user_id", userIdList));
-            List<String> names = new ArrayList<>();
-            LocalDate localStart = LocalDate.parse(startDate, standFormatter);
-            LocalDate localEnd = LocalDate.parse(endDate, standFormatter);
-            if (participationList.size() > 0) {
-                List<Integer> collect = participationList.stream().map(Participation::getProjectId).collect(Collectors.toList());
-                List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect).orderByAsc("id"));
-
-                names = projectList.stream().filter(p->{
-                    if (p.getPlanStartDate() != null) {
-                        if (p.getPlanStartDate().isAfter(localEnd)) {
-                            return false;
-                        }
-                    }
-                    if (p.getPlanEndDate() != null) {
-                        if (p.getPlanEndDate().isBefore(localStart)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }).map(Project::getProjectName).collect(Collectors.toList());
-
-            }
-            //添加公共项目
-            List<Project> publicProjects = projectMapper.selectList(new QueryWrapper<Project>().eq("company_id", user.getCompanyId()));
-            if (publicProjects.size() > 0) {
-                List<String> collect = publicProjects.stream().filter(p->{
-                    if (p.getPlanStartDate() != null) {
-                        if (p.getPlanStartDate().isAfter(localEnd)) {
-                            return false;
-                        }
-                    }
-                    if (p.getPlanEndDate() != null) {
-                        if (p.getPlanEndDate().isBefore(localStart)) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }).map(Project::getProjectName).collect(Collectors.toList());
-                names.addAll(collect);
-            }
-            item.put("projects", names);
-        } else {
-            item.put("projects", new ArrayList<String>());
-        }
-
-        //获取该时间段已经审核通过的报告
-        List<Report> reportList = reportService.list(new QueryWrapper<Report>()
-                .eq("company_id", user.getCompanyId()).between("create_date", startDate, endDate).eq("state", 1));
-
-        DateTimeFormatter splashDtf = DateTimeFormatter.ofPattern("yyyy/MM/dd");
-        //数据填充
-        for (Map dataItem : list) {
-            List<String> dataList = new ArrayList<>();
-            String userId = (String)dataItem.get("userId");
-            String createDate = (String)dataItem.get("createDate");
-            //检查该人员当天是否已经有审核通过的
-            boolean hasPassed = reportList.stream().anyMatch(r->r.getCreatorId().equals(userId) && splashDtf.format(r.getCreateDate()).equals(createDate));
-            dataItem.put("hasPassed", hasPassed);
-        }
-
-        //返回数据
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = item;
-        return msg;
-    }
-
-    @RequestMapping("/submitProjectTime")
-    public HttpRespMsg submitProjectTime(String json, String projectColumns) {
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        JSONArray array = JSONArray.parseArray(json);
-        JSONArray columnsArray = JSONArray.parseArray(projectColumns);
-        List<String> pnames = new ArrayList<>();
-        for (int i=0;i<columnsArray.size(); i++) {
-            System.out.println(columnsArray.getString(i));
-            pnames.add(columnsArray.getString(i));
-        }
-        List<Project> projectList = projectMapper.selectList(new QueryWrapper<Project>().in("project_name", pnames).eq("company_id", user.getCompanyId()));
-
-        List<Report> reportList = new ArrayList<>();
-
-        for (int i=0;i<array.size(); i++) {
-            JSONObject jsonObject = array.getJSONObject(i);
-            System.out.println(jsonObject);
-            LocalDate createDate = LocalDate.parse(jsonObject.getString("createDate"), DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            String userId = jsonObject.getString("userId");
-            //获取该员工的各个项目分配的工时
-
-            for (int j=0;j<projectList.size(); j++) {
-                Project p = projectList.get(j);
-                String key = p.getProjectName();
-                if (jsonObject.containsKey(key)) {
-                    double time = jsonObject.getDouble(key);
-                    if (time > 0) {
-                        Report report = new Report();
-                        report.setWorkingTime(time);
-                        report.setCreatorId(userId);
-                        report.setCreateDate(createDate);
-                        report.setProjectId(p.getId());
-                        reportList.add(report);
-                    }
-
-                }
-            }
-        }
-
-        return reportService.saveProjectTime(user.getCompanyId(), reportList, array);
-    }
-
-    //导出带考勤数据的模板
-    @RequestMapping("/exportCheckInExcel")
-    public HttpRespMsg exportCheckInExcel(String startDate, String endDate) {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        Integer companyId = user.getCompanyId();
-        Integer manageDeptId = user.getManageDeptId();
-
-        HttpRespMsg ret = getMyDeptMembsData(startDate, endDate);
-        HashMap map = (HashMap)ret.data;
-        List<Map> list = (List<Map>) map.get("list");
-        List<String> projects = (List) map.get("projects");
-        if (projects == null) {
-            msg.setError("员工无参与的项目，请先到项目管理中进行设置项目参与人");
-        }
-        List<String> titles = new ArrayList<>();
-        titles.add("工作日期");
-        titles.add("星期");
-        titles.add("员工姓名");
-        titles.add("上班时间");
-        titles.add("下班时间");
-//        titles.add("打卡时长");
-//        titles.add("请假时长");
-//        titles.add("补卡/外出时长");
-        titles.add("实际工作时长");
-        //添加项目名称作为列名
-        for (String p : projects) {
-            titles.add(p);
-        }
-        List<List<String>> allData = new ArrayList<>();
-        allData.add(titles);
-
-        //数据填充
-        for (Map dataItem : list) {
-            List<String> dataList = new ArrayList<>();
-            boolean hasPassed = (boolean)dataItem.get("hasPassed");
-            if (hasPassed) {
-                continue;
-            }
-            String createDate = (String)dataItem.get("createDate");
-            dataList.add(createDate);
-            dataList.add((String)dataItem.get("weekDayTxt"));
-            dataList.add((String)dataItem.get("username"));
-            dataList.add((String)dataItem.get("startTime"));
-            dataList.add((String)dataItem.get("endTime"));
-//            dataList.add(""+(Double)dataItem.get("cardTime"));
-//            dataList.add(""+(Double)dataItem.get("askLeaveTime"));
-//            dataList.add(""+(Double)dataItem.get("outdoorTime"));
-            dataList.add(""+(Double)dataItem.get("workHours"));
-            for (String p : projects) {
-                dataList.add("");
-            }
-            allData.add(dataList);
-        }
-        String fileName = companyMapper.selectById(user.getCompanyId()).getCompanyName();
-        if (manageDeptId != null && manageDeptId != 0) {
-            List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
-            String departmentName = allDeptList.stream().map(Department::getDepartmentName).collect(Collectors.joining("+"));
-            fileName = departmentName;
-        }
-        fileName += "_人员工时统计模板"+startDate+"至"+endDate;
-        msg.data = ExcelUtil.exportGeneralExcelByTitleAndList(fileName, allData, path);
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-27
- */
-@RestController
-@RequestMapping("/user-recent-task")
-public class UserRecentTaskController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-05-19
- */
-@RestController
-@RequestMapping("/user-salary")
-public class UserSalaryController {
-
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-06-25
- */
-@RestController
-@RequestMapping("/user-vcode")
-public class UserVcodeController {
-
-}
-

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

@@ -1,79 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.entity.User;
-import com.management.platform.entity.UserYearleaveSetting;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.mapper.UserYearleaveSettingMapper;
-import com.management.platform.service.UserYearleaveSettingService;
-import com.management.platform.util.HttpRespMsg;
-import com.management.platform.util.ListUtil;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2022-03-29
- */
-@RestController
-@RequestMapping("/user-yearleave-setting")
-public class UserYearleaveSettingController {
-    @Resource
-    private UserYearleaveSettingService userYearleaveSettingService;
-    @Resource
-    private UserYearleaveSettingMapper userYearleaveSettingMapper;
-
-    @Resource
-    private HttpServletRequest request;
-    @Resource
-    private UserMapper userMapper;
-
-    @RequestMapping("/save")
-    public HttpRespMsg save(String userId, Integer companyId, Integer yearDays) {
-        UserYearleaveSetting item = new UserYearleaveSetting();
-        item.setCompanyId(companyId);
-        item.setUserId(userId);
-        item.setYearDays(yearDays);
-        userYearleaveSettingService.saveOrUpdate(item);
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/saveBatch")
-    public HttpRespMsg saveBatch(String userIds, Integer companyId, Integer yearDays) {
-        List<UserYearleaveSetting> list = new ArrayList<>();
-        List<String> ids = ListUtil.convertLongIdsArrayToList(userIds);
-        for (String userId : ids) {
-            if (!StringUtils.isEmpty(userId)) {
-                UserYearleaveSetting item = new UserYearleaveSetting();
-                item.setCompanyId(companyId);
-                item.setUserId(userId);
-                item.setYearDays(yearDays);
-                list.add(item);
-            }
-        }
-        userYearleaveSettingService.saveOrUpdateBatch(list);
-        return new HttpRespMsg();
-    }
-
-    @RequestMapping("/list")
-    public HttpRespMsg list() {
-        HttpRespMsg msg = new HttpRespMsg();
-        String token = request.getHeader("TOKEN");
-        User user = userMapper.selectById(token);
-        //查找人员的年假设置
-        msg.data = userYearleaveSettingMapper.getRichList(user.getCompanyId());
-        return msg;
-    }
-}
-

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

@@ -1,21 +0,0 @@
-package com.management.platform.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * VIEW 前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-04-07
- */
-@RestController
-@RequestMapping("/vcompany-customer-contact")
-public class VcompanyCustomerContactController {
-
-}
-

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

@@ -1,73 +0,0 @@
-package com.management.platform.controller;
-
-import com.management.platform.service.UserService;
-import com.management.platform.util.HttpRespMsg;
-import me.chanjar.weixin.mp.api.WxMpInMemoryConfigStorage;
-import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
-import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-@RestController
-@RequestMapping("/wechat")
-public class WXController {
-
-    @Value("${wx.template_report_fill}")
-    public String TEMPLATE_REPORT_FILL;
-    @Value("${wx.app_id}")
-    public String appId;
-    @Value("${wx.app_secret}")
-    public String appSecret;
-
-    @Resource
-    public UserService userService;
-
-
-    @GetMapping("/bindWeiXin")
-    public HttpRespMsg bindWeiXin(String code, String userId) {
-        return userService.bindWeiXin(code, userId);
-    }
-    /*
-     * 微信测试账号推送
-     * */
-    @GetMapping("/push")
-    public void push(String toOpenId) {
-        if (toOpenId == null) {
-            toOpenId = "o1L3L5lOrOl3_UEJjONaoT2Rne1I";
-        }
-        //1，配置
-        WxMpInMemoryConfigStorage wxStorage = new WxMpInMemoryConfigStorage();
-        wxStorage.setAppId(appId);
-        wxStorage.setSecret(appSecret);
-        WxMpService wxMpService = new WxMpServiceImpl();
-        wxMpService.setWxMpConfigStorage(wxStorage);
-
-        //2,推送消息
-        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
-                .toUser(toOpenId)//要推送的用户openid
-                .templateId(TEMPLATE_REPORT_FILL)//模版id
-                .url("http://mob.ttkuaiban.com/")//点击模版消息要访问的网址
-                .build();
-        //3,如果是正式版发送模版消息，这里需要配置你的信息
-                templateMessage.addData(new WxMpTemplateData("first", "您今天的工时填报还未完成", "#FF00FF"));
-                templateMessage.addData(new WxMpTemplateData("keyword1", "屈跃庭", "#000000"));
-                templateMessage.addData(new WxMpTemplateData("keyword2", "市场部", "#000000"));
-                templateMessage.addData(new WxMpTemplateData("remark", "请尽快填报", "#000000"));
-        //                templateMessage.addData(new WxMpTemplateData(name2, value2, color2));
-        try {
-            wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
-        } catch (Exception e) {
-            System.out.println("推送失败：" + e.getMessage());
-            e.printStackTrace();
-        }
-
-    }
-
-
-}

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

@@ -1,34 +0,0 @@
-package com.management.platform.controller;
-
-
-import com.management.platform.service.WxCorpInfoService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author Seyason
- * @since 2021-07-14
- */
-@RestController
-@RequestMapping("/wx-corp-info")
-public class WxCorpInfoController {
-
-    @Resource
-    WxCorpInfoService wxCorpInfoService;
-
-    @RequestMapping("/testDownload")
-    public HttpRespMsg testDownload() {
-        HttpRespMsg msg = new HttpRespMsg();
-        msg.data = wxCorpInfoService.testDownloadFile();
-        return msg;
-    }
-}
-

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/AlertTimeMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.AlertTime;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-31
- */
-public interface AlertTimeMapper extends BaseMapper<AlertTime> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/AuditWorkflowSettingMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.AuditWorkflowSetting;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-28
- */
-public interface AuditWorkflowSettingMapper extends BaseMapper<AuditWorkflowSetting> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/CustomerInfoMapper.java

@@ -1,20 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.CustomerInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.test.context.jdbc.Sql;
-
-import java.util.List;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-07-31
- */
-public interface CustomerInfoMapper extends BaseMapper<CustomerInfo> {
-
-    public List<CustomerInfo> getAll(Integer companyId);
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/DepartmentDingdingMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.DepartmentDingding;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-06-27
- */
-public interface DepartmentDingdingMapper extends BaseMapper<DepartmentDingding> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/DepartmentMapper.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * 部门 Mapper 接口
  * </p>
  *
- * @author 屈跃庭
+ * @author 吴涛涛
  * @since 2020-02-11
  */
 public interface DepartmentMapper extends BaseMapper<Department> {

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/EarningSnapshotMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.EarningSnapshot;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-15
- */
-public interface EarningSnapshotMapper extends BaseMapper<EarningSnapshot> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ExpenseItemMapper.java

@@ -1,20 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ExpenseItem;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.management.platform.entity.vo.ExpenseItemVO;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-public interface ExpenseItemMapper extends BaseMapper<ExpenseItem> {
-    List<ExpenseItemVO> getUserExpenseDetail(Integer projectId);
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ExpenseSheetMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ExpenseSheet;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-17
- */
-public interface ExpenseSheetMapper extends BaseMapper<ExpenseSheet> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/ExpenseTypeMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.ExpenseType;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-06-18
- */
-public interface ExpenseTypeMapper extends BaseMapper<ExpenseType> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceAuditorMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.FinanceAuditor;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-public interface FinanceAuditorMapper extends BaseMapper<FinanceAuditor> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceFixedcolnameMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.FinanceFixedcolname;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-15
- */
-public interface FinanceFixedcolnameMapper extends BaseMapper<FinanceFixedcolname> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceImportMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.FinanceImport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-22
- */
-public interface FinanceImportMapper extends BaseMapper<FinanceImport> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.Finance;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-02-18
- */
-public interface FinanceMapper extends BaseMapper<Finance> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceProjectsMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.FinanceProjects;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-02-26
- */
-public interface FinanceProjectsMapper extends BaseMapper<FinanceProjects> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/FinanceTblcuscolMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.FinanceTblcuscol;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-12-17
- */
-public interface FinanceTblcuscolMapper extends BaseMapper<FinanceTblcuscol> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/GroupTemplateMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.GroupTemplate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-05
- */
-public interface GroupTemplateMapper extends BaseMapper<GroupTemplate> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/GroupTmpstagesMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.GroupTmpstages;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2021-05-05
- */
-public interface GroupTmpstagesMapper extends BaseMapper<GroupTmpstages> {
-
-}

fhKeeper/formulahousekeeper/ops-platform/src/main/java/com/management/platform/mapper/GtemplateTaskMapper.java

@@ -1,16 +0,0 @@
-package com.management.platform.mapper;
-
-import com.management.platform.entity.GtemplateTask;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author Seyason
- * @since 2022-03-27
- */
-public interface GtemplateTaskMapper extends BaseMapper<GtemplateTask> {
-
-}