|
|
@@ -9,6 +9,7 @@ import com.winsea.svc.base.base.entity.CommonRoleResource;
|
|
|
import com.winsea.svc.base.base.entity.CommonStaff;
|
|
|
import com.winsea.svc.base.base.service.ICommonRoleResourceService;
|
|
|
import com.winsea.svc.base.base.service.ICommonStaffService;
|
|
|
+import com.winsea.svc.base.base.util.DateUtils;
|
|
|
import com.winsea.svc.base.security.entity.User;
|
|
|
import com.winsea.svc.base.security.util.AuthSecurityUtils;
|
|
|
import com.winsea.svc.base.workflow.entity.Workflow;
|
|
|
@@ -21,6 +22,7 @@ import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.TranSettlementReportMapper;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.service.*;
|
|
|
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
|
+import org.apache.commons.httpclient.util.DateUtil;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -286,11 +288,15 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
|
|
|
@Override
|
|
|
public List<ContractManagementInfo> selectContractNoList(String compId) {
|
|
|
List<ContractManagementInfo> temp = new ArrayList();
|
|
|
- //查我方承运的合同
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.MONTH, -3);
|
|
|
+ //查不包含采购的我方承运的合同
|
|
|
List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("deliver_type", "1")
|
|
|
.eq("delete_flag", "0")
|
|
|
+ .ne("contract_type","2")
|
|
|
+ .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
|
|
|
.orderBy("update_date", false));
|
|
|
if (!CollectionUtils.isEmpty(contractManagementInfoList)){
|
|
|
temp.addAll(contractManagementInfoList);
|
|
|
@@ -300,6 +306,7 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
|
|
|
.eq("delete_flag", "0")
|
|
|
.eq("task_type_key", "3")
|
|
|
.eq("in_out_flag", "1")
|
|
|
+ .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
|
|
|
.orderBy("update_date", false));
|
|
|
for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
|
|
|
ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
|
zhangyuewww