mengxu/pusong-crm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生成合同

Browse Source
This commit is contained in:
1073413548 2024-09-05 10:45:40 +08:00
parent 73a08ce88f
commit 90f6140c7b
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pusong-common/pusong-common-core/src/main/java/com/pusong/common/core/utils/DateUtils.java
View File

@ -125,7 +125,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
* 计算相差天数
*/
public static int differentDaysByMillisecond(Date date1, Date date2) {
return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
return (int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24));
}
/**
* 计算相差天数(只计算工作日：周一到周五,包括两边)

2
pusong-modules/pusong-business/src/main/java/com/pusong/business/controller/PsTaskWorkRecordController.java
View File

@ -48,7 +48,7 @@ public class PsTaskWorkRecordController extends BaseController {
}
/**
* 根据任务委派id查询工作进度列表
* 根据主任务id查询工作进度列表
*/
@Log(title = "根据主任务id查询工作进度列表")
@SaCheckPermission("business:taskWorkRecord:listByTaskId")

5
pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsTaskServiceImpl.java
View File

@ -116,9 +116,14 @@ public class PsTaskServiceImpl implements IPsTaskService {
public TableDataInfo<PsTaskMainVo> queryChildPageList(PsTaskQueryBo bo, PageQuery pageQuery){
Long id = bo.getId(); //此时是子任务的id
bo.setId(null);
//执行者的查询条件与主任中不同需要单独处理
String ex = bo.getExecutor();
bo.setExecutor(null);
QueryWrapper<PsTaskMain> lqw = buildQueryWrapper(bo);
lqw.exists(StringUtils.isNotBlank(ex), "select 1 from sys_user su where appo.executor = su.user_id and su.nick_name like '%" + ex + "%'");
lqw.eq("appo.appoint_type",bo.getAppointType());
lqw.eq(id != null,"appo.id",id);
log.info(lqw.getCustomSqlSegment());
Page<PsTaskMainVo> page = baseMapper.queryChildTaskPageList(pageQuery.build(), lqw);
for (PsTaskMainVo vo : page.getRecords()) {
if(vo.getStartDate() != null){