提交 8cb8fb65 authored 作者: tykj's avatar tykj

feat:检查模块功能变更流程

上级 3335519d
...@@ -1179,6 +1179,8 @@ public class DeviceCheckController { ...@@ -1179,6 +1179,8 @@ public class DeviceCheckController {
@RequestParam(required = false, defaultValue = "0") int checkUserAId, @RequestParam(required = false, defaultValue = "0") int checkUserAId,
@RequestParam(required = false, defaultValue = "0") int checkUserBId, @RequestParam(required = false, defaultValue = "0") int checkUserBId,
@RequestParam(required = false, defaultValue = "") String checkUserCName, @RequestParam(required = false, defaultValue = "") String checkUserCName,
@RequestParam(required = false, defaultValue = "") String checkUserDName,
@RequestParam(required = false, defaultValue = "") String checkUserEName,
@RequestParam(required = false, defaultValue = "0") int isUpdate, @RequestParam(required = false, defaultValue = "0") int isUpdate,
@RequestParam String checkResult, @RequestParam String checkResult,
@RequestBody DetailVo detailVo @RequestBody DetailVo detailVo
...@@ -1194,7 +1196,7 @@ public class DeviceCheckController { ...@@ -1194,7 +1196,7 @@ public class DeviceCheckController {
//先更新checkUser //先更新checkUser
if (checkUserAId > 0 && checkUserBId > 0) { if (checkUserAId > 0 && checkUserBId > 0) {
detailRepo.updateCheckUserAbc(id, checkUserAId, checkUserBId, checkUserCName); detailRepo.updateCheckUserAbc(id, checkUserAId, checkUserBId, checkUserCName,checkUserDName,checkUserEName);
} }
// 审核通过与不通过的逻辑不同 // 审核通过与不通过的逻辑不同
......
...@@ -165,6 +165,14 @@ public class DeviceCheckDetail extends BaseEntity { ...@@ -165,6 +165,14 @@ public class DeviceCheckDetail extends BaseEntity {
@Column(name = "checkC_name") @Column(name = "checkC_name")
private String checkCName = ""; private String checkCName = "";
@ApiModelProperty(value = "checkC")
@Column(name = "checkD_name")
private String checkDName = "";
@ApiModelProperty(value = "checkC")
@Column(name = "checkE_name")
private String checkEName = "";
/** /**
* 用于生成市级的核查详情账单的构造函数 * 用于生成市级的核查详情账单的构造函数
*/ */
......
...@@ -61,6 +61,6 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I ...@@ -61,6 +61,6 @@ public interface DeviceCheckDetailDao extends JpaRepository<DeviceCheckDetail, I
* @param checkUserBId 核查组成员B * @param checkUserBId 核查组成员B
*/ */
@Modifying @Modifying
@Query("update DeviceCheckDetail o set o.checkUserAId =?2,o.checkUserBId=?3, o.checkCName = ?4 where o.id =?1") @Query("update DeviceCheckDetail o set o.checkUserAId =?2,o.checkUserBId=?3, o.checkCName = ?4,o.checkDName = ?5,o.checkEName = ?6 where o.id =?1")
void updateCheckUserAbc(int id, int checkUserAId, int checkUserBId, String checkCName); void updateCheckUserAbc(int id, int checkUserAId, int checkUserBId, String checkCName,String checkDName,String checkEName);
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论