Browse Source

#批量填报功能

zhongwei
yang_shj 1 year ago
parent
commit
9e232ad685
  1. 8
      hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/RainfallEntity.java
  2. 8
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/entity/WorkTaskEntity.java
  3. 5
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/vo/WorkTaskContentVO.java
  4. 24
      hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/vo/WorkTaskPreviewVO.java
  5. 1
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java
  6. 15
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java
  7. 16
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java
  8. 11
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java
  9. 3
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java
  10. 4
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java
  11. 30
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java
  12. 27
      hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java
  13. 3
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/WorkTaskMapper.java
  14. 5
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/xml/WorkTaskMapper.xml
  15. 55
      hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java
  16. BIN
      hzims-service/ticket/src/main/resources/template/excel/work_task_template.xlsx

8
hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/fill/entity/RainfallEntity.java

@ -2,18 +2,20 @@ package com.hnac.hzims.operational.fill.entity;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity; import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
/**
* @author ysj
*/
@EqualsAndHashCode(callSuper = true)
@Data @Data
@TableName("hzims_fill_rainfall") @TableName("hzims_fill_rainfall")
@ApiModel(value="RainfallEntity", description="水利降雨量填报") @ApiModel(value="RainfallEntity", description="水利降雨量填报")

8
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/entity/WorkTaskEntity.java

@ -1,12 +1,19 @@
package com.hnac.hzims.ticket.repair.entity; package com.hnac.hzims.ticket.repair.entity;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity; import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@ -95,4 +102,5 @@ public class WorkTaskEntity extends TenantEntity {
@ApiModelProperty(value = "创建机构名称") @ApiModelProperty(value = "创建机构名称")
private String deptName; private String deptName;
} }

5
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/vo/WorkTaskContentVO.java

@ -13,6 +13,9 @@ public class WorkTaskContentVO {
private String location; private String location;
@ApiModelProperty(value = "工作内容") @ApiModelProperty(value = "工作内容")
private Integer content; private String content;
@ApiModelProperty(value = "下标")
private Integer $index;
} }

24
hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/repair/vo/WorkTaskPreviewVO.java

@ -1,9 +1,13 @@
package com.hnac.hzims.ticket.repair.vo; package com.hnac.hzims.ticket.repair.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity; import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/** /**
* @author ysj * @author ysj
@ -12,8 +16,23 @@ import lombok.EqualsAndHashCode;
@Data @Data
public class WorkTaskPreviewVO extends WorkTaskEntity { public class WorkTaskPreviewVO extends WorkTaskEntity {
@ApiModelProperty(value = "机构名称") @ApiModelProperty("创建人")
private String deptName; private Long userId;
@ApiModelProperty("创建部门")
private Long deptId;
@ApiModelProperty("创建时间")
@DateTimeFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
@JsonFormat(
pattern = "yyyy-MM-dd HH:mm:ss"
)
private Date time;
@ApiModelProperty(value = "单位")
private String company;
@ApiModelProperty(value = "班组成员数量") @ApiModelProperty(value = "班组成员数量")
private Integer groupCount; private Integer groupCount;
@ -45,7 +64,6 @@ public class WorkTaskPreviewVO extends WorkTaskEntity {
@ApiModelProperty(value = "签发时间: 分") @ApiModelProperty(value = "签发时间: 分")
private Integer createMin; private Integer createMin;
@ApiModelProperty(value = "开票处理时间: 年") @ApiModelProperty(value = "开票处理时间: 年")
private Integer headYear; private Integer headYear;

1
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/GenerateController.java

@ -45,6 +45,7 @@ public class GenerateController extends BladeController {
public R saveOrUpdate(@RequestBody GenerateEntity entity) { public R saveOrUpdate(@RequestBody GenerateEntity entity) {
return R.status(service.saveUpdate(entity)); return R.status(service.saveUpdate(entity));
} }
/** /**
* 新增 * 新增
*/ */

15
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/RainfallController.java

