Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ggooalice 2 years ago
parent
aff8388990 3173cb7d07
commit
863986111a
19 changed files with 158 additions and 71 deletions
Split View Show Diff Stats
  1. 43 3
      fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css
  2. BIN
      fhKeeper/formulahousekeeper/inva_4_tivo/image/bannar9.gif
  3. 11 4
      fhKeeper/formulahousekeeper/inva_4_tivo/index.html
  4. 2 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseSheetController.java
  5. 5 0
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/GroupParticipatorController.java
  6. 2 2
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java
  7. 12 7
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ExpenseSheet.java
  8. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java
  9. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ExpenseSheetService.java
  10. 1 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java
  11. 8 4
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java
  12. 8 1
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java
  13. 26 16
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
  14. 12 7
      fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
  15. 2 1
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ExpenseSheetMapper.xml
  16. 9 1
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml
  17. 8 14
      fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml
  18. 5 5
      fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue
  19. 2 1
      fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

+ 43 - 3
fhKeeper/formulahousekeeper/inva_4_tivo/css/index.css
View File 

@@ -70,14 +70,54 @@
 
 
 /* 图片 */
 
 .bannarIMgGam {
 
-    width: 35.0625rem;
 
-    height: 34.625rem;
 
+    width: 62.5rem;    /* height: 34.625rem; */
 
     position: absolute;
 
     top: 150px;
 
-    right: 330px;
 
+    right: -30px;
 
     z-index: 1;
 
 }
 
 
+.bannarTxt {
 
+    position: absolute;
 
+    top: 18.375rem;
 
+    left: 16.25rem;
 
+    color: #fff;
 
+}
 
+.bannarTil {
 
+    font-size: 6.9375rem;
 
+    font-weight: bold;
 
+    font-family: '黑体';
 
+    letter-spacing: .625rem;
 
+}
 
+.bannarTilP {
 
+    font-size: 20px;
 
+    font-style: oblique;
 
+    letter-spacing: .625rem;
 
+    margin-top: 3.5625rem;
 
+    /* padding-left: 6.6875rem; */
 
+    color: #cfcfcf;
 
+}
 
+.bannarBtn {
 
+    font-size: 20px;
 
+    line-height: 65px;
 
+    border: 1px solid #fff;
 
+    width: 120px;
 
+    padding: 0 46px;
 
+    text-align: center;
 
+    border-radius: 65px;
 
+    margin: 70px 0 0 0;
 
+    letter-spacing: .3125rem;
 
+}
 
+.bannarBtn:hover {
 
+    background: #fff;
 
+    color: #333333;
 
+    font-weight: normal;
 
+    cursor: pointer;
 
+}
 
+.bannarTxt a {
 
+    color: #ffffff;
 
+}
 
