bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修饰审核--代码y优化

This commit is contained in:
syruan 2024-11-14 14:06:32 +08:00
parent 7bc0f9f9d5
commit ee2ccfdef2
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java
View File

@ -1,5 +1,6 @@
package com.bonus.material.repair.controller; package com.bonus.material.repair.controller;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -54,14 +55,15 @@ public class RepairAuditDetailsController extends BaseController {
@RequiresPermissions("service:auditing:list") @RequiresPermissions("service:auditing:list")
public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { public TableDataInfo questList(RepairAuditDetails repairAuditDetails) {
startPage(); startPage();
Map<String, Object> params = repairAuditDetails.getParams(); // Map<String, Object> params = repairAuditDetails.getParams();
if (params != null && !params.isEmpty()) { Map<String, Object> params = new HashMap<>();
String beginTime = (String) params.get("beginTime"); // if (params != null && !params.isEmpty()) {
String endTime = (String) params.get("endTime"); // String beginTime = (String) params.get("beginTime");
params.put("beginTime", beginTime + " 00:00:00"); // String endTime = (String) params.get("endTime");
params.put("endTime", endTime + " 23:59:59"); // params.put("beginTime", beginTime + " 00:00:00");
repairAuditDetails.setParams(params); // params.put("endTime", endTime + " 23:59:59");
} // repairAuditDetails.setParams(params);
// }
List<ScrapApplyDetailsVO> list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); List<ScrapApplyDetailsVO> list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails);
return getDataTable(list); return getDataTable(list);
} }

17
bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java
View File

@ -5,21 +5,21 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.bonus.common.core.annotation.Excel; import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import com.bonus.common.core.web.domain.BaseEntity; import com.bonus.common.core.web.domain.BaseEntity;
/** /**
* 修试审核详细对象 repair_audit_details * 修试审核详细对象 repair_audit_details
* *
* @author xsheng * @author syruan
* @date 2024-10-16
*/ */
@EqualsAndHashCode(callSuper = false)
@Data @Data
@ToString @ToString
public class RepairAuditDetails extends BaseEntity { public class RepairAuditDetails extends BaseEntity {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = -8752731235584328836L;
/** ID */ /** ID */
private Long id; private Long id;
@ -71,8 +71,8 @@ public class RepairAuditDetails extends BaseEntity {
private Date auditTime; private Date auditTime;
/** 备注备注 */ /** 备注备注 */
@Excel(name = "备注备注") @Excel(name = "审核备注")
@ApiModelProperty(value = "备注备注") @ApiModelProperty(value = "审核备注")
private String auditRemark; private String auditRemark;
/** 0未审核1已审核2驳回 */ /** 0未审核1已审核2驳回 */
@ -85,5 +85,6 @@ public class RepairAuditDetails extends BaseEntity {
@ApiModelProperty(value = "数据所属组织") @ApiModelProperty(value = "数据所属组织")
private Integer companyId; private Integer companyId;
@ApiModelProperty(value = "关键字")
private String keyWord;
} }