@ -21,6 +21,7 @@ import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.List;
/** /**
* @author ysj * @author ysj
@ -40,11 +41,23 @@ public class RainfallController extends BladeController {
*/ */
@PostMapping("/saveOrUpdate") @PostMapping("/saveOrUpdate")
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "新增", notes = "传入InsertPowerEntity对象") @ApiOperation(value = "新增", notes = "传入RainfallEntity对象")
public R saveOrUpdate(@RequestBody RainfallEntity entity) { public R saveOrUpdate(@RequestBody RainfallEntity entity) {
return R.status(service.saveUpdate(entity)); return R.status(service.saveUpdate(entity));
} }
/**
* 批量新增
*/
@PostMapping("/batchSave")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "新增", notes = "传入RainfallEntity对象集合")
public R batchSave(@RequestBody List<RainfallEntity> rains) {
return R.status(service.batchSave(rains));
}
/** /**
* 删除 * 删除
*/ */

16
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/controller/UseController.java

@ -20,6 +20,8 @@ import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* @author ysj * @author ysj
* @date 2023/04/10 11:16:07 * @date 2023/04/10 11:16:07
@ -38,16 +40,26 @@ public class UseController extends BladeController {
*/ */
@PostMapping("/saveOrUpdate") @PostMapping("/saveOrUpdate")
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@ApiOperation(value = "新增", notes = "传入InsertPowerEntity对象") @ApiOperation(value = "新增", notes = "传入UseEntity对象")
public R saveOrUpdate(@RequestBody UseEntity entity) { public R saveOrUpdate(@RequestBody UseEntity entity) {
return R.status(service.saveUpdate(entity)); return R.status(service.saveUpdate(entity));
} }
/** /**
* 批量新增
*/
@PostMapping("/batchSave")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "批量新增", notes = "传入UseEntity对象集合")
public R batchSave(@RequestBody List<UseEntity> uses) {
return R.status(service.batchSave(uses));
}
/**
* 删除 * 删除
*/ */
@PostMapping("/remove") @PostMapping("/remove")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 3)
@ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔") @ApiOperation(value = "逻辑删除", notes = "传入id字符串以逗号分隔")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
return R.status(service.deleteLogic(Func.toLongList(ids))); return R.status(service.deleteLogic(Func.toLongList(ids)));

11
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/RainfallService.java

