From 4f63570747b550f1d78e40035dcbe4807f2b157a Mon Sep 17 00:00:00 2001 From: wangh <123456> Date: Wed, 27 Jul 2022 15:12:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=80=BB=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/broad/MouthController.java | 86 ++---------- .../BasePictureLocationController.java | 127 ++++++++++++++++++ .../controller/BaseProductQtyController.java | 12 +- .../system/controller/BaseTeamController.java | 12 +- .../controller/BaseUserManyiduController.java | 125 +++++++++++++++++ .../system/domain/BasePictureLocation.java | 65 +++++++++ .../ruoyi/system/domain/BaseUserManyidu.java | 108 +++++++++++++++ .../mapper/BasePictureLocationMapper.java | 61 +++++++++ .../system/mapper/BaseUserManyiduMapper.java | 63 +++++++++ .../ruoyi/system/mapper/BroadDataMapper.java | 2 + .../service/IBasePictureLocationService.java | 61 +++++++++ .../service/IBaseUserManyiduService.java | 63 +++++++++ .../system/service/IBroadDataService.java | 2 + .../impl/BasePictureLocationServiceImpl.java | 94 +++++++++++++ .../impl/BaseUserManyiduServiceImpl.java | 101 ++++++++++++++ .../service/impl/BroadDataServiceImpl.java | 8 ++ .../resources/createsql/base_manyiduMenu.sql | 27 ++++ .../createsql/base_picture_locationMenu.sql | 27 ++++ .../system/BasePictureLocationMapper.xml | 64 +++++++++ .../mapper/system/BaseUserManyiduMapper.xml | 86 ++++++++++++ .../mapper/system/BroadDataMapper.xml | 19 ++- .../templates/system/base_manyidu/add.html | 55 ++++++++ .../system/base_manyidu/base_manyidu.html | 102 ++++++++++++++ .../templates/system/base_manyidu/edit.html | 50 +++++++ .../system/base_picture_location/add.html | 39 ++++++ .../base_picture_location.html | 90 +++++++++++++ .../system/base_picture_location/edit.html | 40 ++++++ 27 files changed, 1497 insertions(+), 92 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseUserManyiduController.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserManyidu.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/BasePictureLocationMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseUserManyiduMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IBasePictureLocationService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseUserManyiduService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BasePictureLocationServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseUserManyiduServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/createsql/base_manyiduMenu.sql create mode 100644 ruoyi-system/src/main/resources/createsql/base_picture_locationMenu.sql create mode 100644 ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/system/BaseUserManyiduMapper.xml create mode 100644 ruoyi-system/src/main/resources/templates/system/base_manyidu/add.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_manyidu/base_manyidu.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_manyidu/edit.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html create mode 100644 ruoyi-system/src/main/resources/templates/system/base_picture_location/edit.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java index e64d6e8..e361e3e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/broad/MouthController.java @@ -1,6 +1,7 @@ package com.ruoyi.web.controller.broad; import com.alibaba.fastjson.JSONArray; +import com.ruoyi.system.service.IBaseUserManyiduService; import com.ruoyi.system.service.IBroadDataService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -19,87 +20,24 @@ public class MouthController { @Autowired private IBroadDataService service; + @Autowired + private IBaseUserManyiduService baseUserManyiduService; - @PostMapping("/selectProductInStore") - @ApiOperation("周产量统计") + @PostMapping("/selectProductInStoreGroupMonth") + @ApiOperation("月产量统计") @ResponseBody - public String zhou_selectProductInStore() { - + public String yue_selectProductInStore() { // IMOS_PR_PRODUCT_BARCODE - return JSONArray.toJSONString( service.zhou_selectProductInStore()); + return JSONArray.toJSONString( service.yue_selectProductInStore()); } - - @PostMapping("/selectOrderRateInfo") - @ApiOperation("周订单执行情况") - @ResponseBody - public String zhou_selectOrderRateInfo() { - return JSONArray.toJSONString(service.zhou_selectOrderRateInfo()); + @PostMapping("/selectUserSatisfaction") + @ApiOperation("用户满意度") + public String yue_selectUserSatisfaction() { +// IMOS_PR_PRODUCT_BARCODE + return JSONArray.toJSONString( baseUserManyiduService.yue_selectUserSatisfaction()); } - @PostMapping("/selectOrderRateInfoTatle") - @ApiOperation("周订单执行情况标题") - @ResponseBody - public String zhou_selectOrderRateTatle() { - return JSONArray.toJSONString(service.zhou_selectOrderRateTatle()); - } - - - - @PostMapping("/zhou_selectQaInfo") - @ApiOperation("周异常情况") - @ResponseBody - public String zhou_selectQaInfo() { - return JSONArray.toJSONString(service.zhou_selectQaInfo()); - } - - @PostMapping("/zhou_selectQaItemInfo") - @ApiOperation("周异常情况曲线") - @ResponseBody - public String zhou_selectQaItemInfo() { - return JSONArray.toJSONString(service.zhou_selectQaItemInfo()); - } - - /* @PostMapping("/zhou_selectQaItemInfo1") - @ApiOperation("test") - @ResponseBody - public void zhou_selectQaItemInfo1() { - - - try { - DriverManager.registerDriver (new oracle.jdbc.OracleDriver()); - - Connection conn = DriverManager.getConnection("jdbc:oracle:thin:@10.100.70.5:1521:aucma", "haiwei", "123456"); - CallableStatement stmt = conn.prepareCall( - "{ call IMOS.IMOS_Pro_6_3_QualityAnalysis2(?,?,?,?,?,?,?,?) }"); - - stmt.setNString(1,"2022"); - stmt.setNString(2,"6"); - stmt.setNString(3,""); - stmt.setNString(4,"1005"); - stmt.setNString(5,""); - stmt.setNString(6,""); - stmt.setNString(7,""); - stmt.registerOutParameter(8, OracleTypes.CURSOR); - stmt.execute(); - ResultSet rs = (ResultSet) stmt.getObject(6); - while (rs.next()) { - System.out.println(rs.getString("PRICE")); - } - rs.close(); - rs = null; - stmt.close(); - stmt = null; - conn.close(); - conn = null; - } - catch (SQLException e) { - System.out.println(e.getLocalizedMessage()); - } - - }*/ - - diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java new file mode 100644 index 0000000..18709fe --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BasePictureLocationController.java @@ -0,0 +1,127 @@ +package com.ruoyi.system.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BasePictureLocation; +import com.ruoyi.system.service.IBasePictureLocationService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 亮点产品维护Controller + * + * @author ruoyi + * @date 2022-07-27 + */ +@Controller +@RequestMapping("/system/base_picture_location") +public class BasePictureLocationController extends BaseController +{ + private String prefix = "system/base_picture_location"; + + @Autowired + private IBasePictureLocationService basePictureLocationService; + + @RequiresPermissions("system:base_picture_location:view") + @GetMapping() + public String base_picture_location() + { + return prefix + "/base_picture_location"; + } + + /** + * 查询亮点产品维护列表 + */ + @RequiresPermissions("system:base_picture_location:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BasePictureLocation basePictureLocation) + { + startPage(); + List list = basePictureLocationService.selectBasePictureLocationList(basePictureLocation); + return getDataTable(list); + } + + /** + * 导出亮点产品维护列表 + */ + @RequiresPermissions("system:base_picture_location:export") + @Log(title = "亮点产品维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BasePictureLocation basePictureLocation) + { + List list = basePictureLocationService.selectBasePictureLocationList(basePictureLocation); + ExcelUtil util = new ExcelUtil(BasePictureLocation.class); + return util.exportExcel(list, "亮点产品维护数据"); + } + + /** + * 新增亮点产品维护 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存亮点产品维护 + */ + @RequiresPermissions("system:base_picture_location:add") + @Log(title = "亮点产品维护", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BasePictureLocation basePictureLocation) + { + return toAjax(basePictureLocationService.insertBasePictureLocation(basePictureLocation)); + } + + /** + * 修改亮点产品维护 + */ + @RequiresPermissions("system:base_picture_location:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + BasePictureLocation basePictureLocation = basePictureLocationService.selectBasePictureLocationById(id); + mmap.put("basePictureLocation", basePictureLocation); + return prefix + "/edit"; + } + + /** + * 修改保存亮点产品维护 + */ + @RequiresPermissions("system:base_picture_location:edit") + @Log(title = "亮点产品维护", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BasePictureLocation basePictureLocation) + { + return toAjax(basePictureLocationService.updateBasePictureLocation(basePictureLocation)); + } + + /** + * 删除亮点产品维护 + */ + @RequiresPermissions("system:base_picture_location:remove") + @Log(title = "亮点产品维护", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(basePictureLocationService.deleteBasePictureLocationByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java index 2d15564..21d79f4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseProductQtyController.java @@ -86,12 +86,12 @@ public class BaseProductQtyController extends BaseController { if (tag > 0) { return error("本天 '" + baseProductQty.getDay() + "' 已经存在"); } - List list = baseProductQtyService.selectBaseProductQtyList(null); - int id = 1; - if (list != null || !list.isEmpty()) { - id = list.size(); - } - baseProductQty.setId(Long.valueOf(id)); +// List list = baseProductQtyService.selectBaseProductQtyList(null); +// int id = 1; +// if (list != null || !list.isEmpty()) { +// id = list.size(); +// } +// baseProductQty.setId(Long.valueOf(id)); baseProductQty.setCreateBy(ShiroUtils.getLoginName()); return toAjax(baseProductQtyService.insertBaseProductQty(baseProductQty)); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java index 9793c83..68f7e20 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseTeamController.java @@ -100,12 +100,12 @@ public class BaseTeamController extends BaseController String filePath = Global.getUploadPath(); try { String pathName = FileUploadUtils.upload(filePath, file); - List list = baseTeamService.selectBaseTeamList(null); - int id=1; - if (list!=null||!list.isEmpty()){ - id=list.size()+1; - } - baseTeam.setId(Long.valueOf(id)); +// List list = baseTeamService.selectBaseTeamList(null); +// int id=1; +// if (list!=null||!list.isEmpty()){ +// id= Math.toIntExact(list.get(list.size()).getId())+1; +// } +// baseTeam.setId(Long.valueOf(id)); baseTeam.setPath(pathName); return toAjax(baseTeamService.insertBaseTeam(baseTeam)); } catch (IOException e) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseUserManyiduController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseUserManyiduController.java new file mode 100644 index 0000000..2f02672 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/BaseUserManyiduController.java @@ -0,0 +1,125 @@ +package com.ruoyi.system.controller; + +import java.util.List; + +import com.ruoyi.common.utils.uuid.UUID; +import com.ruoyi.system.domain.BaseTeam; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.system.domain.BaseUserManyidu; +import com.ruoyi.system.service.IBaseUserManyiduService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 用户满意度Controller + * + * @author ruoyi + * @date 2022-07-27 + */ +@Controller +@RequestMapping("/system/base_manyidu") +public class BaseUserManyiduController extends BaseController { + private String prefix = "system/base_manyidu"; + + @Autowired + private IBaseUserManyiduService baseUserManyiduService; + + @RequiresPermissions("system:base_manyidu:view") + @GetMapping() + public String base_manyidu() { + return prefix + "/base_manyidu"; + } + + /** + * 查询用户满意度列表 + */ + @RequiresPermissions("system:base_manyidu:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(BaseUserManyidu baseUserManyidu) { + startPage(); + List list = baseUserManyiduService.selectBaseUserManyiduList(baseUserManyidu); + return getDataTable(list); + } + + /** + * 导出用户满意度列表 + */ + @RequiresPermissions("system:base_manyidu:export") + @Log(title = "用户满意度", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(BaseUserManyidu baseUserManyidu) { + List list = baseUserManyiduService.selectBaseUserManyiduList(baseUserManyidu); + ExcelUtil util = new ExcelUtil(BaseUserManyidu.class); + return util.exportExcel(list, "用户满意度数据"); + } + + /** + * 新增用户满意度 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存用户满意度 + */ + @RequiresPermissions("system:base_manyidu:add") + @Log(title = "用户满意度", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(BaseUserManyidu baseUserManyidu) { + List list = baseUserManyiduService.selectBaseUserManyiduList(baseUserManyidu); + if (list != null && list.size() > 0) { + return error(baseUserManyidu.getYearName() + "年数据已经存在"); + } + return toAjax(baseUserManyiduService.insertBaseUserManyidu(baseUserManyidu)); + } + + /** + * 修改用户满意度 + */ + @RequiresPermissions("system:base_manyidu:edit") + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) { + BaseUserManyidu baseUserManyidu = baseUserManyiduService.selectBaseUserManyiduById(id); + mmap.put("baseUserManyidu", baseUserManyidu); + return prefix + "/edit"; + } + + /** + * 修改保存用户满意度 + */ + @RequiresPermissions("system:base_manyidu:edit") + @Log(title = "用户满意度", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(BaseUserManyidu baseUserManyidu) { + return toAjax(baseUserManyiduService.updateBaseUserManyidu(baseUserManyidu)); + } + + /** + * 删除用户满意度 + */ + @RequiresPermissions("system:base_manyidu:remove") + @Log(title = "用户满意度", businessType = BusinessType.DELETE) + @PostMapping("/remove") + @ResponseBody + public AjaxResult remove(String ids) { + return toAjax(baseUserManyiduService.deleteBaseUserManyiduByIds(ids)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java new file mode 100644 index 0000000..da6827a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BasePictureLocation.java @@ -0,0 +1,65 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 亮点产品维护对象 base_picture_location + * + * @author ruoyi + * @date 2022-07-27 + */ +public class BasePictureLocation extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String picturePath; + + /** 显示位置 */ + @Excel(name = "显示位置") + private Long pictureLocation; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setPicturePath(String picturePath) + { + this.picturePath = picturePath; + } + + public String getPicturePath() + { + return picturePath; + } + public void setPictureLocation(Long pictureLocation) + { + this.pictureLocation = pictureLocation; + } + + public Long getPictureLocation() + { + return pictureLocation; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("picturePath", getPicturePath()) + .append("pictureLocation", getPictureLocation()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserManyidu.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserManyidu.java new file mode 100644 index 0000000..6464d1a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BaseUserManyidu.java @@ -0,0 +1,108 @@ +package com.ruoyi.system.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 用户满意度对象 base_user_manyidu + * + * @author ruoyi + * @date 2022-07-27 + */ +public class BaseUserManyidu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private String id; + + /** 年份 */ + @Excel(name = "年份") + private Long yearName; + + /** 产品体验 */ + @Excel(name = "产品体验") + private double productRate; + + /** 购物体验 */ + @Excel(name = "购物体验") + private double shoppingRate; + + /** 服务体验 */ + @Excel(name = "服务体验") + private double serviceRate; + + /** 订单履约率 */ + @Excel(name = "订单履约率") + private double orderRate; + + public void setId(String id) + { + this.id = id; + } + + public String getId() + { + return id; + } + public void setYearName(Long yearName) + { + this.yearName = yearName; + } + + public Long getYearName() + { + return yearName; + } + public void setProductRate(Long productRate) + { + this.productRate = productRate; + } + + public double getProductRate() { + return productRate; + } + + public void setProductRate(double productRate) { + this.productRate = productRate; + } + + public double getShoppingRate() { + return shoppingRate; + } + + public void setShoppingRate(double shoppingRate) { + this.shoppingRate = shoppingRate; + } + + public double getServiceRate() { + return serviceRate; + } + + public void setServiceRate(double serviceRate) { + this.serviceRate = serviceRate; + } + + public double getOrderRate() { + return orderRate; + } + + public void setOrderRate(double orderRate) { + this.orderRate = orderRate; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("yearName", getYearName()) + .append("productRate", getProductRate()) + .append("shoppingRate", getShoppingRate()) + .append("serviceRate", getServiceRate()) + .append("orderRate", getOrderRate()) + .append("createTime", getCreateTime()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BasePictureLocationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BasePictureLocationMapper.java new file mode 100644 index 0000000..5c50226 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BasePictureLocationMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BasePictureLocation; + +/** + * 亮点产品维护Mapper接口 + * + * @author ruoyi + * @date 2022-07-27 + */ +public interface BasePictureLocationMapper +{ + /** + * 查询亮点产品维护 + * + * @param id 亮点产品维护主键 + * @return 亮点产品维护 + */ + public BasePictureLocation selectBasePictureLocationById(Long id); + + /** + * 查询亮点产品维护列表 + * + * @param basePictureLocation 亮点产品维护 + * @return 亮点产品维护集合 + */ + public List selectBasePictureLocationList(BasePictureLocation basePictureLocation); + + /** + * 新增亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + public int insertBasePictureLocation(BasePictureLocation basePictureLocation); + + /** + * 修改亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + public int updateBasePictureLocation(BasePictureLocation basePictureLocation); + + /** + * 删除亮点产品维护 + * + * @param id 亮点产品维护主键 + * @return 结果 + */ + public int deleteBasePictureLocationById(Long id); + + /** + * 批量删除亮点产品维护 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBasePictureLocationByIds(String[] ids); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseUserManyiduMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseUserManyiduMapper.java new file mode 100644 index 0000000..1a44673 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BaseUserManyiduMapper.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.BaseUserManyidu; + +/** + * 用户满意度Mapper接口 + * + * @author ruoyi + * @date 2022-07-27 + */ +public interface BaseUserManyiduMapper +{ + /** + * 查询用户满意度 + * + * @param id 用户满意度主键 + * @return 用户满意度 + */ + public BaseUserManyidu selectBaseUserManyiduById(Long id); + + /** + * 查询用户满意度列表 + * + * @param baseUserManyidu 用户满意度 + * @return 用户满意度集合 + */ + public List selectBaseUserManyiduList(BaseUserManyidu baseUserManyidu); + + /** + * 新增用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + public int insertBaseUserManyidu(BaseUserManyidu baseUserManyidu); + + /** + * 修改用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + public int updateBaseUserManyidu(BaseUserManyidu baseUserManyidu); + + /** + * 删除用户满意度 + * + * @param id 用户满意度主键 + * @return 结果 + */ + public int deleteBaseUserManyiduById(Long id); + + /** + * 批量删除用户满意度 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteBaseUserManyiduByIds(String[] ids); + + List yue_selectUserSatisfaction(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java index cfc50df..5151190 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/BroadDataMapper.java @@ -106,4 +106,6 @@ public interface BroadDataMapper { List zhou_selectQaItemInfo(); List zhou_selectOrderRateTatle(); + + List yue_selectProductInStore(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBasePictureLocationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBasePictureLocationService.java new file mode 100644 index 0000000..3543b2a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBasePictureLocationService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BasePictureLocation; + +/** + * 亮点产品维护Service接口 + * + * @author ruoyi + * @date 2022-07-27 + */ +public interface IBasePictureLocationService +{ + /** + * 查询亮点产品维护 + * + * @param id 亮点产品维护主键 + * @return 亮点产品维护 + */ + public BasePictureLocation selectBasePictureLocationById(Long id); + + /** + * 查询亮点产品维护列表 + * + * @param basePictureLocation 亮点产品维护 + * @return 亮点产品维护集合 + */ + public List selectBasePictureLocationList(BasePictureLocation basePictureLocation); + + /** + * 新增亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + public int insertBasePictureLocation(BasePictureLocation basePictureLocation); + + /** + * 修改亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + public int updateBasePictureLocation(BasePictureLocation basePictureLocation); + + /** + * 批量删除亮点产品维护 + * + * @param ids 需要删除的亮点产品维护主键集合 + * @return 结果 + */ + public int deleteBasePictureLocationByIds(String ids); + + /** + * 删除亮点产品维护信息 + * + * @param id 亮点产品维护主键 + * @return 结果 + */ + public int deleteBasePictureLocationById(Long id); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseUserManyiduService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseUserManyiduService.java new file mode 100644 index 0000000..4bc7280 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBaseUserManyiduService.java @@ -0,0 +1,63 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.BaseUserManyidu; + +/** + * 用户满意度Service接口 + * + * @author ruoyi + * @date 2022-07-27 + */ +public interface IBaseUserManyiduService +{ + /** + * 查询用户满意度 + * + * @param id 用户满意度主键 + * @return 用户满意度 + */ + public BaseUserManyidu selectBaseUserManyiduById(Long id); + + /** + * 查询用户满意度列表 + * + * @param baseUserManyidu 用户满意度 + * @return 用户满意度集合 + */ + public List selectBaseUserManyiduList(BaseUserManyidu baseUserManyidu); + + /** + * 新增用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + public int insertBaseUserManyidu(BaseUserManyidu baseUserManyidu); + + /** + * 修改用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + public int updateBaseUserManyidu(BaseUserManyidu baseUserManyidu); + + /** + * 批量删除用户满意度 + * + * @param ids 需要删除的用户满意度主键集合 + * @return 结果 + */ + public int deleteBaseUserManyiduByIds(String ids); + + /** + * 删除用户满意度信息 + * + * @param id 用户满意度主键 + * @return 结果 + */ + public int deleteBaseUserManyiduById(Long id); + + public List yue_selectUserSatisfaction(); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java index 89e978d..cc68e72 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IBroadDataService.java @@ -87,4 +87,6 @@ public interface IBroadDataService { List zhou_selectQaItemInfo(); List zhou_selectOrderRateTatle(); + + List yue_selectProductInStore(); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BasePictureLocationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BasePictureLocationServiceImpl.java new file mode 100644 index 0000000..71d0f4f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BasePictureLocationServiceImpl.java @@ -0,0 +1,94 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BasePictureLocationMapper; +import com.ruoyi.system.domain.BasePictureLocation; +import com.ruoyi.system.service.IBasePictureLocationService; +import com.ruoyi.common.core.text.Convert; + +/** + * 亮点产品维护Service业务层处理 + * + * @author ruoyi + * @date 2022-07-27 + */ +@Service +public class BasePictureLocationServiceImpl implements IBasePictureLocationService +{ + @Autowired + private BasePictureLocationMapper basePictureLocationMapper; + + /** + * 查询亮点产品维护 + * + * @param id 亮点产品维护主键 + * @return 亮点产品维护 + */ + @Override + public BasePictureLocation selectBasePictureLocationById(Long id) + { + return basePictureLocationMapper.selectBasePictureLocationById(id); + } + + /** + * 查询亮点产品维护列表 + * + * @param basePictureLocation 亮点产品维护 + * @return 亮点产品维护 + */ + @Override + public List selectBasePictureLocationList(BasePictureLocation basePictureLocation) + { + return basePictureLocationMapper.selectBasePictureLocationList(basePictureLocation); + } + + /** + * 新增亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + @Override + public int insertBasePictureLocation(BasePictureLocation basePictureLocation) + { + return basePictureLocationMapper.insertBasePictureLocation(basePictureLocation); + } + + /** + * 修改亮点产品维护 + * + * @param basePictureLocation 亮点产品维护 + * @return 结果 + */ + @Override + public int updateBasePictureLocation(BasePictureLocation basePictureLocation) + { + return basePictureLocationMapper.updateBasePictureLocation(basePictureLocation); + } + + /** + * 批量删除亮点产品维护 + * + * @param ids 需要删除的亮点产品维护主键 + * @return 结果 + */ + @Override + public int deleteBasePictureLocationByIds(String ids) + { + return basePictureLocationMapper.deleteBasePictureLocationByIds(Convert.toStrArray(ids)); + } + + /** + * 删除亮点产品维护信息 + * + * @param id 亮点产品维护主键 + * @return 结果 + */ + @Override + public int deleteBasePictureLocationById(Long id) + { + return basePictureLocationMapper.deleteBasePictureLocationById(id); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseUserManyiduServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseUserManyiduServiceImpl.java new file mode 100644 index 0000000..c2c2561 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseUserManyiduServiceImpl.java @@ -0,0 +1,101 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.BaseUserManyiduMapper; +import com.ruoyi.system.domain.BaseUserManyidu; +import com.ruoyi.system.service.IBaseUserManyiduService; +import com.ruoyi.common.core.text.Convert; + +/** + * 用户满意度Service业务层处理 + * + * @author ruoyi + * @date 2022-07-27 + */ +@Service +public class BaseUserManyiduServiceImpl implements IBaseUserManyiduService +{ + @Autowired + private BaseUserManyiduMapper baseUserManyiduMapper; + + /** + * 查询用户满意度 + * + * @param id 用户满意度主键 + * @return 用户满意度 + */ + @Override + public BaseUserManyidu selectBaseUserManyiduById(Long id) + { + return baseUserManyiduMapper.selectBaseUserManyiduById(id); + } + + /** + * 查询用户满意度列表 + * + * @param baseUserManyidu 用户满意度 + * @return 用户满意度 + */ + @Override + public List selectBaseUserManyiduList(BaseUserManyidu baseUserManyidu) + { + return baseUserManyiduMapper.selectBaseUserManyiduList(baseUserManyidu); + } + + /** + * 新增用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + @Override + public int insertBaseUserManyidu(BaseUserManyidu baseUserManyidu) + { + baseUserManyidu.setCreateTime(DateUtils.getNowDate()); + return baseUserManyiduMapper.insertBaseUserManyidu(baseUserManyidu); + } + + /** + * 修改用户满意度 + * + * @param baseUserManyidu 用户满意度 + * @return 结果 + */ + @Override + public int updateBaseUserManyidu(BaseUserManyidu baseUserManyidu) + { + return baseUserManyiduMapper.updateBaseUserManyidu(baseUserManyidu); + } + + /** + * 批量删除用户满意度 + * + * @param ids 需要删除的用户满意度主键 + * @return 结果 + */ + @Override + public int deleteBaseUserManyiduByIds(String ids) + { + return baseUserManyiduMapper.deleteBaseUserManyiduByIds(Convert.toStrArray(ids)); + } + + /** + * 删除用户满意度信息 + * + * @param id 用户满意度主键 + * @return 结果 + */ + @Override + public int deleteBaseUserManyiduById(Long id) + { + return baseUserManyiduMapper.deleteBaseUserManyiduById(id); + } + + @Override + public List yue_selectUserSatisfaction() { + return baseUserManyiduMapper.yue_selectUserSatisfaction(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java index a8d198a..49149bd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BroadDataServiceImpl.java @@ -208,4 +208,12 @@ public class BroadDataServiceImpl implements IBroadDataService public List zhou_selectOrderRateTatle() { return mapper.zhou_selectOrderRateTatle(); } + /////////////////////////////////////////////////////////////////////////// + // yue + /////////////////////////////////////////////////////////////////////////// + + @Override + public List yue_selectProductInStore() { + return mapper.yue_selectProductInStore(); + } } diff --git a/ruoyi-system/src/main/resources/createsql/base_manyiduMenu.sql b/ruoyi-system/src/main/resources/createsql/base_manyiduMenu.sql new file mode 100644 index 0000000..fb0187f --- /dev/null +++ b/ruoyi-system/src/main/resources/createsql/base_manyiduMenu.sql @@ -0,0 +1,27 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(2080, '用户满意度', '5', '1', '/system/base_manyidu', 'C', '0', 'system:base_manyidu:view', '#', 'admin', sysdate, '', null, '用户满意度菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '用户满意度查询', 2080, '1', '#', 'F', '0', 'system:base_manyidu:list', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '用户满意度新增', 2080, '2', '#', 'F', '0', 'system:base_manyidu:add', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '用户满意度修改', 2080, '3', '#', 'F', '0', 'system:base_manyidu:edit', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '用户满意度删除', 2080, '4', '#', 'F', '0', 'system:base_manyidu:remove', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '用户满意度导出', 2080, '5', '#', 'F', '0', 'system:base_manyidu:export', '#', 'admin', sysdate, '', null, ''); + +-- base_user_manyidu主键序列 +create sequence seq_base_user_manyidu +increment by 1 +start with 10 +nomaxvalue +nominvalue +cache 20; diff --git a/ruoyi-system/src/main/resources/createsql/base_picture_locationMenu.sql b/ruoyi-system/src/main/resources/createsql/base_picture_locationMenu.sql new file mode 100644 index 0000000..8cb8092 --- /dev/null +++ b/ruoyi-system/src/main/resources/createsql/base_picture_locationMenu.sql @@ -0,0 +1,27 @@ +-- 菜单 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(2085, '亮点产品维护', '5', '1', '/system/base_picture_location', 'C', '0', 'system:base_picture_location:view', '#', 'admin', sysdate, '', null, '亮点产品维护菜单'); + +-- 按钮 SQL +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '亮点产品维护查询', 2085, '1', '#', 'F', '0', 'system:base_picture_location:list', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '亮点产品维护新增', 2085, '2', '#', 'F', '0', 'system:base_picture_location:add', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '亮点产品维护修改', 2085, '3', '#', 'F', '0', 'system:base_picture_location:edit', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '亮点产品维护删除', 2085, '4', '#', 'F', '0', 'system:base_picture_location:remove', '#', 'admin', sysdate, '', null, ''); + +insert into sys_menu (menu_id, menu_name, parent_id, order_num, url, menu_type, visible, perms, icon, create_by, create_time, update_by, update_time, remark) +values(seq_sys_menu.nextval, '亮点产品维护导出', 2085, '5', '#', 'F', '0', 'system:base_picture_location:export', '#', 'admin', sysdate, '', null, ''); + +-- base_picture_location主键序列 +create sequence seq_base_picture_location +increment by 1 +start with 10 +nomaxvalue +nominvalue +cache 20; diff --git a/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml new file mode 100644 index 0000000..fed1623 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BasePictureLocationMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + select id, picture_path, picture_location from base_picture_location + + + + + + + + + SELECT seq_base_picture_location.NEXTVAL as id FROM DUAL + + insert into base_picture_location + + id, + picture_path, + picture_location, + + + #{id}, + #{picturePath}, + #{pictureLocation}, + + + + + update base_picture_location + + picture_path = #{picturePath}, + picture_location = #{pictureLocation}, + + where id = #{id} + + + + delete from base_picture_location where id = #{id} + + + + delete from base_picture_location where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BaseUserManyiduMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BaseUserManyiduMapper.xml new file mode 100644 index 0000000..6ae246e --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/BaseUserManyiduMapper.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + select id, year_name, product_rate, shopping_rate, service_rate, order_rate, create_time from base_user_manyidu + + + + + + + + + + + SELECT seq_base_user_manyidu.NEXTVAL as id FROM DUAL + + insert into base_user_manyidu + + id, + year_name, + product_rate, + shopping_rate, + service_rate, + order_rate, + create_time, + + + #{id}, + #{yearName}, + #{productRate}, + #{shoppingRate}, + #{serviceRate}, + #{orderRate}, + #{createTime}, + + + + + update base_user_manyidu + + year_name = #{yearName}, + product_rate = #{productRate}, + shopping_rate = #{shoppingRate}, + service_rate = #{serviceRate}, + order_rate = #{orderRate}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from base_user_manyidu where id = #{id} + + + + delete from base_user_manyidu where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml index 31d8c59..b275ebf 100644 --- a/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/BroadDataMapper.xml @@ -31,7 +31,7 @@ FROM (select PLAN_NUMBER and delete_flag = '0' -- and to_char(plan_date, 'yyyy-MM-dd') = to_char(sysdate, 'yyyy-MM-dd') and - CREATION_DATE > +to_date(START_TIME, 'yyyy-MM-dd hh24:mi:ss') > case when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', @@ -40,7 +40,7 @@ FROM (select PLAN_NUMBER 'yyyy-MM-dd hh24:mi:ss') else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') end - and CREATION_DATE < + and to_date(START_TIME, 'yyyy-MM-dd hh24:mi:ss') < case when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', @@ -99,7 +99,7 @@ FROM (select PLAN_NUMBER SUM(ACTUAL_QTY) as qty from IMOS_PR_PLAN where - CREATION_DATE > + to_date(START_TIME, 'yyyy-MM-dd hh24:mi:ss') > case when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( to_char(SYSDATE, 'yyyy-MM-dd') || '07:30:00', @@ -108,7 +108,7 @@ FROM (select PLAN_NUMBER 'yyyy-MM-dd hh24:mi:ss') else to_date(to_char(SYSDATE - 1, 'yyyy-MM-dd') || '19:30:00', 'yyyy-MM-dd hh24:mi:ss') end - and CREATION_DATE < + and to_date(START_TIME, 'yyyy-MM-dd hh24:mi:ss') < case when to_char(sysdate, 'hh24') > 7 and to_char(sysdate, 'hh24') < 20 then to_date( to_char(SYSDATE, 'yyyy-MM-dd') || '19:30:00', @@ -705,7 +705,7 @@ where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM nvl(sum(actual_qty), 0) as qty from IMOS.IMOS_PR_PLAN xhq left join (select * from (select * from haiwei.BASE_DAY_WBTIME order by CREATE_TIME desc) where ROWNUM = 1) wb on 1 = 1 - where xhq.CREATION_DATE between case when sysdate <= wb.W_END then W_START else W_END end + where to_date(xhq.START_TIME, 'yyyy-MM-dd hh24:mi:ss') between case when sysdate <= wb.W_END then W_START else W_END end and case when sysdate <= wb.W_END then W_END else B_END end and plan_date is not null and process_code = 1002 @@ -719,7 +719,7 @@ where 600 < ROUND(TO_NUMBER(t1.day - t2.day) * 24 * 60 * 60) - t3.RHYTHM where plan_date is not null and process_code = 1002 and delete_flag = '0' - and ipp.CREATION_DATE between case when sysdate < = wb.W_END then W_START else W_END end + and to_date(ipp.START_TIME, 'yyyy-MM-dd hh24:mi:ss') between case when sysdate < = wb.W_END then W_START else W_END end and case when sysdate < = wb.W_END then W_END else B_END end -- select nvl(sum(actual_qty), 0) -- from IMOS.IMOS_PR_PLAN @@ -1181,4 +1181,11 @@ where DETIAL_TYPE_CODE = '1004' + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_manyidu/add.html b/ruoyi-system/src/main/resources/templates/system/base_manyidu/add.html new file mode 100644 index 0000000..9181c70 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_manyidu/add.html @@ -0,0 +1,55 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_manyidu/base_manyidu.html b/ruoyi-system/src/main/resources/templates/system/base_manyidu/base_manyidu.html new file mode 100644 index 0000000..ff2b80b --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_manyidu/base_manyidu.html @@ -0,0 +1,102 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_manyidu/edit.html b/ruoyi-system/src/main/resources/templates/system/base_manyidu/edit.html new file mode 100644 index 0000000..c96481c --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_manyidu/edit.html @@ -0,0 +1,50 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html b/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html new file mode 100644 index 0000000..a27bb31 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_picture_location/add.html @@ -0,0 +1,39 @@ + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html b/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html new file mode 100644 index 0000000..3d57516 --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_picture_location/base_picture_location.html @@ -0,0 +1,90 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/templates/system/base_picture_location/edit.html b/ruoyi-system/src/main/resources/templates/system/base_picture_location/edit.html new file mode 100644 index 0000000..c7b209b --- /dev/null +++ b/ruoyi-system/src/main/resources/templates/system/base_picture_location/edit.html @@ -0,0 +1,40 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file