Prechádzať zdrojové kódy

1.更新日工时统计

WoNiu 4 rokov pred
rodič
commit
d22246843e

+ 0 - 1
src/main/java/com/galaxis/manatee/dao/ChuanyunWorkHourDao.java

@@ -80,7 +80,6 @@ public interface ChuanyunWorkHourDao extends GalaxisRepository<ChuanyunWorkHourD
             "LEFT JOIN chuanyun_log ON chuanyun_day_log.parent_object_id = chuanyun_log.object_id " +
             " WHERE chuanyun_log.user_id = ? " +
             "AND DATE_SUB(CURDATE(), INTERVAL 1 MONTH) <= date(chuanyun_day_log.day_log_date)" +
-            "AND status!=3" +
             " GROUP BY chuanyun_day_log.project_id," +
             "chuanyun_log.user_id," +
             "chuanyun_day_log.project_type," +

+ 1 - 1
src/main/java/com/galaxis/manatee/task/ChuanyunScheduledTask.java

@@ -161,7 +161,7 @@ public class ChuanyunScheduledTask {
                var chuanyunFindAllResponse = chuanYunManager.findAll(ChuanyunMaterialDO.SCHEMA_CODE,projectfilter);
                ChuanyunSaveDTO chuanyunSaveDTO;
                if (chuanyunFindAllResponse.getReturnData()!=null){
-                   List<ChuanyunSaleContractDO> result=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
+                   List<ChuanyunMaterialDO> result=objectMapper.convertValue(chuanyunFindAllResponse.getReturnData().getBizObjectArray(), new TypeReference<>(){});
                    chuanyunSaveDTO=chuanYunManager.delete(ChuanyunMaterialDO.SCHEMA_CODE,result.get(0).getObjectId());
                }
                chuanyunSaveDTO =chuanYunManager.save(ChuanyunMaterialDO.SCHEMA_CODE,materialString,true);