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

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

@@ -441,13 +441,29 @@ public class ReportController {
 
 
         //添加财务审核该月后无法再次填报该月日报
-        if(null != createDate && 1== createDate.length){
-            String reportYM = createDate[0].substring(0,7);
-            Integer count = financialAuditMapper.checkFinanceReview(user.getCompanyId(),reportYM);
-            if(0 < count){
-                HttpRespMsg msg = new HttpRespMsg();
-                msg.setError(MessageUtils.message("report.financial_report",reportYM));
-                return msg;
+        if(null != createDate && 0 < createDate.length){
+            String createDateOne = createDate[0];
+            if (createDateOne.contains("@")) {
+                //批量填报的日期
+                String[] dateArray = createDateOne.split("@");
+                for (String date : dateArray) {
+                    String reportYM = date.substring(0,7);
+                    Integer count = financialAuditMapper.checkFinanceReview(user.getCompanyId(),reportYM);
+                    if(0 < count){
+                        HttpRespMsg msg = new HttpRespMsg();
+                        msg.setError(MessageUtils.message("report.financial_report",reportYM));
+                        return msg;
+                    }
+                }
+            } else {
+                //单个日期
+                String reportYM = createDateOne.substring(0,7);
+                Integer count = financialAuditMapper.checkFinanceReview(user.getCompanyId(),reportYM);
+                if(0 < count){
+                    HttpRespMsg msg = new HttpRespMsg();
+                    msg.setError(MessageUtils.message("report.financial_report",reportYM));
+                    return msg;
+                }
             }
         }
 

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

@@ -505,6 +505,7 @@ public class DingDingServiceImpl implements DingDingService {
             //新开通的情况，给字段默认值
             dingding.setSyncContact(1);
 //            dingding.setContactNeedTranslate(1);//上架到钉钉应用市场，采用数据安全中心的方式，不需要转译了。
+            dingding.setContactNeedTranslate(0);
             //第一次，查询对方企业的accessToken
             SysConfig config = sysConfigMapper.selectOne(new QueryWrapper<SysConfig>().eq("param_key", "dingding_suite_ticket"));
             String suiteTicket = config.getParamValue();
@@ -1579,15 +1580,12 @@ public class DingDingServiceImpl implements DingDingService {
                 departmentDingding.setCorpid(corpid);
                 departmentDingding.setDdDeptid(dept.getInteger("dept_id"));
                 //TODO:对于钉钉市场的用户，需要通讯录加密的，没有返回部门名称，用部门id替代
-                if (companyDingding.getContactNeedTranslate() == 1) {
+                if (companyDingding.getContactNeedTranslate() != null && companyDingding.getContactNeedTranslate() == 1) {
                     departmentDingding.setName(dept.getString("dept_id"));
                 } else {
                     departmentDingding.setName(dept.getString("name"));
                 }
                 departmentDingding.setDdParentid(dept.getInteger("parent_id"));
-                if (departmentDingding.getDdDeptid() == 661842181) {
-                    System.out.println("=========zfind 661842181"+departmentDingding.getName());
-                }
                 synchronized (deptLock) {
                     List<DepartmentDingding> departmentDingdings = departmentDingdingMapper.selectList(new QueryWrapper<DepartmentDingding>()
                             .eq("corpid", corpid)

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

@@ -9877,11 +9877,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         for (User item : needRangeUserList) {
             for (LocalDate day : days) {
                 boolean workDay = WorkDayCalculateUtils.isWorkDay(day);
-                //去掉非工作日
+                boolean match = list.stream().anyMatch(l -> l.get("createDate").equals(df.format(day)) && l.get("userId").equals(item.getId()));
+                //去掉非工作日且无日报
                 if(!workDay){
                     continue;
                 }
-                boolean match = list.stream().anyMatch(l -> l.get("createDate").equals(df.format(day)) && l.get("userId").equals(item.getId()));
                 if(!match){
                     Map<String,Object> map=new HashMap<>();
                     map.put("userId",item.getId());
@@ -9943,12 +9943,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     Method method = aClass.getMethod(getter);
                     String invoke = (String) method.invoke(targetUser);
                     if(invoke==null||invoke.equals("有加班费")){
-                        if((!(Double.valueOf(String.valueOf(map.get("workingTime"))).equals(Double.valueOf(String.valueOf(map.get("cardTime"))))))&&(map.containsKey("cancelNormal")&&(Integer)map.get("cancelNormal")!=1)){
+                        if((!(Double.valueOf(String.valueOf(map.get("workingTime"))).equals(Double.valueOf(String.valueOf(map.get("cardTime"))))))&&(map.containsKey("cancelNormal")&&(Integer.valueOf(String.valueOf(map.get("cancelNormal"))))!=1)){
                             map.put("exceedCardTime",1);
                         }
                         map.put("invokeValue","有加班费");
                     }else{
-                        if(((Double.valueOf(String.valueOf(map.get("workingTime")))<Double.valueOf(String.valueOf(map.get("cardTime")))))&&(map.containsKey("cancelNormal")&&(Integer)map.get("cancelNormal")!=1)){
+                        if(((Double.valueOf(String.valueOf(map.get("workingTime")))<Double.valueOf(String.valueOf(map.get("cardTime")))))&&(map.containsKey("cancelNormal")&&(Integer.valueOf(String.valueOf(map.get("cancelNormal"))))!=1)){
                             map.put("exceedCardTime",1);
                         }
                         map.put("invokeValue","无加班费");

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ReportMapper.xml

@@ -1380,7 +1380,7 @@
 
     <select id="getUserDailyWorkTimeReminder" resultType="java.util.Map">
         SELECT date_format(r.create_date,'%Y-%m-%d') AS createDate,u.name AS name,u.id as userId,u.corpwx_userid as corpwxUserId,d.corpwx_deptid as corpwxDeptId,d.department_name AS departmentName,
-        IFNULL(SUM(r.working_time),0) AS  workingTime,IFNULL(ufv.work_hours,0) AS cardTime,ufv.cancel_normal as cancelNormal
+        IFNULL(SUM(r.working_time),0) AS  workingTime,IFNULL(ufv.work_hours,0) AS cardTime,IFNULL(ufv.cancel_normal, 0) as cancelNormal
         FROM report  r
         LEFT JOIN user u ON r.creator_id=u.id
         LEFT JOIN department d ON d.department_id=u.department_id