@@ -133,7 +133,7 @@ public class AssetsController extends BaseController {
/**
* 资产业务订单表更新
*/
- @PutMapping("")
+ @PutMapping("/update")
public RestResponse<Boolean> update(@RequestBody Assets assets) {
Boolean ret = assetsService.update(assets);
return RestResponse.data(ret);
@@ -25,7 +25,7 @@
<!--根据申报id获取绩效比列分配集合-->
<select id="alloAssetsDistributionDeclareId" resultType="com.dayou.dto.UserShareRate">
- SELECT member_id AS userId, member_type AS memberType, performance_distribution AS rate, name
+ SELECT member_id AS userId, member_type AS memberType, performance_distribution AS rate, name, participation_duration AS participationDuration
FROM business_performance_distribution, user
WHERE declare_id = #{declareId}
AND member_id = user.id
@@ -28,4 +28,9 @@ public class UserShareRate {
* 绩效分配项目成员类型
private String memberType;
+
+ /**
+ * 人员参与时长(小时)
+ */
+ private Integer participationDuration;
}
@@ -69,5 +69,9 @@ public class BusinessPerformanceDistribution extends BaseEntity implements Seria
private String userType;
@@ -237,6 +237,7 @@ public class CommissionDeclareServiceImpl extends ServiceImpl<CommissionDeclareM
performanceDistribution.setMemberType(distribution.getMemberType());
performanceDistribution.setDeclareId(commissionDeclare.getId());
performanceDistribution.setUserType(declareDTO.getDistributionDto().getUserType());
+ performanceDistribution.setParticipationDuration(distribution.getParticipationDuration());
performanceDistributionList.add(performanceDistribution);
iBusinessPerformanceDistributionService.saveBatch(performanceDistributionList);
@@ -490,4 +490,11 @@ ALTER TABLE business_performance_distribution MODIFY COLUMN report_no VARCHAR(12
修改人:苟耕铨
# 表assets_evaluation_target修改字段file_path
-ALTER TABLE assets_evaluation_target MODIFY COLUMN file_path JSON NULL COMMENT '附件资料路由信息(json)';
+ALTER TABLE assets_evaluation_target MODIFY COLUMN file_path JSON NULL COMMENT '附件资料路由信息(json)';
+/**
+ 日期:2024-06-03
+ 修改人:苟耕铨
+# 表business_performance_distribution新增字段participation_duration
+ALTER TABLE business_performance_distribution ADD COLUMN participation_duration INT(11) NULL COMMENT '参与时长(小时)';