bonus
/
gz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUG修改

This commit is contained in:
haozq 2024-11-16 14:36:52 +08:00
parent 8e3451c397
commit 3740ebe437
7 changed files with 49 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/gzgqj/business/plan/controller/ExportController.java
View File

@ -86,7 +86,7 @@ public class ExportController {
* @param o
*/
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PlanApplyBean o) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,@RequestBody PlanDataDetailBean o) {
try {
List<PlanDataDetailBean> results = planService.getDetailsList(o);
final int[] num = {1};

11
src/main/java/com/bonus/gzgqj/business/plan/controller/PlanApplicationController.java
View File

@ -110,7 +110,14 @@ public class PlanApplicationController {
public ServerResponse getPlanDetails(EncryptedReq<PlanApplyBean> dto) {
return service.getPlanDetails(dto.getData());
}
@GetMapping("getPlanDetailsList")
@DecryptAndVerify(decryptedClass = PlanDataDetailBean.class)
public PageInfo<PlanDataDetailBean> getPlanDetailsList(EncryptedReq<PlanDataDetailBean> dto) {
PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
List<PlanDataDetailBean> list = service.getPlanDetailsList(dto.getData());;
PageInfo<PlanDataDetailBean> pageInfo = new PageInfo<>(list);
return pageInfo;
}
@PostMapping("export")
public void export(HttpServletRequest request, HttpServletResponse response,PlanApplyBean o) {
@ -138,7 +145,7 @@ public class PlanApplicationController {
@PostMapping("exportDetail")
public void exportDetail(HttpServletRequest request, HttpServletResponse response,PlanApplyBean o) {
public void exportDetail(HttpServletRequest request, HttpServletResponse response,PlanDataDetailBean o) {
try {
List<PlanDataDetailBean> results = service.getDetailsList(o);
ExportParams exportParams = new ExportParams("机具明细", "机具明细", ExcelType.XSSF);

92
src/main/java/com/bonus/gzgqj/business/plan/entity/PlanDataDetailBean.java
View File

@ -19,6 +19,8 @@ public class PlanDataDetailBean {
private int xh;
private String applyId;
private String id;
/**
* 类型
@ -60,98 +62,12 @@ public class PlanDataDetailBean {
* 规格id
*/
private String moduleId;
public String getApplyId() {
return applyId;
}
public void setApplyId(String applyId) {
this.applyId = applyId;
}
private String name;
private String model;
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getTypeName() {
return typeName;
}
public void setTypeName(String typeName) {
this.typeName = typeName;
}
public String getModule() {
return module;
}
public void setModule(String module) {
this.module = module;
}
public String getUnit() {
return unit;
}
public void setUnit(String unit) {
this.unit = unit;
}
public int getNeedNum() {
return needNum;
}
public void setNeedNum(int needNum) {
this.needNum = needNum;
}
public String getTimes() {
return times;
}
public void setTimes(String times) {
this.times = times;
}
public String getRemarks() {
return remarks;
}
public void setRemarks(String remarks) {
this.remarks = remarks;
}
public String getModuleId() {
return moduleId;
}
public void setModuleId(String moduleId) {
this.moduleId = moduleId;
}

2
src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanApplicationMapper.java
View File

@ -55,7 +55,7 @@ public interface PlanApplicationMapper {
* @param o
* @return
*/
List<PlanDataDetailBean> getDetailsList(PlanApplyBean o);
List<PlanDataDetailBean> getDetailsList(PlanDataDetailBean o);
/**
* 删除详情数据
* @param o

9
src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationService.java
View File

@ -41,7 +41,7 @@ public interface PlanApplicationService {
* @param o
* @return
*/
List<PlanDataDetailBean> getDetailsList(PlanApplyBean o);
List<PlanDataDetailBean> getDetailsList(PlanDataDetailBean o);
/**
* 修改审核记录
* @param o
@ -64,4 +64,11 @@ public interface PlanApplicationService {
* @return
*/
List<PlanDevBean> getTypeList(PlanDevBean data);
/**
* 分页查询详情
* @param data
* @return
*/
List<PlanDataDetailBean> getPlanDetailsList(PlanDataDetailBean data);
}

17
src/main/java/com/bonus/gzgqj/business/plan/service/PlanApplicationServiceImp.java
View File

@ -168,9 +168,7 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
try {
PlanApplyBean vo=dao.getPlanDetailsbyId(o);
List<AuditBean> auditList=dao.getAuditList(o);
List<PlanDataDetailBean> details=dao.getDetailsList(o);
vo.setAuditList(auditList);
vo.setDetails(details);
return ServerResponse.createSuccess(vo);
}catch (Exception e) {
log.error(e.toString(), e);
@ -178,13 +176,25 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
return ServerResponse.createSuccess(new PlanDevBean());
}
@Override
public List<PlanDataDetailBean> getPlanDetailsList(PlanDataDetailBean data) {
List<PlanDataDetailBean> details=new ArrayList<>();
try {
details=dao.getDetailsList(data);
return details;
}catch (Exception e) {
log.error(e.toString(), e);
}
return new ArrayList<PlanDataDetailBean>();
}
/**
* 获取数据详情
*/
@Override
public List<PlanDataDetailBean> getDetailsList(PlanApplyBean o) {
public List<PlanDataDetailBean> getDetailsList(PlanDataDetailBean o) {
List<PlanDataDetailBean> details=dao.getDetailsList(o);
return details;
}
@ -231,4 +241,5 @@ public class PlanApplicationServiceImp implements PlanApplicationService {
}
}

14
src/main/resources/mappers/plan/PlanApplicationMapper.xml
View File

@ -151,13 +151,23 @@
ORDER BY tpr.audit_time DESC
</select>
<!-- 查询 内容集合-->
<select id="getDetailsList" parameterType="com.bonus.gzgqj.business.plan.entity.PlanApplyBean" resultType="com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean">
<select id="getDetailsList" parameterType="com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean" resultType="com.bonus.gzgqj.business.plan.entity.PlanDataDetailBean">
select id,apply_id applyId,model_id moduleId,
need_num needNum,need_day times,
remark remarks,type,name typeName,
module,unit
from t_plan_details
where apply_id=#{id} ORDER BY id asc
where apply_id=#{id}
<if test="type!=null and type !=''">
and type like concat('%',#{type},'%')
</if>
<if test="name!=null and name !=''">
and name like concat('%',#{name},'%')
</if>
<if test="model!=null and model !=''">
and module like concat('%',#{model},'%')
</if>
ORDER BY id asc
</select>
<!-- 查询 工程集合-->
<select id="getProList" parameterType="com.bonus.gzgqj.business.plan.entity.PlanDevBean" resultType="com.bonus.gzgqj.business.plan.entity.PlanProBean">