wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-05 15:57:47 +08:00
parent 3d08431a33 6276b29333
commit eb287b4f3d
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/modules/activiti/service/ActHistoryService.java
View File

@ -4,6 +4,8 @@ import io.renren.common.constant.Constant;
import io.renren.common.page.PageData;
import io.renren.modules.activiti.dto.ProcessInstanceDTO;
import io.renren.modules.activiti.dto.TaskDTO;
import io.renren.modules.demanData.dto.TDemandDataDTO;
import io.renren.modules.demanData.service.TDemandDataService;
import io.renren.modules.demandComment.dto.TDemandCommentDTO;
import io.renren.modules.demandComment.service.TDemandCommentService;
import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
@ -82,6 +84,8 @@ public class ActHistoryService {
@Autowired
private TDemandCommentService tDemandCommentService;
@Autowired
private TDemandDataService tDemandDataService;
@Autowired
private ProcessEngine processEngine_;
@ -311,7 +315,13 @@ public class ActHistoryService {
TDemandCommentDTO tDemandCommentDTO = tDemandCommentService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandCommentDTO != null) {
dto.setName("发表需求评论");
dto.setResourceId(tDemandCommentDTO.getId().toString());
dto.setResourceId(null);
} else {
TDemandDataDTO tDemandDataDTO = tDemandDataService.get(Long.valueOf(dto.getBusinessKey()));
if (tDemandDataDTO != null) {
dto.setName(tDemandDataDTO.getDemandSubject());
dto.setResourceId(null);
}
}
}
}

6
renren-admin/src/main/java/io/renren/modules/resourceCollection/service/impl/ResourceCollectionServiceImpl.java
View File

@ -16,6 +16,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -77,6 +78,11 @@ public class ResourceCollectionServiceImpl extends CrudServiceImpl<ResourceColle
"tb_data_resource_assignmark\n" +
"SET tb_data_resource.total = round(tb_data_resource_assignmark.total) WHERE tb_data_resource.id =" + item.getResourceId());
} else {
collectionEntities.stream().forEach(index -> {
index.setUpdateDate(new Date());
resourceCollectionDao.updateById(index);
});
}
});
}

3
renren-admin/src/main/resources/mapper/resourceCar/ResourceCarDao.xml
View File

@ -73,6 +73,7 @@
AND car.resource_id = res.id
AND res.dept_id = dept.id
AND car.del_flag = 0
AND EXISTS (SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = car.resource_id)
<if test="name != null and name != ''">
AND res.name LIKE CONCAT('%',#{name},'%')
</if>
@ -104,6 +105,7 @@
AND car.user_id = #{userId}
AND res.dept_id = #{deptId}
AND car.del_flag = 0
AND EXISTS (SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = tb_resource_car.resource_id)
UNION (
SELECT
car.id AS "id",
@ -142,6 +144,7 @@
1 = 1
AND trc.user_id = #{userId}
AND trc.del_flag = 0
AND EXISTS (SELECT 1 FROM tb_data_resource WHERE tb_data_resource.id = tb_resource_car.resource_id)
<if test="name != null and name != ''">
AND tdr.name LIKE CONCAT('%',#{name},'%')
</if>