考勤查询条件bug 修复

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -1592,7 +1592,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             CommunityDto communityDto = new CommunityDto();
             communityDto.setCommunityId(feeDto.getCommunityId());
             List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
-            if (communityDtos == null || communityDtos.size() < 1) {
+            if (ListUtil.isNull(communityDtos)) {
                 value = value.replace("C", "0");
             } else {
                 value = value.replace("C", communityDtos.get(0).getCommunityArea());
@@ -1606,7 +1606,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         }
         if (value.contains("RL")) {
             List<RoomAttrDto> roomAttrDtos = roomDto.getRoomAttrDto();
-            if (roomAttrDtos != null && roomAttrDtos.size() > 0) {
+            if (!ListUtil.isNull(roomAttrDtos)) {
                 for (RoomAttrDto roomAttrDto : roomAttrDtos) {
                     value = value.replace("RL" + roomAttrDto.getSpecCd(), roomAttrDto.getValue());
                 }
@@ -1723,15 +1723,15 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
                 round = Math.floor(mulMonth / paymentCycle);
             }
             // 轮数 * 周期 * 30 + 开始时间 = 目标 到期时间
-            targetEndDate = getTargetEndTime(round * paymentCycle, startDate,false);//目标结束时间
+            targetEndDate = getTargetEndTime(round * paymentCycle, startDate, false);//目标结束时间
 
             //todo 如果 到了 预付期 产生下个周期的费用
             if (DateUtil.getFormatTimeStringB(targetEndDate).equals(DateUtil.getFormatTimeStringB(endDate))
                     && DateUtil.getCurrentDate().getTime() > preEndTime.getTime()
             ) {
-                targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate,true);//目标结束时间
-            }else{
-                targetEndDate = getTargetEndTime(round * paymentCycle, startDate,true);//目标结束时间
+                targetEndDate = getTargetEndTime((round + 1) * paymentCycle, startDate, true);//目标结束时间
+            } else {
+                targetEndDate = getTargetEndTime(round * paymentCycle, startDate, true);//目标结束时间
             }
 
             //todo 费用项的结束时间<缴费的结束时间  费用快结束了   取费用项的结束时间
@@ -1783,7 +1783,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
     }
 
     @Override
-    public Date getTargetEndTime(double month, Date startDate,boolean mulOneSec) {
+    public Date getTargetEndTime(double month, Date startDate, boolean mulOneSec) {
         Calendar endDate = Calendar.getInstance();
         endDate.setTime(startDate);
 
@@ -1791,7 +1791,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         endDate.add(Calendar.MONTH, intMonth.intValue());
         double doubleMonth = month - intMonth;
         if (doubleMonth <= 0) {
-            if(mulOneSec) {
+            if (mulOneSec) {
                 endDate.add(Calendar.SECOND, -1);
             }
             return endDate.getTime();
@@ -1799,7 +1799,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         int futureDay = endDate.getActualMaximum(Calendar.DAY_OF_MONTH);
         Double hour = doubleMonth * futureDay * 24;
         endDate.add(Calendar.HOUR_OF_DAY, hour.intValue());
-        if(mulOneSec) {
+        if (mulOneSec) {
             endDate.add(Calendar.SECOND, -1);
         }
         return endDate.getTime();
@@ -1973,7 +1973,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         }
 
         Date endTime = feeDto.getEndTime();
-        Date date = getTargetEndTime(cycle, endTime,true);
+        Date date = getTargetEndTime(cycle, endTime, true);
         feeDto.setDeadlineTime(date);
         dealRentRate(feeDto);
 
@@ -1995,7 +1995,6 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
     }
 
 
-
     /**
      * 租金处理
      *

java110-db/src/main/resources/mapper/store/ScheduleClassesV1ServiceDaoImplMapper.xml

@@ -38,7 +38,7 @@
             and t.name= #{name}
         </if>
         <if test="nameLike !=null and nameLike != ''">
-            and t.name like concat('%',#{name},'%')
+            and t.name like concat('%',#{nameLike},'%')
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}
@@ -115,7 +115,7 @@
             and t.name= #{name}
         </if>
         <if test="nameLike !=null and nameLike != ''">
-            and t.name like concat('%',#{name},'%')
+            and t.name like concat('%',#{nameLike},'%')
         </if>
         <if test="remark !=null and remark != ''">
             and t.remark= #{remark}

service-common/src/main/java/com/java110/common/cmd/auditUser/ListAuditOrdersCmd.java

@@ -17,6 +17,7 @@ import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
 import com.java110.vo.ResultVo;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderDataVo;
 import com.java110.vo.api.resourceOrder.ApiResourceOrderVo;
@@ -64,7 +65,7 @@ public class ListAuditOrdersCmd extends Cmd {
         oaWorkflowDto.setFlowType(OaWorkflowDto.FLOW_TYPE_PURCHASE_APPLY);
         List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
 
-        if (oaWorkflowDtos == null || oaWorkflowDtos.size() < 1) {
+        if (ListUtil.isNull(oaWorkflowDtos)) {
             return;
         }
         List<String> flowIds = new ArrayList<>();

service-common/src/main/java/com/java110/common/cmd/itemRelease/DeleteItemReleaseTypeCmd.java

@@ -21,9 +21,15 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.doc.annotation.*;
+import com.java110.dto.itemRelease.ItemReleaseTypeDto;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
+import com.java110.dto.oaWorkflow.WorkflowModelDto;
 import com.java110.intf.common.IItemReleaseTypeV1InnerServiceSMO;
+import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.po.itemRelease.ItemReleaseTypePo;
+import com.java110.po.oaWorkflow.OaWorkflowPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +37,9 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
 @Java110CmdDoc(title = "删除物品放行类型",
         description = "删除物品放行类型，物品放行类型 比如大型物品 小型物品等",
         httpMethod = "post",
@@ -73,6 +82,9 @@ public class DeleteItemReleaseTypeCmd extends Cmd {
     @Autowired
     private IItemReleaseTypeV1InnerServiceSMO itemReleaseTypeV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IOaWorkflowInnerServiceSMO oaWorkflowInnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "typeId", "typeId不能为空");
@@ -84,6 +96,13 @@ public class DeleteItemReleaseTypeCmd extends Cmd {
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
+        ItemReleaseTypeDto itemReleaseTypeDto = new ItemReleaseTypeDto();
+        itemReleaseTypeDto.setTypeId(reqJson.getString("typeId"));
+        itemReleaseTypeDto.setCommunityId(reqJson.getString("communityId"));
+        List<ItemReleaseTypeDto> itemReleaseTypeDtos = itemReleaseTypeV1InnerServiceSMOImpl.queryItemReleaseTypes(itemReleaseTypeDto);
+
+        Assert.listOnlyOne(itemReleaseTypeDtos,"类型不存在");
+
         ItemReleaseTypePo itemReleaseTypePo = BeanConvertUtil.covertBean(reqJson, ItemReleaseTypePo.class);
         int flag = itemReleaseTypeV1InnerServiceSMOImpl.deleteItemReleaseType(itemReleaseTypePo);
 
@@ -91,6 +110,17 @@ public class DeleteItemReleaseTypeCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        //todo 删除添加的流程
+
+        OaWorkflowPo oaWorkflowPo = new OaWorkflowPo();
+        oaWorkflowPo.setFlowId(itemReleaseTypeDtos.get(0).getFlowId());
+        oaWorkflowPo.setFlowType(OaWorkflowDto.FLOW_TYPE_ITEM_RELEASE);
+         flag = oaWorkflowInnerServiceSMOImpl.deleteOaWorkflow(oaWorkflowPo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-job/src/main/java/com/java110/job/export/adapt/ReportFeeDetailRoomAdapt.java

@@ -10,6 +10,7 @@ import com.java110.intf.dev.IDictV1InnerServiceSMO;
 import com.java110.intf.report.IBaseDataStatisticsInnerServiceSMO;
 import com.java110.intf.report.IReportFeeStatisticsInnerServiceSMO;
 import com.java110.job.export.IExportDataAdapt;
+import com.java110.utils.util.ListUtil;
 import com.java110.utils.util.StringUtil;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -191,7 +192,7 @@ public class ReportFeeDetailRoomAdapt implements IExportDataAdapt {
         }
         queryStatisticsDto.setObjIds(objIds.toArray(new String[objIds.size()]));
         List<Map> infos = reportFeeStatisticsInnerServiceSMOImpl.getObjFeeSummary(queryStatisticsDto);
-        if (infos == null || infos.size() < 1) {
+        if (ListUtil.isNull(infos)) {
             return datas;
         }
         BigDecimal oweFee = null;

service-job/src/main/java/com/java110/job/task/attendance/GeneratorAttendanceTaskTemplate.java

@@ -23,6 +23,7 @@ import com.java110.po.attendance.AttendanceClassesTaskPo;
 import com.java110.po.attendance.AttendanceClassesTaskDetailPo;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -119,7 +120,7 @@ public class GeneratorAttendanceTaskTemplate extends TaskSystemQuartz {
         attendanceClassesStaffDto.setClassesId(tmpAttendanceClassesDto.getClassesId());
         attendanceClassesStaffDto.setStoreId(tmpStoreDto.getStoreId());
         List<AttendanceClassesStaffDto> attendanceClassesStaffs = attendanceClassesStaffV1InnerServiceSMOImpl.queryAttendanceClassesStaffs(attendanceClassesStaffDto);
-        if (attendanceClassesStaffs == null || attendanceClassesStaffs.size() < 1) {
+        if (ListUtil.isNull(attendanceClassesStaffs)) {
             return;
         }
 

service-store/src/main/java/com/java110/store/dao/impl/ScheduleClassesV1ServiceDaoImpl.java

@@ -71,9 +71,9 @@ public class ScheduleClassesV1ServiceDaoImpl extends BaseServiceDao implements I
     public List<Map> getScheduleClassesInfo(Map info) throws DAOException {
         logger.debug("查询 getScheduleClassesInfo 入参 info : {}",info);
 
-        List<Map> businessScheduleClassesInfos = sqlSessionTemplate.selectList("scheduleClassesV1ServiceDaoImpl.getScheduleClassesInfo",info);
+        List<Map> infos = sqlSessionTemplate.selectList("scheduleClassesV1ServiceDaoImpl.getScheduleClassesInfo",info);
 
-        return businessScheduleClassesInfos;
+        return infos;
     }
 
 
@@ -100,12 +100,12 @@ public class ScheduleClassesV1ServiceDaoImpl extends BaseServiceDao implements I
     public int queryScheduleClassessCount(Map info) {
         logger.debug("查询 queryScheduleClassessCount 入参 info : {}",info);
 
-        List<Map> businessScheduleClassesInfos = sqlSessionTemplate.selectList("scheduleClassesV1ServiceDaoImpl.queryScheduleClassessCount", info);
-        if (businessScheduleClassesInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("scheduleClassesV1ServiceDaoImpl.queryScheduleClassessCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
 
-        return Integer.parseInt(businessScheduleClassesInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
 

service-store/src/main/java/com/java110/store/smo/impl/ScheduleClassesStaffV1InnerServiceSMOImpl.java

@@ -29,6 +29,7 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.core.base.smo.BaseServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -136,7 +137,7 @@ public class ScheduleClassesStaffV1InnerServiceSMOImpl extends BaseServiceSMO im
                     ), ScheduleClassesStaffDto.class);
 
             //这里 如果没有员工排班 那么就认为 员工一直在上班
-            if (scheduleClassesStaffs == null || scheduleClassesStaffs.size() < 1) {
+            if (ListUtil.isNull(scheduleClassesStaffs)) {
                 scheduleClassesStaffDto.setWork(true);
                 return scheduleClassesStaffDto;
             }

springboot/src/main/resources/application-debug.yml

@@ -29,7 +29,7 @@ spring:
   activiti:
     database-schema-update: false
   datasource:
-    url: jdbc:mysql://192.168.100.108:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
+    url: jdbc:mysql://118.182.119.121:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
     username: TT
     password: hc12345678
     type: com.alibaba.druid.pool.DruidDataSource