Browse Source

新增:线下操作票

zhongwei
ty 4 months ago
parent
commit
5e664747d5
  1. 10
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java
  2. 14
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java
  3. 2
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java
  4. 6
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

10
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/standardTicket/entity/StandardTicketInfoEntity.java

@ -168,4 +168,14 @@ public class StandardTicketInfoEntity extends TenantEntity implements Serializab
@TableField(exist = false) @TableField(exist = false)
@ApiModelProperty("监护人确认结果:approved-确认,rejected-作废") @ApiModelProperty("监护人确认结果:approved-确认,rejected-作废")
private String verifyResult; private String verifyResult;
@ApiModelProperty("是否线下 : 1-线下,0-线上")
@QueryField(condition = SqlCondition.EQUAL)
private Boolean isOffline;
@ApiModelProperty("是否审核通过,0为通过,1为未通过")
private Boolean isApproved;
@ApiModelProperty("图片附件")
private String picture;
} }

14
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java

@ -45,7 +45,19 @@ public class OperationTicketController {
@ApiOperation("启动流程") @ApiOperation("启动流程")
@PostMapping("/startUp") @PostMapping("/startUp")
public R start(@RequestBody StandardTicketInfoVo StandardTicketInfoVo) { public R start(@RequestBody StandardTicketInfoVo StandardTicketInfoVo) {
return operationTicketService.startUp(StandardTicketInfoVo); return operationTicketService.startUp(StandardTicketInfoVo,false);
}
/**
* 启动流程
*
* @return
*/
@ApiOperation("启动线下流程")
@PostMapping("/startOffineOperation")
public R startOffineOperation(@RequestBody StandardTicketInfoVo StandardTicketInfoVo) {
operationTicketService.startUp(StandardTicketInfoVo,true);
return R.success("申请开票成功");
} }

2
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/OperationTicketService.java

@ -20,7 +20,7 @@ public interface OperationTicketService {
* 启动流程 * 启动流程
* @param standardTicketInfoVo * @param standardTicketInfoVo
*/ */
R startUp(StandardTicketInfoVo standardTicketInfoVo); R startUp(StandardTicketInfoVo standardTicketInfoVo,Boolean isOffice);
/** /**

6
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/OperationTicketServiceImpl.java

@ -60,6 +60,7 @@ import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.OFFLINE_OPERATION_TICKET;
import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.OPERATION_TICKET_KEY; import static com.hnac.hzims.middle.process.constant.TicketProcessConstant.OPERATION_TICKET_KEY;
@ -100,12 +101,15 @@ public class OperationTicketServiceImpl implements OperationTicketService , Star
* @param standardTicketInfoVo * @param standardTicketInfoVo
*/ */
@Override @Override
public R startUp(StandardTicketInfoVo standardTicketInfoVo) { public R startUp(StandardTicketInfoVo standardTicketInfoVo,Boolean isOffice) {
log.info("执行 com.hnac.hzims.ticket.standardTicket.service.impl【startUp】 。。。方法"); log.info("执行 com.hnac.hzims.ticket.standardTicket.service.impl【startUp】 。。。方法");
//保存操作票 //保存操作票
String standardTicketInfoVoBySave = this.saveEntity(JSONObject.toJSONString(standardTicketInfoVo)); String standardTicketInfoVoBySave = this.saveEntity(JSONObject.toJSONString(standardTicketInfoVo));
//查询流程对应value //查询流程对应value
String dictValue = processDictFeignService.selectDictValueByKey(OPERATION_TICKET_KEY); String dictValue = processDictFeignService.selectDictValueByKey(OPERATION_TICKET_KEY);
if (true){
dictValue = processDictFeignService.selectDictValueByKey(OFFLINE_OPERATION_TICKET);
}
log.info("查询第操作票值: {}", dictValue); log.info("查询第操作票值: {}", dictValue);
if (StringUtils.isBlank(dictValue)) { if (StringUtils.isBlank(dictValue)) {
throw new ServiceException("服务器异常,请联系管理员"); throw new ServiceException("服务器异常,请联系管理员");

Loading…
Cancel
Save