diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java index db99ab8e..fca4c730 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerMobileEntity.java @@ -107,15 +107,15 @@ public class CustomerMobileEntity { // @TableField("COUNTY") // private String county; - +@TableField("settlemenSum") private BigDecimal settlemenSum; - + @TableField("weightSum") private BigDecimal weightSum; - + @TableField("buckleWeightSum") private BigDecimal buckleWeightSum; - + @TableField("grossWeightSum") private BigDecimal grossWeightSum; - + @TableField("salesPriceSum") private BigDecimal salesPriceSum; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java index 6f42eb15..5fe56499 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java @@ -120,14 +120,13 @@ public class CustomerVOServiceImpl extends ServiceImpl list = messageCenterService.getMobileList(messageCenterPagination); List listVO = JsonUtil.getJsonToList(list, MessageCenterListVO.class); @@ -92,6 +93,19 @@ public class MessageCenterController { vo.setPagination(page); return ActionResult.success(vo); } + /** + * 获取首页信息 + * + * @param + * @return + */ + @GetMapping("/getHomePage") + @ApiOperation("获取首页信息") + public ActionResult getHomePage() throws IOException { + List list = messageCenterService.getHomePage(); + + return ActionResult.success(list); + } /** @@ -100,11 +114,10 @@ public class MessageCenterController { * @return */ @PostMapping ("/isRead") - public ActionResult isRead(@RequestBody JSONObject id){ + @ApiOperation("根据id更新信息状态为已读") + public ActionResult isRead(@RequestBody JSONObject id){ List idList = JsonUtil.getJsonToList(id.get("id"), String.class); - messageCenterService.idRead(idList); - return ActionResult.success("更改状态成功"); } /** @@ -113,6 +126,7 @@ public class MessageCenterController { * @return */ @GetMapping("/isAllRead") + @ApiOperation("更新全部未读信息状态为已读") public ActionResult isAllRead(){ messageCenterService.idALlRead(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java index 754b1f2e..442996c4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/mapper/MessageCenterMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import jnpf.messageCenter.entity.MessageCenterEntity; import java.util.List; +import java.util.Map; /** * messageCenter @@ -25,4 +26,6 @@ public interface MessageCenterMapper extends BaseMapper { * @return */ List getPayMessage(); + + List getHomePageData(); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java index f073e04c..639f9ac7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java @@ -34,6 +34,8 @@ public interface MessageCenterService extends IService { void idALlRead(); + List getHomePage(); + // 子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java index c43fb071..f44661f1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java @@ -18,9 +18,11 @@ import jnpf.util.UserProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * messageCenter @@ -39,6 +41,9 @@ public class MessageCenterServiceImpl extends ServiceImpl getList(MessageCenterPagination messageCenterPagination) { @@ -336,6 +341,11 @@ public class MessageCenterServiceImpl extends ServiceImpl getHomePage() { + return messageCenterMapper.getHomePageData(); + } + @Override public void delete(MessageCenterEntity entity) { if (entity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupperlierMobileEntitySidex.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupperlierMobileEntitySidex.java new file mode 100644 index 00000000..23996c0e --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/model/supplier/SupperlierMobileEntitySidex.java @@ -0,0 +1,136 @@ +package jnpf.supplier.model.supplier; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @Author: WangChuang + * @Date: 21/3/2023 上午8:44 + * @Description //注释: + * @Version 1.0 + */ +@Data +public class SupperlierMobileEntitySidex { + @TableId("ID") + private String id; + + @TableField("CREATOR_USER_ID") + private String creatorUserId; + + @TableField("CREATOR_USER_NAME") + private String creatorUserName; + + @TableField("CREATOR_TIME") + private Date creatorTime; + + @TableField("LAST_MODIFY_USER_ID") + private String lastModifyUserId; + + @TableField("LAST_MODIFY_USER_NAME") + private String lastModifyUserName; + + @TableField("LAST_MODIFY_TIME") + private Date lastModifyTime; + + @TableField("DELETE_USER_ID") + private String deleteUserId; + + @TableField("DELETE_USER_NAME") + private String deleteUserName; + + @TableField("DELETE_TIME") + private Date deleteTime; + + @TableField("DELETE_MARK") + private String deleteMark; + + @TableField("SUPPLIER_CODE") + private String supplierCode; + + @TableField("SUPPLIER_NAME") + private String supplierName; + + @TableField("SUPPLIER_SITE_ID") + private String supplierSiteId; + + @TableField("SUPPLIER_SITE_CODE") + private String supplierSiteCode; + + @TableField("COMPANY_ID") + private String companyId; + + @TableField("VAT_REGISTRATION_NUM") + private String vatRegistrationNum; + + @TableField("ORGNIZE_ID") + private String orgnizeId; + + @TableField("DEPARTMENT_ID") + private String departmentId; + + @TableField("SUPPLY") + private Integer supply; + + @TableField("CONTACT_NAME") + private String contactName; + + @TableField("CONTACT_PHONE") + private String contactPhone; + + @TableField("SUPPLIER_LEVEL") + private String supplierLevel; + + @TableField("ADDRESS") + private String address; + + @TableField("STATUS") + private String status; + + @TableField("COUNTRY") + private String country; + + @TableField("PROVINCE") + private String province; + + @TableField("CLASSIFICATION") + private String classification; + + @TableField("ENTERPRISE") + private String enterprise; + + @TableField("BANK") + private String bank; + + @TableField("BANK_ACCOUNT") + private String bankAccount; + + @TableField("TAX_CODE") + private String taxCode; + + @TableField("PAYABLE") + private String payable; + + @TableField("PREPAID") + private String prepaid; + + @TableField("IS_PURCHASE") + private String isPurchase; + + @TableField("IS_PAYMENT") + private String isPayment; + + @TableField("settlemenSum") + private BigDecimal settlemenSum; + @TableField("weightSum") + private BigDecimal weightSum; + @TableField("buckleWeightSum") + private BigDecimal buckleWeightSum; + @TableField("grossWeightSum") + private BigDecimal grossWeightSum; + @TableField("salesPriceSum") + private BigDecimal salesPriceSum; +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java index 2848056f..f5a2e2d6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java @@ -12,6 +12,7 @@ import jnpf.permission.service.AuthorizeService; import jnpf.supplier.entity.SupplierEntity; import jnpf.supplier.entity.SupplierMobileEntity; import jnpf.supplier.mapper.SupplierMapper; +import jnpf.supplier.model.supplier.SupperlierMobileEntitySidex; import jnpf.supplier.model.supplier.SupplierPagination; import jnpf.supplier.service.SupplierService; import jnpf.util.ServletUtil; @@ -116,18 +117,13 @@ public class SupplierServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml index 03670143..e0da2048 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/warehouse/WareHouseMapper.xml @@ -74,7 +74,7 @@ c.id ORDER BY a.id - ) aaa + ) aaa ${ew.customSqlSegment}