@ -8,14 +8,12 @@ import org.springblade.core.mp.base.BaseService;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
/** import java.util.List;
* @author ysj
* @date 2023/03/09 16:12:22
* @version 4.0.0
*/
/** /**
* 接入电站历史发电量填报 * 接入电站历史发电量填报
* @author ysj
*/ */
public interface RainfallService extends BaseService<RainfallEntity> { public interface RainfallService extends BaseService<RainfallEntity> {
@ -24,4 +22,7 @@ public interface RainfallService extends BaseService<RainfallEntity> {
// 新增/修改水利降雨量填报数据 // 新增/修改水利降雨量填报数据
boolean saveUpdate(RainfallEntity entity); boolean saveUpdate(RainfallEntity entity);
// 批量保存降雨量填补数据
boolean batchSave(List<RainfallEntity> rains);
} }

3
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/UseService.java

@ -22,6 +22,9 @@ public interface UseService extends BaseService<UseEntity> {
// 分页查询用电量填报数据 // 分页查询用电量填报数据
R<IPage<UseVo>> pageCondition(QueryVo filter, Query query); R<IPage<UseVo>> pageCondition(QueryVo filter, Query query);
// 批量报错用电量填报数据
boolean batchSave(List<UseEntity> uses);
// 新增/修改用电量填报数据 // 新增/修改用电量填报数据
boolean saveUpdate(UseEntity entity); boolean saveUpdate(UseEntity entity);

4
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/GenerateServiceImpl.java

@ -102,8 +102,8 @@ public class GenerateServiceImpl extends BaseServiceImpl<GenerateMapper, Generat
//发电量为空的,且有ID的为删除 //发电量为空的,且有ID的为删除
List<Long> ids = entityList.stream(). List<Long> ids = entityList.stream().
filter(s -> ObjectUtil.isEmpty(s.getGenerate())) filter(s -> ObjectUtil.isEmpty(s.getGenerate()))
.filter(s -> ObjectUtil.isNotEmpty(s.getId())) .map(GenerateEntity::getId)
.map(GenerateEntity::getId).collect(Collectors.toList()); .filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
boolean deleteFlag =true; boolean deleteFlag =true;
if (CollectionUtil.isNotEmpty(ids)){ if (CollectionUtil.isNotEmpty(ids)){
deleteFlag= this.deleteLogic(ids); deleteFlag= this.deleteLogic(ids);

30
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/RainFallServiceImpl.java

@ -3,15 +3,13 @@ package com.hnac.hzims.operational.fill.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hnac.hzims.operational.fill.entity.RainfallEntity; import com.hnac.hzims.operational.fill.entity.RainfallEntity;
import com.hnac.hzims.operational.fill.entity.StorageEntity;
import com.hnac.hzims.operational.fill.mapper.RainfallMapper; import com.hnac.hzims.operational.fill.mapper.RainfallMapper;
import com.hnac.hzims.operational.fill.service.RainfallService; import com.hnac.hzims.operational.fill.service.RainfallService;
import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.QueryVo;
import com.hnac.hzims.operational.fill.vo.RainfallVo; import com.hnac.hzims.operational.fill.vo.RainfallVo;
import com.hnac.hzims.operational.fill.wrapper.OverWrapper;
import com.hnac.hzims.operational.fill.wrapper.RainfallWrapper; import com.hnac.hzims.operational.fill.wrapper.RainfallWrapper;
import com.hnac.hzims.operational.fill.wrapper.StorageWrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.log.exception.ServiceException; import org.springblade.core.log.exception.ServiceException;
@ -19,11 +17,14 @@ import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query; import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R; import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.CollectionUtil;
import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil; import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @author ysj * @author ysj
@ -78,4 +79,27 @@ public class RainFallServiceImpl extends BaseServiceImpl<RainfallMapper, Rainfal
} }
return this.updateById(entity); return this.updateById(entity);
} }
/**
* 批量保存降雨量填补数据
* @param rains
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchSave(List<RainfallEntity> rains) {
// 查询填报数据中存在的填报数据
List<RainfallEntity> filleds = this.list(Wrappers.<RainfallEntity>lambdaQuery()
.eq(RainfallEntity::getStationCode,rains.get(0).getStationCode())
.in(RainfallEntity::getFillDate,rains.stream().map(RainfallEntity::getFillDate).collect(Collectors.toList()))
);
// 如果存在就进行删除原来的填报数据
if(CollectionUtil.isNotEmpty(filleds)){
this.deleteLogic(filleds.stream().map(RainfallEntity::getId).collect(Collectors.toList()));
}
// 批量保存填报数据
return this.saveBatch(rains);
}
} }

27
hzims-service/operational/src/main/java/com/hnac/hzims/operational/fill/service/impl/UseServiceImpl.java

@ -4,15 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.hnac.hzims.operational.fill.entity.GenerateEntity;
import com.hnac.hzims.operational.fill.entity.PowerEntity;
import com.hnac.hzims.operational.fill.entity.UseEntity; import com.hnac.hzims.operational.fill.entity.UseEntity;
import com.hnac.hzims.operational.fill.mapper.UseMapper; import com.hnac.hzims.operational.fill.mapper.UseMapper;
import com.hnac.hzims.operational.fill.service.UseService; import com.hnac.hzims.operational.fill.service.UseService;
import com.hnac.hzims.operational.fill.vo.QueryVo; import com.hnac.hzims.operational.fill.vo.QueryVo;
import com.hnac.hzims.operational.fill.vo.UseVo; import com.hnac.hzims.operational.fill.vo.UseVo;
import com.hnac.hzims.operational.fill.wrapper.UseWrapper; import com.hnac.hzims.operational.fill.wrapper.UseWrapper;
import com.hnac.hzims.operational.main.vo.PowerMonthVo;
import com.hnac.hzims.operational.main.vo.UsrPowerVo; import com.hnac.hzims.operational.main.vo.UsrPowerVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -26,6 +23,7 @@ import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.ObjectUtil; import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.StringUtil; import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -66,6 +64,29 @@ public class UseServiceImpl extends BaseServiceImpl<UseMapper, UseEntity> implem
} }
/** /**
* 批量报错用电量填报数据
* @param uses
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public boolean batchSave(List<UseEntity> uses) {
// 查询填报数据中存在的填报数据
List<UseEntity> filleds = this.list(Wrappers.<UseEntity>lambdaQuery()
.eq(UseEntity::getStationCode,uses.get(0).getStationCode())
.in(UseEntity::getFillDate,uses.stream().map(UseEntity::getFillDate).collect(Collectors.toList()))
);
// 如果存在就进行删除原来的填报数据
if(CollectionUtil.isNotEmpty(filleds)){
this.deleteLogic(filleds.stream().map(UseEntity::getId).collect(Collectors.toList()));
}
// 批量保存填报数据
return this.saveBatch(uses);
}
/**
* 新增/修改用电量填报数据 * 新增/修改用电量填报数据
* @param entity * @param entity
* @return * @return

3
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/WorkTaskMapper.java

@ -1,6 +1,8 @@
package com.hnac.hzims.ticket.repair.mapper; package com.hnac.hzims.ticket.repair.mapper;
import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity; import com.hnac.hzims.ticket.repair.entity.WorkTaskEntity;
import com.hnac.hzims.ticket.repair.vo.WorkTaskPreviewVO;
import org.apache.ibatis.annotations.Param;
import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
/** /**
@ -8,4 +10,5 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
*/ */
public interface WorkTaskMapper extends UserDataScopeBaseMapper<WorkTaskEntity> { public interface WorkTaskMapper extends UserDataScopeBaseMapper<WorkTaskEntity> {
WorkTaskPreviewVO workTask(@Param("id") Long id);
} }

