From 12ef28f592bf1eb81e6e8ee0142659f20e89caf9 Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Wed, 21 Feb 2024 18:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/AppController.java | 32 ++++++++-- .../com/bonus/sgzb/app/domain/AppVersion.java | 60 +++++++++++++++++++ .../com/bonus/sgzb/app/mapper/AppMapper.java | 10 ++++ .../bonus/sgzb/app/service/AppService.java | 10 ++++ .../sgzb/app/service/impl/AppServiceImpl.java | 10 ++++ .../main/resources/mapper/app/AppMapper.xml | 13 ++++ .../material/PurchaseAccessoryMapper.xml | 3 +- 7 files changed, 132 insertions(+), 6 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/AppVersion.java diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java index 02f4bf21..f6a91ac3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java @@ -1,5 +1,7 @@ package com.bonus.sgzb.app.controller; +import com.bonus.sgzb.app.domain.AppVersion; +import com.bonus.sgzb.app.domain.BackApplyInfo; import com.bonus.sgzb.app.domain.CriticalData; import com.bonus.sgzb.app.domain.ToDoList; import com.bonus.sgzb.app.service.AppService; @@ -8,9 +10,11 @@ import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static com.bonus.sgzb.common.core.web.domain.AjaxResult.success; /** * @author c liu @@ -28,7 +32,7 @@ public class AppController { public AjaxResult getCriticalData() { CriticalData data = service.getCriticalData(); - return AjaxResult.success("操作成功",data); + return success("操作成功",data); } @ApiOperation(value = "查询待办事项") @@ -37,6 +41,24 @@ public class AppController { public AjaxResult getToDoList() { ToDoList data = service.getToDoList(); - return AjaxResult.success("操作成功",data); + return success("操作成功",data); } + + /** + * 获取app版本信息 + * + * @param + * @return AjaxResult对象 + */ + @Log(title = "获取app版本信息", businessType = BusinessType.QUERY) + @GetMapping("/getVersion") + public AjaxResult getVersion() { + try { + List list = service.getVersion(); + return success(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/AppVersion.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/AppVersion.java new file mode 100644 index 00000000..2335d43a --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/AppVersion.java @@ -0,0 +1,60 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** +* @description app版本 +* @author hay +* @date 2024/2/21 15:00 +*/ +@Data +public class AppVersion { + /** + * 版本号 + */ + @ApiModelProperty(value = "version") + private int version; + + /** + * 版本名称 + */ + @ApiModelProperty(value = "versionName") + private String versionName; + + /** + * apk名称 + */ + @ApiModelProperty(value = "apkName") + private String apkName; + + /** + * apk路径 + */ + @ApiModelProperty(value = "apkPath") + private String apkPath; + + /** + * 更新内容 + */ + @ApiModelProperty(value = "updateContent") + private String updateContent; + + /** + * 部署时间 + */ + @ApiModelProperty(value = "deployTime") + private String deployTime; + + /** + * 部署人员 + */ + @ApiModelProperty(value = "deployUser") + private String deployUser; + + /** + * 备注 + */ + @ApiModelProperty(value = "remark") + private String remark; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java index af12505c..93702dd4 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java @@ -1,8 +1,11 @@ package com.bonus.sgzb.app.mapper; +import com.bonus.sgzb.app.domain.AppVersion; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -62,4 +65,11 @@ public interface AppMapper { * @return */ int getTrialNum(); + + /** + * 获取app版本信息 + * @param + * @return List + */ + List getVersion(); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java index b29f1fdf..4fa80959 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java @@ -1,8 +1,11 @@ package com.bonus.sgzb.app.service; +import com.bonus.sgzb.app.domain.AppVersion; import com.bonus.sgzb.app.domain.CriticalData; import com.bonus.sgzb.app.domain.ToDoList; +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -20,4 +23,11 @@ public interface AppService { * @return */ ToDoList getToDoList(); + + /** + * 获取app版本信息 + * @param + * @return List + */ + List getVersion(); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java index 626384e7..01c6bf8d 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.sgzb.app.service.impl; +import com.bonus.sgzb.app.domain.AppVersion; import com.bonus.sgzb.app.domain.CriticalData; import com.bonus.sgzb.app.domain.ToDoList; import com.bonus.sgzb.app.mapper.AppMapper; @@ -8,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDate; +import java.util.List; /** * @author c liu @@ -49,4 +51,12 @@ public class AppServiceImpl implements AppService { data.setTrialNum(trialNum); return data; } + + /** + * 获取app版本信息 + */ + @Override + public List getVersion() { + return mapper.getVersion(); + } } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml index 317e0e44..5d25ddf7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml @@ -43,4 +43,17 @@ from tm_task where task_type = '45' and task_status = '46' and status = '1' + diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml index 1ef46834..ad398166 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseAccessoryMapper.xml @@ -458,7 +458,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join ma_supplier_info msi on pcd.supplier_id = msi.supplier_id left join tm_task tk on pcd.task_id = tk.task_id where - pcd.`status`=3 and pcd.`status`=1 + 1=1 + and (pcd.`status`=3 or pcd.`status`=1) and pcd.task_id = #{taskId} and (mt.pa_name like concat('%',#{keyWord},'%') or mt1.pa_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))