diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProScheduleDto.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProScheduleDto.java new file mode 100644 index 0000000..46e7198 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/dto/ProScheduleDto.java @@ -0,0 +1,15 @@ +package com.securitycontrol.entity.system.base.dto; + +import io.swagger.annotations.ApiModelProperty; + +/** + * @author:cwchen + * @date:2024-03-13-19:13 + * @version:1.0 + * @description:工程进度-dto + */ +public class ProScheduleDto { + + @ApiModelProperty(value = "关键字") + private String keyWord; +} diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProScheduleVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProScheduleVo.java new file mode 100644 index 0000000..5f65db0 --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/system/base/vo/ProScheduleVo.java @@ -0,0 +1,76 @@ +package com.securitycontrol.entity.system.base.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author:cwchen + * @date:2024-03-13-19:13 + * @version:1.0 + * @description:工程进度-vo + */ +@Data +public class ProScheduleVo { + + @ApiModelProperty(value = "工程ID") + private String proId; + + @ApiModelProperty(value = "建管单位") + private String org; + + + @ApiModelProperty(value = "标段工程编码") + private String bidCode; + + @ApiModelProperty(value = "单项工程编码") + private String signCode; + + @ApiModelProperty(value = "工程编码") + private String proCode; + + @ApiModelProperty(value = "工程名称") + private String proName; + + @ApiModelProperty(value = "工程成本") + private String proCost; + + @ApiModelProperty(value = "施工单位") + private String sgUnit; + + @ApiModelProperty(value = "监理单位") + private String jlUnit; + + @ApiModelProperty(value = "工程类型") + private String proType; + + @ApiModelProperty(value = "工程规模") + private String proScale; + + @ApiModelProperty(value = "项目经理") + private String manager; + + @ApiModelProperty(value = "工程简介") + private String proBrief; + + @ApiModelProperty(value = "当前工序") + private String nowGx; + + @ApiModelProperty(value = "工程状态") + private String status; + + @ApiModelProperty(value = "计划开始时间") + private String planStartTime; + + @ApiModelProperty(value = "计划结束时间") + private String planEndTime; + + @ApiModelProperty(value = "实际开始时间") + private String startTime; + + @ApiModelProperty(value = "实际竣工时间") + private String endTime; + + @ApiModelProperty(value = "当前进度") + private String nowProSchedule; + +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java new file mode 100644 index 0000000..82a9558 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/controller/ProScheduleController.java @@ -0,0 +1,39 @@ +package com.securitycontrol.system.base.controller; + +import com.securitycontrol.common.core.web.controller.BaseController; +import com.securitycontrol.common.core.web.page.TableDataInfo; +import com.securitycontrol.common.log.annotation.Log; +import com.securitycontrol.common.log.enums.OperationType; +import com.securitycontrol.entity.system.base.dto.ProScheduleDto; +import com.securitycontrol.entity.system.base.vo.ProScheduleVo; +import com.securitycontrol.system.base.service.IProScheduleService; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author:cwchen + * @date:2024-03-13-19:07 + * @version:1.0 + * @description:工程进度-web + */ +@RestController +@RequestMapping("/base/proSchedule/") +public class ProScheduleController extends BaseController { + + @Resource(name = "IProScheduleService") + private IProScheduleService service; + + @ApiOperation(value = "获取工程进度列表") + @GetMapping("getProScheduleLists") + @Log(title = "基础管理", menu = "基础管理->工程管理管理", grade = OperationType.QUERY_BUSINESS, details = "查询工程进度", type = "业务日志") + public TableDataInfo getProScheduleLists(ProScheduleDto dto) { + startPage(); + List list = service.getProScheduleLists(dto); + return getDataTable(list); + } +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java new file mode 100644 index 0000000..3500cdc --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/mapper/IProScheduleMapper.java @@ -0,0 +1,26 @@ +package com.securitycontrol.system.base.mapper; + +import com.securitycontrol.entity.system.base.dto.ProScheduleDto; +import com.securitycontrol.entity.system.base.vo.ProScheduleVo; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author:cwchen + * @date:2024-03-13-19:08 + * @version:1.0 + * @description:工程进度-业务逻辑层 + */ +@Repository(value = "IProScheduleMapper") +public interface IProScheduleMapper { + /** + * 获取工程进度列表 + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 19:20 + */ + List getProScheduleLists(ProScheduleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java new file mode 100644 index 0000000..87ba7b4 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/IProScheduleService.java @@ -0,0 +1,24 @@ +package com.securitycontrol.system.base.service; + +import com.securitycontrol.entity.system.base.dto.ProScheduleDto; +import com.securitycontrol.entity.system.base.vo.ProScheduleVo; + +import java.util.List; + +/** + * @author:cwchen + * @date:2024-03-13-19:07 + * @version:1.0 + * @description:工程进度-业务层 + */ +public interface IProScheduleService { + /** + * 获取工程进度列表 + * @param dto + * @return List + * @description + * @author cwchen + * @date 2024/3/13 19:19 + */ + List getProScheduleLists(ProScheduleDto dto); +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java new file mode 100644 index 0000000..79d730c --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProScheduleServiceImpl.java @@ -0,0 +1,33 @@ +package com.securitycontrol.system.base.service.impl; + +import com.securitycontrol.entity.system.base.dto.ProScheduleDto; +import com.securitycontrol.entity.system.base.vo.ProScheduleVo; +import com.securitycontrol.system.base.mapper.IProScheduleMapper; +import com.securitycontrol.system.base.service.IProScheduleService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author:cwchen + * @date:2024-03-13-19:08 + * @version:1.0 + * @description:工程进度-业务逻辑层 + */ +@Slf4j +@Service(value = "IProScheduleService") +public class ProScheduleServiceImpl implements IProScheduleService { + + @Resource(name = "IProScheduleMapper") + private IProScheduleMapper mapper; + + @Override + public List getProScheduleLists(ProScheduleDto dto) { + List list = new ArrayList<>(); + list = mapper.getProScheduleLists(dto); + return list; + } +} diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java index fac59e1..b6ab8ab 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/base/service/impl/ProServiceImpl.java @@ -54,7 +54,7 @@ public class ProServiceImpl implements IProService { private FileUploadService mongoService; @Value("${file.temp_file_path}") - private String temp_file_path; + private String tempFilePath; @Override @@ -227,7 +227,7 @@ public class ProServiceImpl implements IProService { public AjaxResult importProData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) { List errorList = new ArrayList<>(); try { - List lstObj = (List) ImportExcelUtils.readExcel(file, ProImportVo.class, temp_file_path); + List lstObj = (List) ImportExcelUtils.readExcel(file, ProImportVo.class, tempFilePath); List lstError = new ArrayList<>(); List list = new ArrayList<>(); if (lstObj != null && lstObj.size() > 0) { diff --git a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java index e2b117c..82bb5a3 100644 --- a/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java +++ b/securitycontrol-model/securitycontrol-system/src/main/java/com/securitycontrol/system/export/util/ExcelStyleUtil.java @@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.export.styler.IExcelExportStyler; import org.apache.poi.ss.usermodel.*; /** + * @author 10488 * @Auther: ccw * @Date: 2022/05/12/16:22 * @description: easypoi 导出表格样式 diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml new file mode 100644 index 0000000..5714633 --- /dev/null +++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProScheduleMapper.xml @@ -0,0 +1,38 @@ + + + + + + + \ No newline at end of file diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml similarity index 100% rename from securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ITeamQuEvalMapper.xml rename to securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/TeamQuEvalMapper.xml