5
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/mapper/xml/WorkTaskMapper.xml

@ -3,4 +3,9 @@
<mapper namespace="com.hnac.hzims.ticket.repair.mapper.WorkTaskMapper"> <mapper namespace="com.hnac.hzims.ticket.repair.mapper.WorkTaskMapper">
<select id="workTask" resultType="com.hnac.hzims.ticket.repair.vo.WorkTaskPreviewVO">
SELECT *,CREATE_DEPT AS deptId,CREATE_USER AS userId,CREATE_TIME AS time FROM HZIMS_WORK_TASK
WHERE IS_DELETED = 0
AND ID = #{id}
</select>
</mapper> </mapper>

55
hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/repair/service/impl/WorkTaskServiceImpl.java

@ -139,6 +139,8 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
} }
if(ObjectUtil.isNotEmpty(entity.getTerminator())){ if(ObjectUtil.isNotEmpty(entity.getTerminator())){
entity.setWorkEndTime(new Date()); entity.setWorkEndTime(new Date());
entity.setTaskName("结束");
entity.setNextStepOperator("流程结束,无需人员处理");
} }
if(StringUtil.isNotBlank(entity.getLicensorName())){ if(StringUtil.isNotBlank(entity.getLicensorName())){
entity.setLicensorTime(new Date()); entity.setLicensorTime(new Date());
@ -188,6 +190,7 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
Map<String,Object> params = new HashMap<>(); Map<String,Object> params = new HashMap<>();
try { try {
params = PdfUtils.objectToMap(preview); params = PdfUtils.objectToMap(preview);
log.error("preview_to_map : {}",params);
}catch (Exception e) { }catch (Exception e) {
log.error("转换对象失败!"); log.error("转换对象失败!");
} }
@ -221,25 +224,28 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
*/ */
private WorkTaskPreviewVO workTaskExport(Long id) { private WorkTaskPreviewVO workTaskExport(Long id) {
// 查询工作任务单对象 // 查询工作任务单对象
WorkTaskEntity workTask = this.getById(id); WorkTaskPreviewVO preview = this.baseMapper.workTask(id);
if(ObjectUtil.isEmpty(workTask)){ log.error("preview_work_taks : {}",preview);
if(ObjectUtil.isEmpty(preview)){
throw new ServiceException("未查询到工作任务单数据!"); throw new ServiceException("未查询到工作任务单数据!");
} }
// 对象属性拷贝
WorkTaskPreviewVO preview = new WorkTaskPreviewVO();
BeanUtil.copyProperties(preview,workTask);
// 机构名称 // 机构名称
R<Dept> result = sysClient.getDept(workTask.getCreateDept()); R<Dept> result = sysClient.getDept(preview.getDeptId());
if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())){ if(result.isSuccess() && ObjectUtil.isNotEmpty(result.getData())){
preview.setDeptName(result.getData().getDeptName()); preview.setCompany(result.getData().getDeptName());
}
// 工作派工单签发人
R<User> user = userClient.userInfoById(preview.getUserId());
if(user.isSuccess() && ObjectUtil.isNotEmpty(user.getData())){
preview.setCreateName(user.getData().getName());
} }
// 班组数量 // 班组数量
if(StringUtil.isNotBlank(workTask.getMember())){ if(StringUtil.isNotBlank(preview.getMember())){
preview.setGroupCount(workTask.getMember().split(",").length); preview.setGroupCount(preview.getMember().split(",").length);
} }
// 工作地点 、工作内容 // 工作地点 、工作内容
if(StringUtil.isNotBlank(workTask.getWorkTask())){ if(StringUtil.isNotBlank(preview.getWorkTask())){
List<WorkTaskContentVO> contents = JSONObject.parseObject(workTask.getWorkTask(), new TypeReference<List<WorkTaskContentVO>>() {}); List<WorkTaskContentVO> contents = JSONObject.parseObject(preview.getWorkTask(), new TypeReference<List<WorkTaskContentVO>>() {});
if(CollectionUtil.isNotEmpty(contents)){ if(CollectionUtil.isNotEmpty(contents)){
StringBuilder location = new StringBuilder(),content = new StringBuilder(); StringBuilder location = new StringBuilder(),content = new StringBuilder();
for(WorkTaskContentVO item : contents){ for(WorkTaskContentVO item : contents){
@ -251,28 +257,23 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
} }
} }
// 计划工作时间 // 计划工作时间
if(ObjectUtil.isNotEmpty(workTask.getPlanStartTime()) && ObjectUtil.isNotEmpty(workTask.getPlanEndTime())){ if(ObjectUtil.isNotEmpty(preview.getPlanStartTime()) && ObjectUtil.isNotEmpty(preview.getPlanEndTime())){
Calendar start = Calendar.getInstance(); Calendar start = Calendar.getInstance();
start.setTime(workTask.getPlanStartTime()); start.setTime(preview.getPlanStartTime());
StringBuilder planTimeInterval = new StringBuilder(); StringBuilder planTimeInterval = new StringBuilder();
planTimeInterval.append(start.get(Calendar.YEAR)).append(" 年 ").append(start.get(Calendar.MONTH)).append(" 月 ").append(start.get(Calendar.DAY_OF_MONTH)) planTimeInterval.append(start.get(Calendar.YEAR)).append(" 年 ").append(start.get(Calendar.MONTH)).append(" 月 ").append(start.get(Calendar.DAY_OF_MONTH))
.append(" 日 ").append(start.get(Calendar.HOUR_OF_DAY)).append(" 时 ").append(start.get(Calendar.MINUTE)).append(" 分").append(" 至 "); .append(" 日 ").append(start.get(Calendar.HOUR_OF_DAY)).append(" 时 ").append(start.get(Calendar.MINUTE)).append(" 分").append(" 至 ");
Calendar end = Calendar.getInstance(); Calendar end = Calendar.getInstance();
end.setTime(workTask.getPlanStartTime()); end.setTime(preview.getPlanStartTime());
planTimeInterval.append(end.get(Calendar.YEAR)).append(" 年 ").append(end.get(Calendar.MONTH)).append(" 月 ").append(end.get(Calendar.DAY_OF_MONTH)) planTimeInterval.append(end.get(Calendar.YEAR)).append(" 年 ").append(end.get(Calendar.MONTH)).append(" 月 ").append(end.get(Calendar.DAY_OF_MONTH))
.append(" 日 ").append(end.get(Calendar.HOUR_OF_DAY)).append(" 时 ").append(end.get(Calendar.MINUTE)).append(" 分"); .append(" 日 ").append(end.get(Calendar.HOUR_OF_DAY)).append(" 时 ").append(end.get(Calendar.MINUTE)).append(" 分");
preview.setPlanTimeInterval(planTimeInterval.toString()); preview.setPlanTimeInterval(planTimeInterval.toString());
} }
// 工作派工单签发人
R<User> user = userClient.userInfoById(workTask.getCreateUser());
if(user.isSuccess() && ObjectUtil.isNotEmpty(user.getData())){
preview.setCreateName(user.getData().getName());
}
// 工作派工单签发时间 // 工作派工单签发时间
if(ObjectUtil.isNotEmpty(workTask.getCreateTime())){ if(ObjectUtil.isNotEmpty(preview.getTime())){
Calendar createTime = Calendar.getInstance(); Calendar createTime = Calendar.getInstance();
createTime.setTime(workTask.getCreateTime()); createTime.setTime(preview.getTime());
preview.setCreateYear(createTime.get(Calendar.YEAR)); preview.setCreateYear(createTime.get(Calendar.YEAR));
preview.setCreateMon(createTime.get(Calendar.MONTH)); preview.setCreateMon(createTime.get(Calendar.MONTH));
preview.setCreateDay(createTime.get(Calendar.DAY_OF_MONTH)); preview.setCreateDay(createTime.get(Calendar.DAY_OF_MONTH));
@ -280,9 +281,9 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
preview.setCreateMin(createTime.get(Calendar.MINUTE)); preview.setCreateMin(createTime.get(Calendar.MINUTE));
} }
// 开票处理时间 // 开票处理时间
if(ObjectUtil.isNotEmpty(workTask.getHeadHandleTime())){ if(ObjectUtil.isNotEmpty(preview.getHeadHandleTime())){
Calendar headTime = Calendar.getInstance(); Calendar headTime = Calendar.getInstance();
headTime.setTime(workTask.getHeadHandleTime()); headTime.setTime(preview.getHeadHandleTime());
preview.setHeadYear(headTime.get(Calendar.YEAR)); preview.setHeadYear(headTime.get(Calendar.YEAR));
preview.setHeadMon(headTime.get(Calendar.MONTH)); preview.setHeadMon(headTime.get(Calendar.MONTH));
preview.setHeadDay(headTime.get(Calendar.DAY_OF_MONTH)); preview.setHeadDay(headTime.get(Calendar.DAY_OF_MONTH));
@ -290,9 +291,9 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
preview.setHeadMin(headTime.get(Calendar.MINUTE)); preview.setHeadMin(headTime.get(Calendar.MINUTE));
} }
// 工单结束时间 // 工单结束时间
if(ObjectUtil.isNotEmpty(workTask.getWorkEndTime())){ if(ObjectUtil.isNotEmpty(preview.getWorkEndTime())){
Calendar entTime = Calendar.getInstance(); Calendar entTime = Calendar.getInstance();
entTime.setTime(workTask.getWorkEndTime()); entTime.setTime(preview.getWorkEndTime());
preview.setEndYear(entTime.get(Calendar.YEAR)); preview.setEndYear(entTime.get(Calendar.YEAR));
preview.setEndMon(entTime.get(Calendar.MONTH)); preview.setEndMon(entTime.get(Calendar.MONTH));
preview.setEndDay(entTime.get(Calendar.DAY_OF_MONTH)); preview.setEndDay(entTime.get(Calendar.DAY_OF_MONTH));
@ -300,9 +301,9 @@ public class WorkTaskServiceImpl extends BaseServiceImpl<WorkTaskMapper, WorkTas
preview.setEndMin(entTime.get(Calendar.MINUTE)); preview.setEndMin(entTime.get(Calendar.MINUTE));
} }
// 许可时间 // 许可时间
if(ObjectUtil.isNotEmpty(workTask.getLicensorTime())){ if(ObjectUtil.isNotEmpty(preview.getLicensorTime())){
Calendar licensorTime = Calendar.getInstance(); Calendar licensorTime = Calendar.getInstance();
licensorTime.setTime(workTask.getLicensorTime()); licensorTime.setTime(preview.getLicensorTime());
String licensorExportTime = licensorTime.get(Calendar.YEAR) + "年" + licensorTime.get(Calendar.MONTH) + "月" + licensorTime.get(Calendar.DAY_OF_MONTH) + String licensorExportTime = licensorTime.get(Calendar.YEAR) + "年" + licensorTime.get(Calendar.MONTH) + "月" + licensorTime.get(Calendar.DAY_OF_MONTH) +
"日" + licensorTime.get(Calendar.HOUR_OF_DAY) + "时" + licensorTime.get(Calendar.MINUTE) + "分"; "日" + licensorTime.get(Calendar.HOUR_OF_DAY) + "时" + licensorTime.get(Calendar.MINUTE) + "分";
preview.setLicensorExportTime(licensorExportTime); preview.setLicensorExportTime(licensorExportTime);

BIN
hzims-service/ticket/src/main/resources/template/excel/work_task_template.xlsx

Binary file not shown.
Loading…
Cancel
Save