+
 
 /* 产品介绍 */
 
 .product {
 
     width: 100%;

BIN
fhKeeper/formulahousekeeper/inva_4_tivo/image/bannar9.gif
View File


+ 11 - 4
fhKeeper/formulahousekeeper/inva_4_tivo/index.html
View File 

@@ -15,8 +15,8 @@
 
     <script src="js/jquery1.42.min.js"></script>
 
     <script src="js/jquery.SuperSlide.2.1.3.js"></script>
 
     <!-- 统计文件 -->
 
-    <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
 
-    <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script>
 
+    <!-- <script charset="UTF-8" id="LA_COLLECT" src="//sdk.51.la/js-sdk-pro.min.js"></script>
 
+    <script>LA.init({id: "Jk62Sh8gvUhl1xcU",ck: "Jk62Sh8gvUhl1xcU"})</script> -->
 
 </head>
 
 
 <body data-spy="scroll" data-target=".fixed-top" id="body">
 
@@ -89,10 +89,17 @@
 
     <!-- <div style="height: 102px"></div> -->
 
     
     <!-- 轮播图 -->
 
-    <div class="bannar" style="position: relative">
 
+    <div class="bannar" style="position: relative;background: #000000;height: 902px;">
 
         <!-- <img src="./image/bannar1.jpg" style="width: 100%;" alt=""> -->
 
-        <img src="./image/bannar7.jpg" style="width: 100%;" alt="" class="bannarIMgGamOne">
 
+        <!-- <img src="./image/bannar7.jpg" style="width: 100%;" alt="" class="bannarIMgGamOne"> -->
 
         <img src="./image/bannar9.gif" alt="" class="bannarIMgGam">
 
+        <div class="bannarTxt">
 
+            <div class="bannarTil">工时管家</div>
 
+            <div class="bannarTilP">·提供最全面的项目工时统计解决方案·</div>
 
+            <a href="http://worktime.ttkuaiban.com/#/register">
 
+                <div class="bannarBtn">免费使用</div>
 
+            </a>
 
+        </div>
 
     </div>
 
 
     <!-- 系统管理 -->

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ExpenseSheetController.java
View File 

@@ -83,9 +83,9 @@ public class ExpenseSheetController {
 
 
     }
 
     @RequestMapping("/deny")
 
-    public HttpRespMsg deny(Integer id) {
 
+    public HttpRespMsg deny(Integer id,String denyReason) {
 
 
-        return expenseSheetService.deny(id);
 
+        return expenseSheetService.deny(id,denyReason);
 
 
     }
 
     @RequestMapping("/importData")

+ 5 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/GroupParticipatorController.java
View File 

@@ -39,5 +39,10 @@ public class GroupParticipatorController {
 
         msg.data = gpList.stream().map(GroupParticipator::getUserId).collect(Collectors.toList());
 
         return msg;
 
     }
 
+
 
+    @RequestMapping("/importData")
 
+    public HttpRespMsg importData(){
 
+        return null;
 
+    }
 
 }

+ 2 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ProjectController.java
View File 

@@ -241,8 +241,8 @@ public class ProjectController {
 
      * id 项目id
 
      */
 
     @RequestMapping("/getProjectCost")
 
-    public HttpRespMsg getProjectCost(String startDate, String endDate, @RequestParam Integer id) {
 
-        return projectService.getProjectCost(startDate, endDate, id, request);
 
+    public HttpRespMsg getProjectCost(String startDate, String endDate, @RequestParam Integer id,@RequestParam(defaultValue = "0") Integer stateKey) {
 
+        return projectService.getProjectCost(startDate, endDate, id,stateKey, request);
 
     }
 
 
     /**

+ 12 - 7
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/ExpenseSheet.java
View File 

@@ -1,26 +1,26 @@
 
 package com.management.platform.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
 
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 
-import java.time.LocalDate;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 
-import java.io.Serializable;
 
-import java.util.List;
 
-
 
+import com.baomidou.mybatisplus.annotation.TableId;
 
+import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import lombok.Data;
 
 import lombok.EqualsAndHashCode;
 
 import lombok.experimental.Accessors;
 
 import org.springframework.format.annotation.DateTimeFormat;
 
 
+import java.io.Serializable;
 
+import java.time.LocalDate;
 
+import java.util.List;
 
+
 
 /**
 
  * <p>
 
  * 
  * </p>
 
  *
 
  * @author Seyason
 
- * @since 2021-10-14
 
+ * @since 2022-08-12
 
  */
 
 @Data
 
 @EqualsAndHashCode(callSuper = false)
 
@@ -100,6 +100,11 @@ public class ExpenseSheet extends Model<ExpenseSheet> {
 
     @TableField("operator_id")
 
     private String operatorId;
 
 
+    /**
 
+     * 驳回原因
 
+     */
 
+    @TableField("deny_reason")
 
+    private String denyReason;
 
 
     @TableField(exist = false)
 
     private List<ExpenseItem> invoiceList;

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/ProjectMapper.java
View File 

@@ -30,7 +30,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     List<Map<String, Object>> getCustomDataSum(@Param("companyId") Integer companyId, @Param("startDate") String startDate, @Param("endDate") String endDate,
 
                                           @Param("projectId") Integer projectId, @Param("userId") String userId);
 
 
-    List<Map<String, Object>> getProjectCost(@Param("companyId")Integer companyId,@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId, @Param("userId") String userId,@Param("deptIds")List<Integer> deptIds,@Param("filterDeptIds")List<Integer> filterDeptIds);
 
+    List<Map<String, Object>> getProjectCost(@Param("companyId")Integer companyId,@Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId,@Param("stateKey")Integer stateKey, @Param("userId") String userId,@Param("deptIds")List<Integer> deptIds,@Param("filterDeptIds")List<Integer> filterDeptIds);
 
 
     List<Map<String, Object>> getProjectCusDataSumItem(@Param("companyId") Integer companyId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId, @Param("userId") String userId);
 
     List<Map<String, Object>> getProjectCusDataDetailItem(@Param("companyId") Integer companyId, @Param("startDate") String startDate, @Param("endDate") String endDate, @Param("projectId") Integer projectId, @Param("userId") String userId);

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ExpenseSheetService.java
View File 

@@ -29,7 +29,7 @@ public interface ExpenseSheetService extends IService<ExpenseSheet> {
 
 
     HttpRespMsg approve(Integer id);
 
 
-    HttpRespMsg deny(Integer id);
 
+    HttpRespMsg deny(Integer id,String denyReason);
 
 
     HttpRespMsg importData(HttpServletRequest request, MultipartFile[] files);
 
 }

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/ProjectService.java
View File 

@@ -50,7 +50,7 @@ public interface ProjectService extends IService<Project> {
 
 
     HttpRespMsg getTimeCost(String startDate, String endDate, String userId, HttpServletRequest request);
 
 
-    HttpRespMsg getProjectCost(String startDate, String endDate, Integer projectId, HttpServletRequest request);
 
+    HttpRespMsg getProjectCost(String startDate, String endDate, Integer projectId,Integer stateKey, HttpServletRequest request);
 
 
     HttpRespMsg getCostInStage(String startDate, String endDate, Integer projectId, HttpServletRequest request);

+ 8 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/DingDingServiceImpl.java
View File 

@@ -1550,9 +1550,10 @@ public class DingDingServiceImpl implements DingDingService {
 
         req.setVacationSource("all");
 
         OapiAttendanceVacationTypeListResponse rsp = null;
 
         try {
 
-            rsp = client.execute(req, getInnerCorpToken(dingding));
 
+            String innerToken = getInnerCorpToken(dingding);
 
+            System.out.println("innerToken="+innerToken);
 
+            rsp = client.execute(req, innerToken);
 
             System.out.println(rsp.getBody());
 
-            System.out.println(rsp.getErrcode()+":"+rsp.getErrmsg());
 
             JSONObject json = JSONObject.parseObject(rsp.getBody());
 
             JSONArray result = json.getJSONArray("result");
 
             List<LeaveType> typeList = new ArrayList<>();
 
@@ -1571,7 +1572,9 @@ public class DingDingServiceImpl implements DingDingService {
 
             leaveTypeService.saveBatch(typeList);
 
             List<User> allUsers = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
 
             int batchSize = 50;
 
-            int batchCount = allUsers.size()%50+allUsers.size()/50==0?0:1;
 
+            int batchCount = allUsers.size()/50+(allUsers.size()%50==0?0:1);
 
+            System.out.println("allUserSize=="+allUsers.size());
 
+            System.out.println("batchCount=="+batchCount);
 
             //删除老数据
 
             leaveQuotaNumService.remove(new QueryWrapper<LeaveQuotaNum>().eq("company_id", companyId));
 
             for (LeaveType type : typeList) {
 
@@ -1581,6 +1584,7 @@ public class DingDingServiceImpl implements DingDingService {
 
                     int endIndex = (i+1)*batchSize;
 
                     if (endIndex > allUsers.size()) endIndex = allUsers.size();
 
                     List<User> curUserList = allUsers.subList(startIndex, endIndex);
 
+                    System.out.println(type.getLeaveName()+" batchNum:"+(i)+", range=["+startIndex+"-"+endIndex+"]");
 
                     syncQuotaList(type.getLeaveCode(), oaManagerDid, dingding, curUserList, 0);
 
                 }
 
             }
 
@@ -1688,7 +1692,7 @@ public class DingDingServiceImpl implements DingDingService {
 
         } catch (ApiException e) {
 
             e.printStackTrace();
 
         }
 
-        System.out.println(quotaListResponse.getBody()+":"+quotaListResponse.getErrmsg());
 
+        System.out.println(quotaListResponse.getBody());
 
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         JSONObject json = JSONObject.parseObject(quotaListResponse.getBody());
 
         DecimalFormat df = new DecimalFormat("#0.0");

+ 8 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ExpenseSheetServiceImpl.java
View File 

@@ -65,8 +65,12 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
 
     public HttpRespMsg add(ExpenseSheet sheet, String items, String userId) {
 
         HttpRespMsg msg = new HttpRespMsg();
 
         User user = userMapper.selectById(userId);
 
+        List<SysRichFunction> functionDeptList = sysFunctionMapper.getRoleFunctions(user.getRoleId(), "费用审核");
 
         boolean isNew = false;
 
         if (sheet.getId() == null) {
 
+            if(functionDeptList.size()>0){
 
+                sheet.setStatus(0);
 
+            }
 
             isNew = true;
 
             //检查code不能重复
 
             Integer num = expenseSheetMapper.selectCount(new QueryWrapper<ExpenseSheet>().eq("company_id", user.getCompanyId()).eq("code", sheet.getCode()));
 
@@ -75,6 +79,8 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
 
                 return msg;
 
             }
 
         }
 
+        sheet.setStatus(1);
 
+        sheet.setDenyReason(null);
 
         sheet.setOperatorId(userId);//设置操作人id
 
         JSONArray array = JSONArray.parseArray(items);
 
         sheet.setOwnerName(userMapper.selectById(sheet.getOwnerId()).getName());
 
@@ -186,10 +192,11 @@ public class ExpenseSheetServiceImpl extends ServiceImpl<ExpenseSheetMapper, Exp
 
     }
 
 
     @Override
 
-    public HttpRespMsg deny(Integer id) {
 
+    public HttpRespMsg deny(Integer id,String denyReason) {
 
         ExpenseSheet sheet = new ExpenseSheet();
 
         sheet.setId(id);
 
         sheet.setStatus(2);
 
+        sheet.setDenyReason(denyReason);
 
         expenseSheetMapper.updateById(sheet);
 
         return new HttpRespMsg();
 
     }

+ 26 - 16
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java
View File 

@@ -45,7 +45,6 @@ import java.text.SimpleDateFormat;
 
 import java.time.LocalDate;
 
 import java.time.LocalDateTime;
 
 import java.time.LocalTime;
 
-import java.time.Period;
 
 import java.time.chrono.ChronoLocalDate;
 
 import java.time.format.DateTimeFormatter;
 
 import java.util.*;
 
@@ -1113,7 +1112,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     }
 
                     //统计每个项目中的人员时间成本投入
 
                     int curProjectId = (Integer)map.get("id");
 
-                    List<Map<String, Object>> membList = projectMapper.getProjectCost(companyId,startDate, endDate, curProjectId, userId,deptIds,filterDeptIds);
 
+                    List<Map<String, Object>> membList = projectMapper.getProjectCost(companyId,startDate, endDate, curProjectId,null, userId,deptIds,filterDeptIds);
 
                     map.put("membList", membList);
 
                     for (Map<String, Object> membMap : membList) {
 
                         double pTotalTime = 0;
 
@@ -1379,7 +1378,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
 
     //获取某个项目每个人分别需要的工时
 
     @Override
 
-    public HttpRespMsg getProjectCost(String startDate, String endDate, Integer projectId, HttpServletRequest request) {
 
+    public HttpRespMsg getProjectCost(String startDate, String endDate, Integer projectId,Integer stateKey, HttpServletRequest request) {
 
         HttpRespMsg httpRespMsg = new HttpRespMsg();
 
         try {
 
             User targetUser = userMapper.selectById(request.getHeader("Token"));
 
@@ -1420,7 +1419,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                 if (timeType.getFixMonthcost() == 0) {
 
                     Map<String, Object> resultMap = new HashMap<>();
 
                     //数据下 非负责部门人员数据不展示
 
-                    List<Map<String, Object>> list = projectMapper.getProjectCost(companyId,startDate, endDate, projectId, null,deptIds,null);
 
+                    List<Map<String, Object>> list = projectMapper.getProjectCost(companyId,startDate, endDate, projectId,stateKey, null,deptIds,null);
 
                     BigDecimal totalMoneyCost = BigDecimal.valueOf(0);
 
                     for (Map<String, Object> map : list) {
 
                         if (!map.containsKey("costMoney")) {
 
@@ -1437,7 +1436,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                     endDate = endDate + "-31";
 
                     List<Map<String, Object>> userMonthTimeCostList = projectMapper.getUserMonthTimeCost(companyId, startDate+"-01", endDate+"-31");
 
 
-                    List<Map<String, Object>> list = projectMapper.getProjectCost(companyId,startDate, endDate, projectId, null,deptIds,null);
 
+                    List<Map<String, Object>> list = projectMapper.getProjectCost(companyId,startDate, endDate, projectId,stateKey, null,deptIds,null);
 
 
                     //检查财务表中是否已经导入成本
 
                     List<Finance> financeList = financeMapper.selectList(new QueryWrapper<Finance>().eq("ymonth", startDate).eq("company_id", companyId));
 
@@ -4562,20 +4561,9 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         List<TimelinessRateVO> resultList=new ArrayList<>();
 
         for (User user : userList){
 
             long days =dateTimeList.size();
 
-            //请假的不参与及时率统计
 
             List<LeaveSheet> leaveSheets = leaveSheetList.stream().filter(ls -> ls.getOwnerId().equals(user.getId())
 
                     &&(ls.getStartDate().isAfter(ChronoLocalDate.from(sDate))||ls.getStartDate().isEqual(ChronoLocalDate.from(sDate)))
 
                     &&(ls.getEndDate().isBefore(ChronoLocalDate.from(eDate))||ls.getEndDate().isEqual(ChronoLocalDate.from(eDate)))).collect(Collectors.toList());
 
-            if(leaveSheets.size()>0){
 
-                for (LeaveSheet leaveSheet : leaveSheets) {
 
-                    Period next = Period.between(leaveSheet.getStartDate(),leaveSheet.getEndDate());
 
-                    if(next.getDays()<1){
 
-                        days-=1;
 
-                    }else {
 
-                        days-=next.getDays();
 
-                    }
 
-                }
 
-            }
 
             TimelinessRateVO timelinessRateVO=new TimelinessRateVO();
 
             timelinessRateVO.setUserName(user.getName());
 
             timelinessRateVO.setTimelinessRate(String.valueOf(dft.format(0)));
 
@@ -4584,6 +4572,26 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                 timelinessRateVO.setDepartmentName(first.get().getDepartmentName());
 
             }
 
             List<Map<String, Object>> mapList = listMap.get(user.getName());
 
+            //请假的不参与及时率统计
 
+            if(leaveSheets.size()>0){
 
+                for (LeaveSheet leaveSheet : leaveSheets) {
 
+                    List<LocalDateTime> leaveDateList = getDays(leaveSheet.getStartDate().atTime(LocalTime.MIN), leaveSheet.getEndDate().atTime(LocalTime.MIN));
 
+                    if(leaveSheet.getTimeDays()<=1){
 
+                        days-=1;
 
+                    }else{
 
+                        days-=leaveSheet.getTimeDays();
 
+                    }
 
+                    for (LocalDateTime localDateTime : leaveDateList) {
 
+                        if(mapList.stream().anyMatch(ml->{
 
+                            Object date = ml.get("createDate");
 
+                            LocalDate createDate = LocalDate.parse(String.valueOf(date));
 
+                            return createDate.isEqual(localDateTime.toLocalDate());
 
+                        })){
 
+                            days++;
 
+                        }
 
+                    }
 
+                }
 
+            }
 
             //去填未填日报非工作日
 
             for (LocalDateTime localDateTime : dateTimeList) {
 
                 if(mapList!=null){
 
@@ -4623,6 +4631,8 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
                         }
 
                     }
 
                 }
 
+                System.out.println(days);
 
+                System.out.println(num);
 
                 BigDecimal bigDecimal=new BigDecimal(num);
 
                 BigDecimal divide;
 
                 if(days!=0){

+ 12 - 7
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java
View File 

@@ -1409,14 +1409,17 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                             JSONObject json=new JSONObject();
 
                             JSONArray dataJson=new JSONArray();
 
                             JSONObject item=new JSONObject();
 
-                            item.put("审核人",user.getName());
 
+                            item.put("key","审核人");
 
+                            item.put("value",user.getName());
 
                             if(timeType.getNeedEvaluate()==1){
 
-                                item.put("评价",report.getEvaluate());
 
+                                item.put("key","评价");
 
+                                item.put("value",report.getEvaluate());
 
                                 json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
 
                             }else {
 
                                 json.put("template_id","tty9TkCAAANpvEtLrkPUGeOEd1-U7W2w");
 
                             }
 
-                            item.put("填报日期",report.getCreateDate());
 
+                            item.put("key","填报日期");
 
+                            item.put("value",report.getCreateDate());
 
                             dataJson.add(item);
 
                             json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
 
                             json.put("content_item",dataJson);
 
@@ -2177,9 +2180,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
                             JSONObject json=new JSONObject();
 
                             JSONArray dataJson=new JSONArray();
 
                             JSONObject item=new JSONObject();
 
-                            item.put("审核人",user.getName());
 
-                            item.put("评价",report.getEvaluate());
 
-                            item.put("填报日期",report.getCreateDate());
 
+                            item.put("key","审核人");
 
+                            item.put("value",user.getName());
 
+                            item.put("key","评价");
 
+                            item.put("value",report.getEvaluate());
 
+                            item.put("key","填报日期");
 
+                            item.put("value",report.getCreateDate());
 
                             dataJson.add(item);
 
                             json.put("template_id","tty9TkCAAAWoUyhGnXRCZuhkgCqw_Uow");
 
                             json.put("url","https://open.weixin.qq.com/connect/oauth2/authorize?appid=ww4e237fd6abb635af&redirect_uri=http://mobworktime.ttkuaiban.com/api/corpWXAuth&response_type=code&scope=snsapi_base&state=0#wechat_redirect");
 
@@ -2211,7 +2217,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
             for (Report r : allReports) {
 
                 LocalDate date = r.getCreateDate();
 
                 String creatorId = r.getCreatorId();
 
-                System.out.println("creatorId========="+creatorId);
 
                 if (!membList.stream().anyMatch(m->m.getCreateDate().isEqual(date) && m.getUserId().equals(creatorId))) {
 
                     //没有的话，存进去
 
                     ReportAlogMembdate membdate = new ReportAlogMembdate();

+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ExpenseSheetMapper.xml
View File 

@@ -16,11 +16,12 @@
 
         <result column="remark" property="remark" />
 
         <result column="total_amount" property="totalAmount" />
 
         <result column="operator_id" property="operatorId" />
 
+        <result column="deny_reason" property="denyReason" />
 
     </resultMap>
 
 
     <!-- 通用查询结果列 -->
 
     <sql id="Base_Column_List">
 
-        id, code, company_id, owner_id, owner_name, create_date, ticket_num, type, status, remark, total_amount, operator_id
 
+        id, code, company_id, owner_id, owner_name, create_date, ticket_num, type, status, remark, total_amount, operator_id, deny_reason
 
     </sql>
 
 
 </mapper>

+ 9 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml
View File 

@@ -277,7 +277,15 @@
 
         FROM report AS a
 
         JOIN user AS b ON a.creator_id = b.id
 
         left join department on department.department_id = a.dept_id
 
-        WHERE a.company_id=#{companyId} and (a.state = 1 or a.state =0)
 
+        WHERE a.company_id=#{companyId}
 
+        <choose>
 
+            <when test="stateKey!=null and stateKey==1">
 
+                and  a.state = 1
 
+            </when>
 
+            <otherwise>
 
+                and (a.state = 1 or a.state =0)
 
+            </otherwise>
 
+        </choose>
 
         <if test="projectId != null">
 
             and a.project_id = #{projectId}
 
         </if>

+ 8 - 14
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TaskMapper.xml
View File 

@@ -198,23 +198,17 @@
 
     </select>
 
 
     <select id="getTaskWithProjectName" resultMap="RichResultMap">
 
-        SELECT task.*, project.`project_name`, stages.stages_name
 
-        <if test="companyId==428">
 
-            ,department.department_name
 
-        </if>
 
+        SELECT task.id, task.project_id, task.name, task.executor_name, task.start_date, task.`end_date`,task.create_date, task.`creater_id`, task.`creater_name`, task.group_id,
 
+        task.plan_hours, task.task_type, task.task_level, task.task_status, task.`finish_date`, project.`project_name`, stages.stages_name,department.department_name
 
         FROM task LEFT JOIN project ON project.id = task.`project_id`
 
         left join stages on stages.id = task.stages_id
 
-        <if test="companyId==428">
 
-            left join department on department.department_id=project.dept_id
 
-        </if>
 
+        left join department on department.department_id=project.dept_id
 
         ${ew.customSqlSegment}
 
-        <if test="companyId==428">
 
-            <if test="deptIds!=null and deptIds.size()>0">
 
-                and project.dept_id in
 
-                <foreach collection="deptIds" open="(" close=")" separator="," item="item">
 
-                    #{item}
 
-                </foreach>
 
-            </if>
 
+        <if test="deptIds!=null and deptIds.size()>0">
 
+            and project.dept_id in
 
+            <foreach collection="deptIds" open="(" close=")" separator="," item="item">
 
+                #{item}
 
+            </foreach>
 
         </if>
 
         ORDER BY task.indate desc
 
         <if test="pageStart != null and pageSize != null">

+ 5 - 5
fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue
View File 

@@ -154,17 +154,17 @@
 
                 <el-table-column prop="monthCost" label="月成本"  v-if="permissions.structurePersonnel">
 
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.monthCost==null?0:scope.row.monthCost):'*'}} 元</template>
 
                 </el-table-column>
 
-                <el-table-column prop="cost" label="时薪"  v-if="permissions.structurePersonnel">
 
+                <el-table-column prop="cost" label="时薪"  v-if="permissions.structurePersonnel" width="120">
 
                     <template slot-scope="scope">{{user.timeType.isSecretSalary==0?(scope.row.cost==null?0:scope.row.cost):'*'}} 元
 
                         <el-link v-if="user.timeType.isSecretSalary==0" @click.native="showSalaryList(scope.row)"><i class="iconfont firerock-iconrecord"></i></el-link>
 
                     </template>
 
                 </el-table-column>
 
                 <el-table-column label="状态" width="160">
 
                     <template slot-scope="scope">
 
-                        <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '活跃'}}</span>
 
+                        <span>{{scope.row.isActive==0 ? '停用(' + scope.row.inactiveDate + ')' : '在职'}}</span>
 
                     </template>
 
                 </el-table-column>
 
-                <el-table-column label="操作" width="300">
 
+                <el-table-column label="操作" width="300" fixed="right">
 
                     <template slot-scope="scope">
 
                         <el-button size="mini" type="default" v-if="scope.row.roleName == '超级管理员' && user.id == scope.row.id" @click="transferRole(scope.row)">转让</el-button>
 
                         <el-button size="mini" type="default" v-if="scope.row.roleName != '超级管理员'" @click="resetPwd(scope.row)">重置</el-button>
 
@@ -437,7 +437,7 @@
 
                 <el-form-item label="导出" >
 
                     <el-radio-group v-model="containInvalid" >
 
                     <el-radio  :label="1" >全部人员</el-radio>
 
-                    <el-radio  :label="0" >仅活跃人员</el-radio>
 
+                    <el-radio  :label="0" >仅在职人员</el-radio>
 
                     </el-radio-group>
 
                 </el-form-item>
 
             </el-form>
 
@@ -835,7 +835,7 @@ export default {
 
         },
 
         {
 
           value: "1",
 
-          label: "活跃",
 
+          label: "在职",
 
         },
 
         {
 
           value: "0",

+ 2 - 1
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue
View File 

@@ -835,9 +835,10 @@
 
     };
 
 </script>
 
 
-<style lang="scss" scoped>
 
+<style lang="scss">
 
 .propsbtn {
 
     display: inline-block;
 
     padding-left: 20px;
 
 }
 
+
 
 </style>