Browse Source

1、修改密码由get改成post

2、收藏列表内容补充
master
Aug 6 months ago
parent
commit
5811129cda
4 changed files with 52 additions and 10 deletions
  1. +9
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/entity/WorkorderCollection.java
  2. +1
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java
  3. +32
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java
  4. +10
    -7
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

+ 9
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/entity/WorkorderCollection.java View File

@ -4,11 +4,16 @@ import java.io.Serializable;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Date; import java.util.Date;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.modules.workorderStep.entity.WorkorderStep;
import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.aspect.annotation.Dict;
@ -57,4 +62,8 @@ public class WorkorderCollection implements Serializable {
@Dict(dictTable = "workorder_user", dicText = "name", dicCode = "id") @Dict(dictTable = "workorder_user", dicText = "name", dicCode = "id")
@ApiModelProperty(value = "关联用户id") @ApiModelProperty(value = "关联用户id")
private java.lang.String userId; private java.lang.String userId;
//工单信息
@TableField(exist = false)
private WorkorderTemplate workorderTemplate;
} }

+ 1
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java View File

@ -54,7 +54,7 @@ public class TemplateController {
} }
@ApiOperation(value="工单信息-修改工单", notes="工单信息-修改工单") @ApiOperation(value="工单信息-修改工单", notes="工单信息-修改工单")
@RequestMapping(value = "/updateTemplate", method = {RequestMethod.GET})
@RequestMapping(value = "/updateTemplate", method = {RequestMethod.POST})
public Result<?> updateTemplate(UpdateTemplateBean templateBean){ public Result<?> updateTemplate(UpdateTemplateBean templateBean){
//返回信息 //返回信息


+ 32
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java View File

@ -9,17 +9,29 @@ import org.jeecg.modules.workorderBanner.service.IWorkorderBannerService;
import org.jeecg.modules.workorderCollection.entity.WorkorderCollection; import org.jeecg.modules.workorderCollection.entity.WorkorderCollection;
import org.jeecg.modules.workorderCollection.service.IWorkorderCollectionService; import org.jeecg.modules.workorderCollection.service.IWorkorderCollectionService;
import org.jeecg.modules.workorderNews.entity.WorkorderNews; import org.jeecg.modules.workorderNews.entity.WorkorderNews;
import org.jeecg.modules.workorderStatus.entity.WorkorderStatus;
import org.jeecg.modules.workorderStatus.service.IWorkorderStatusService;
import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate; import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
@Service @Service
public class CollectionServiceImpl implements CollectionService { public class CollectionServiceImpl implements CollectionService {
//轮播图信息
//收藏表信息
@Resource @Resource
private IWorkorderCollectionService workorderCollectionService; private IWorkorderCollectionService workorderCollectionService;
//工单表信息
@Resource
private IWorkorderTemplateService workorderTemplateService;
//工单状态表信息
@Resource
private IWorkorderStatusService workorderStatusService;
/*************************************************************************************/ /*************************************************************************************/
//收藏信息-我的收藏 //收藏信息-我的收藏
@ -37,9 +49,27 @@ public class CollectionServiceImpl implements CollectionService {
query.eq(WorkorderCollection::getUserId, userId); query.eq(WorkorderCollection::getUserId, userId);
} }
//获取账本信息
//获取收藏表信息
Page<WorkorderCollection> pageList = query.page(page); Page<WorkorderCollection> pageList = query.page(page);
//工单状态列表
List<WorkorderStatus> workorderStatus = workorderStatusService
.lambdaQuery()
.list();
//将收藏工单信息放入收藏表中
for (WorkorderCollection record : pageList.getRecords()) {
WorkorderTemplate template = workorderTemplateService.getById(record.getTemplateId());
//添加工单状态说明
for (WorkorderStatus status : workorderStatus) {
if(template.getStatusId().equals(status.getId())){
template.setStatusDescribe(status.getName());
break;
}
}
record.setWorkorderTemplate(template);
}
return Result.OK("我的收藏列表", pageList); return Result.OK("我的收藏列表", pageList);
} }
} }

+ 10
- 7
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java View File

@ -520,16 +520,19 @@ public class TemplateServiceImpl implements TemplateService {
workorderTemplate.setWorkorderStepList(stepList); workorderTemplate.setWorkorderStepList(stepList);
//补充工单状态描述 //补充工单状态描述
List<WorkorderStatus> workorderStatus = workorderStatusService
.lambdaQuery()
.list();
for (WorkorderStatus status : workorderStatus) {
if(workorderTemplate.getStatusId().equals(status.getId())){
workorderTemplate.setStatusDescribe(status.getName());
break;
if(null != workorderTemplate.getStatusId()){
List<WorkorderStatus> workorderStatus = workorderStatusService
.lambdaQuery()
.list();
for (WorkorderStatus status : workorderStatus) {
if(workorderTemplate.getStatusId().equals(status.getId())){
workorderTemplate.setStatusDescribe(status.getName());
break;
}
} }
} }
return Result.OK("工单详情!", workorderTemplate); return Result.OK("工单详情!", workorderTemplate);
} }


Loading…
Cancel
Save