Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/InitStatusDTO.java

@@ -10,8 +10,17 @@ public class InitStatusDTO implements Serializable {
     private boolean product;
     private boolean customer;
     private boolean vendor;
+    private boolean currency;
     private boolean begin;
 
+    public boolean isCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(boolean currency) {
+        this.currency = currency;
+    }
+
     public boolean isBegin() {
         return begin;
     }

applications/commons/commons-server/pom.xml

@@ -31,6 +31,10 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>sms-api</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.usoftchina.saas</groupId>
+          <artifactId>document-api</artifactId>
+        </dependency>
         <!-- db -->
         <dependency>
             <groupId>mysql</groupId>

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/mapper/CommonMapper.java

@@ -12,5 +12,7 @@ public interface CommonMapper {
 
     int getCountVendor(@Param("companyId") Long companyId);
 
+    int getCountCurrency(@Param("companyId") Long companyId);
+
     void commonAudit(String sql);
 }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/CommonServiceImpl.java

@@ -40,6 +40,10 @@ public class CommonServiceImpl implements CommonService {
         if (count > 0){
             result.setVendor(true);
         }
+        count = commonMapper.getCountCurrency(companyId);
+        if (count > 0){
+            result.setCurrency(true);
+        }
         if (result.isBaseSet() && result.isWarehouse() && result.isProduct() && result.isCustomer() && result.isVendor()){
             result.setBegin(true);
         }

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/ConfigsServiceImpl.java

@@ -9,6 +9,8 @@ import com.usoftchina.saas.commons.po.Configs;
 import com.usoftchina.saas.commons.service.ConfigsService;
 import com.usoftchina.saas.commons.service.MessageLogService;
 import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.document.api.CurrencyApi;
+import com.usoftchina.saas.document.dto.CurrencyDTO;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
@@ -29,6 +31,8 @@ public class ConfigsServiceImpl implements ConfigsService{
     private ConfigsMapper configsMapper;
     @Autowired
     private MessageLogService messageLogService;
+    @Autowired
+    private CurrencyApi currencyApi;
 
 
     @Override
@@ -95,6 +99,12 @@ public class ConfigsServiceImpl implements ConfigsService{
         }
         for (Configs con : data) {
             con.setCompanyId(BaseContextHolder.getCompanyId());
+            if ("defaultCurrency".equals(con.getCode())){
+                CurrencyDTO currencyDTO = new CurrencyDTO();
+                currencyDTO.setCr_name(con.getData());
+                currencyDTO.setCr_standard(1L);
+                currencyApi.setStandard(currencyDTO);
+            }
             configsMapper.updateByCodeSelective(con);
         }
         DocBaseDTO baseDTO = new DocBaseDTO(null, "", "Configs");

applications/commons/commons-server/src/main/resources/mapper/CommonMapper.xml

@@ -15,6 +15,10 @@
         SELECT COUNT(*) FROM VENDOR WHERE COMPANYID=#{companyId} AND VE_STATUSCODE = 'ENABLE'
     </select>
 
+    <select id="getCountCurrency" resultType="int">
+        select count(*) from configs where companyId = #{companyId} and code = 'defaultCurrency' and data is not null;
+    </select>
+
     <update id="commonAudit" parameterType="string">
       ${value}
     </update>

applications/document/document-api/src/main/java/com/usoftchina/saas/document/api/CurrencyApi.java

@@ -0,0 +1,16 @@
+package com.usoftchina.saas.document.api;
+
+import com.usoftchina.saas.auth.client.interceptor.ServiceFeignInterceptor;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.document.dto.CurrencyDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(name = "document-server", configuration = ServiceFeignInterceptor.class)
+public interface CurrencyApi {
+
+    @PostMapping("/currency/setStandard")
+    Result setStandard(@RequestBody CurrencyDTO currencyDTO);
+
+}

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/CurrencyController.java

@@ -39,4 +39,9 @@ public class CurrencyController {
         return Result.success();
     }
 
+    @PostMapping("/setStandard")
+    public Result setStandard(@RequestBody CurrencyDTO currencyDTO){
+        currencyService.setStandard(currencyDTO);
+        return Result.success();
+    }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CurrencyMapper.java

@@ -10,4 +10,9 @@ public interface CurrencyMapper extends CommonBaseMapper<Currency> {
 
     List<Currency> getAll(@Param("condition") String condition, @Param("companyId") Long companyId);
 
+    void clearStandard(@Param("companyId") Long companyId);
+
+    void setStandard(@Param("name") String name, @Param("companyId") Long companyId, @Param("standard") Long standard);
+
+    int selectCountByName(@Param("name") String name, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/CurrencyService.java

@@ -14,4 +14,5 @@ public interface CurrencyService  extends CommonBaseService<CurrencyMapper, Curr
 
     PageInfo<Currency> getAll(PageRequest pageRequest, ListReqDTO listReqDTO);
 
+    void setStandard(CurrencyDTO currencyDTO);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CurrencyServiceImpl.java

@@ -3,14 +3,19 @@ package com.usoftchina.saas.document.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.MessageLogService;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.commons.exception.BizExceptionCode;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.CurrencyDTO;
 import com.usoftchina.saas.document.entities.Currency;
 import com.usoftchina.saas.document.mapper.CurrencyMapper;
 import com.usoftchina.saas.document.service.CurrencyService;
+import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,14 +27,27 @@ import java.util.List;
 @Service
 public class CurrencyServiceImpl extends CommonBaseServiceImpl<CurrencyMapper, Currency> implements CurrencyService {
 
+    @Autowired
+    private MessageLogService messageLogService;
 
     @Override
     public void save(CurrencyDTO currencyDTO) {
+        Currency currency = BeanMapper.map(currencyDTO, Currency.class);
+        Long companyId = BaseContextHolder.getCompanyId();
+        DocBaseDTO docBaseDTO = null;
         if (currencyDTO.getId() == 0){
-
+            currency.setCompanyId(companyId);
+            int count = getMapper().selectCountByName(currency.getCr_name(), companyId);
+            if (count > 0){
+                throw new BizException(BizExceptionCode.REPEAT_NAME);
+            }
+            getMapper().insertSelective(currency);
+            docBaseDTO = generateMsgObj(currency.getId());
+            messageLogService.save(docBaseDTO);
         }else{
-            Currency currency = BeanMapper.map(currencyDTO, Currency.class);
             getMapper().updateByPrimaryKeySelective(currency);
+            docBaseDTO = generateMsgObj(currency.getId());
+            messageLogService.update(docBaseDTO);
         }
     }
 
@@ -41,4 +59,17 @@ public class CurrencyServiceImpl extends CommonBaseServiceImpl<CurrencyMapper, C
         PageInfo<Currency> pageInfo = new PageInfo<Currency>(currencyList);
         return pageInfo;
     }
+
+    @Override
+    public void setStandard(CurrencyDTO currencyDTO) {
+        Long companyId = BaseContextHolder.getCompanyId();
+        getMapper().clearStandard(companyId);
+        getMapper().setStandard(currencyDTO.getCr_name(), companyId, currencyDTO.getCr_standard());
+
+    }
+
+    private DocBaseDTO generateMsgObj(Long id){
+        return new DocBaseDTO(id, "", "Currency");
+    }
+
 }

applications/document/document-server/src/main/resources/mapper/CurrencyMapper.xml

@@ -28,6 +28,9 @@
         where cr_id = #{id}
     </delete>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Currency" >
+        <selectKey resultType="java.lang.Long" keyProperty="id">
+          SELECT LAST_INSERT_ID() AS ID
+        </selectKey>
         insert into Currencys
         <trim prefix="(" suffix=")" suffixOverrides="," >
             <if test="cr_name != null" >
@@ -127,4 +130,13 @@
       </where>
       ORDER BY CR_ID DESC
     </select>
+    <update id="clearStandard">
+      UPDATE CURRENCYS SET CR_STANDARD = 0 WHERE COMPANYID = #{companyId}
+    </update>
+    <update id="setStandard">
+      UPDATE CURRENCYS SET CR_STANDARD = #{standard} WHERE COMPANYID = #{companyId} AND CR_NAME = #{name}
+    </update>
+    <select id="selectCountByName" resultType="int">
+      SELECT COUNT(*) FROM CURRENCYS WHERE CR_NAME = #{name} AND COMPANYID = #{companyId}
+    </select>
 </mapper>

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/EnremindReqDTO.java

@@ -0,0 +1,93 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+
+/**
+ * @Description 公司商机请求参数对象
+ * @Author chenwei
+ * @Date 2019/01/07
+ */
+public class EnremindReqDTO implements Serializable {
+    /**
+     * 页码
+     */
+    private int pageNumber;
+    /**
+     * 每页条数
+     */
+    private int pageSize;
+    /**
+     * 可报价为1  不可报价为0
+     */
+    private int enableOffer;
+    /**
+     * 搜索关键字
+     */
+    private String keyword;
+    /**
+     * 筛选开始时间
+     */
+    private String fromDate;
+    /**
+     * 筛选截止时间
+     */
+    private String endDate;
+
+    private Integer quoted;
+
+    public int getPageNumber() {
+        return pageNumber;
+    }
+
+    public void setPageNumber(int pageNumber) {
+        this.pageNumber = pageNumber;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getEnableOffer() {
+        return enableOffer;
+    }
+
+    public void setEnableOffer(int enableOffer) {
+        this.enableOffer = enableOffer;
+    }
+
+    public String getKeyword() {
+        return keyword;
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
+
+    public String getFromDate() {
+        return fromDate;
+    }
+
+    public void setFromDate(String fromDate) {
+        this.fromDate = fromDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public Integer getQuoted() {
+        return quoted;
+    }
+
+    public void setQuoted(Integer quoted) {
+        this.quoted = quoted;
+    }
+}

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/EnremindRspDTO.java

@@ -0,0 +1,121 @@
+package com.usoftchina.saas.sale.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description 公司商机返回 实体对象
+ * @Author chenwei
+ * @Date 2019/01/07
+ */
+public class EnremindRspDTO implements Serializable {
+
+    /**
+     * 客户名称
+     */
+    private String custName;
+    /**
+     * 物料品牌
+     */
+    private String prodBrand;
+    /**
+     * 物料名称
+     */
+    private String prodName;
+    /**
+     * 物料型号
+     */
+    private String prodOrispeccode;
+    /**
+     * 物料规格
+     */
+    private String prodSpec;
+    /**
+     * 物料单位
+     */
+    private String prodUnit;
+    /**
+     * 采购数量
+     */
+    private Double needQty;
+    /**
+     * 发布日期
+     */
+    private Date startDate;
+    /**
+     * 截止日期
+     */
+    private Date endDate;
+
+    public String getCustName() {
+        return custName;
+    }
+
+    public void setCustName(String custName) {
+        this.custName = custName;
+    }
+
+    public String getProdBrand() {
+        return prodBrand;
+    }
+
+    public void setProdBrand(String prodBrand) {
+        this.prodBrand = prodBrand;
+    }
+
+    public String getProdName() {
+        return prodName;
+    }
+
+    public void setProdName(String prodName) {
+        this.prodName = prodName;
+    }
+
+    public String getProdOrispeccode() {
+        return prodOrispeccode;
+    }
+
+    public void setProdOrispeccode(String prodOrispeccode) {
+        this.prodOrispeccode = prodOrispeccode;
+    }
+
+    public String getProdSpec() {
+        return prodSpec;
+    }
+
+    public void setProdSpec(String prodSpec) {
+        this.prodSpec = prodSpec;
+    }
+
+    public String getProdUnit() {
+        return prodUnit;
+    }
+
+    public void setProdUnit(String prodUnit) {
+        this.prodUnit = prodUnit;
+    }
+
+    public Double getNeedQty() {
+        return needQty;
+    }
+
+    public void setNeedQty(Double needQty) {
+        this.needQty = needQty;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

applications/sale/sale-server/pom.xml

@@ -40,6 +40,11 @@
             <groupId>com.usoftchina.saas</groupId>
             <artifactId>server-starter</artifactId>
         </dependency>
+        <dependency>
+          <groupId>com.usoftchina.saas</groupId>
+          <artifactId>mall-api</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 
         <!--test-->
         <dependency>

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/SaleApplication.java

@@ -17,7 +17,8 @@ import org.springframework.context.annotation.ComponentScan;
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @EnableEurekaClient
-@EnableFeignClients("com.usoftchina.saas")
+@EnableFeignClients({"com.usoftchina.saas",
+                    "com.usoftchina.inquiry"})
 @EnableAuthClient
 @EnableDynamicDataSource
 @ComponentScan(basePackages = {"com.usoftchina.saas"})

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/controller/SaleController.java

@@ -6,12 +6,16 @@ import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.sale.dto.EnremindReqDTO;
+import com.usoftchina.saas.sale.dto.EnremindRspDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 import com.usoftchina.saas.sale.service.SaleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author: guq
  * @create: 2018-10-22 11:28
@@ -192,8 +196,15 @@ public class SaleController {
         return Result.success(baseDTO);
     }
 
-  @GetMapping("/test")
-    public String test() {
-        return "配置构建success-1";
+    @GetMapping("/enterprise/businessChance")
+    public Result getEnremind(EnremindReqDTO enremindReqDTO){
+        List<EnremindRspDTO> enremindRspDTOList =  saleService.getEnremind(enremindReqDTO);
+        return Result.success(enremindRspDTOList);
+    }
+
+    @GetMapping("/personal/businessChance")
+    public Result getPersonalBusinessChance(){
+
+        return Result.success();
     }
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/SaleService.java

@@ -6,9 +6,13 @@ import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.sale.dto.EnremindReqDTO;
+import com.usoftchina.saas.sale.dto.EnremindRspDTO;
 import com.usoftchina.saas.sale.dto.SaleFormDTO;
 import com.usoftchina.saas.sale.po.SaleList;
 
+import java.util.List;
+
 /**
  * @author: guq
  * @create: 2018-10-22 11:28
@@ -46,4 +50,6 @@ public interface SaleService {
     void batchOpen(BatchDealBaseDTO baseDTOs);
 
     DocBaseDTO saleTurnPurchase(Long id);
+
+    List<EnremindRspDTO> getEnremind(EnremindReqDTO enremindReqDTO);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -2,6 +2,11 @@ package com.usoftchina.saas.sale.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.inquiry.api.InquiryApi;
+import com.usoftchina.inquiry.po.IPage;
+import com.usoftchina.inquiry.po.InquiryEnRemind;
+import com.usoftchina.saas.account.api.AccountApi;
+import com.usoftchina.saas.account.api.CompanyApi;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
@@ -28,6 +33,7 @@ import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.storage.po.ProdIODetail;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.CollectionUtils;
 import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,6 +69,12 @@ public class SaleServiceImpl implements SaleService{
     private CommonService commonService;
     @Autowired
     private PurchaseService purchaseService;
+    @Autowired
+    private InquiryApi inquiryApi;
+    @Autowired
+    private AccountApi accountApi;
+    @Autowired
+    private CompanyApi companyApi;
 
     @Override
     public PageInfo<SaleList> getListData(@PageDefault(size = 10) PageRequest page, ListReqDTO req) {
@@ -650,6 +662,54 @@ public class SaleServiceImpl implements SaleService{
         return baseDTO;
     }
 
+    /**
+     * 获取企业商机
+     * @param enremindReqDTO
+     * @return
+     */
+    @Override
+    public List<EnremindRspDTO> getEnremind(EnremindReqDTO enremindReqDTO) {
+        /*Long userUU = accountApi.getAccountById(BaseContextHolder.getUserId()).getData().getUu();
+        if (userUU == null){
+            userUU = 0L;
+        }
+        Long enUU = companyApi.getCompanyById(BaseContextHolder.getCompanyId()).getData().getUu();
+        */
+        Long userUU = 1000002503L, enUU = 10041559L;
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, enremindReqDTO.getPageNumber(),
+                enremindReqDTO.getPageSize(), enremindReqDTO.getEnableOffer(), enremindReqDTO.getKeyword(), enremindReqDTO.getQuoted());
+        List<InquiryEnRemind> inquiryEnRemindList = inquiryEnRemindIPage.getContent();
+        if (CollectionUtils.isEmpty(inquiryEnRemindList)){
+            return null;
+        }
+        List<EnremindRspDTO> enremindRspDTOList = convertToEnremindRspDTO(inquiryEnRemindList);
+        return enremindRspDTOList;
+    }
+
+    /**
+     * 将平台返回的结果集转成SAAS的传输对象
+     * @param inquiryEnRemindList
+     * @return
+     */
+    private List<EnremindRspDTO> convertToEnremindRspDTO(List<InquiryEnRemind> inquiryEnRemindList) {
+        List<EnremindRspDTO> enremindRspDTOList = new ArrayList<EnremindRspDTO>();
+        EnremindRspDTO enremindRspDTO = null;
+        for (InquiryEnRemind inquiryEnRemind : inquiryEnRemindList){
+            enremindRspDTO = new EnremindRspDTO();
+            enremindRspDTO.setCustName(inquiryEnRemind.getEnName());
+            enremindRspDTO.setProdBrand(inquiryEnRemind.getInbrand());
+            enremindRspDTO.setProdName(inquiryEnRemind.getProdTitle());
+            enremindRspDTO.setProdOrispeccode(inquiryEnRemind.getCmpCode());
+            enremindRspDTO.setProdSpec(inquiryEnRemind.getSpec());
+            //enremindRspDTO.setProdUnit(inquiryEnRemind.get);
+            enremindRspDTO.setNeedQty(inquiryEnRemind.getNeedQty());
+            enremindRspDTO.setStartDate(inquiryEnRemind.getReDate());
+            enremindRspDTO.setEndDate(inquiryEnRemind.getEndDate());
+            enremindRspDTOList.add(enremindRspDTO);
+        }
+        return enremindRspDTOList;
+    }
+
     //更新最新销售总额
     private void updateTotal(Long id) {
         if (null == id) {

applications/sale/sale-server/src/main/resources/application.yml

@@ -88,4 +88,6 @@ hystrix:
                 enabled: true
               isolation:
                     thread:
-                        timeoutInMilliseconds: 4000
+                        timeoutInMilliseconds: 4000
+inquiry:
+  base-url: https://test-inquiry.uuzcc.cn

applications/transfers/mall-api/pom.xml

@@ -10,7 +10,6 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>mall-api</artifactId>
-
     <description>mall api</description>
 
     <dependencies>
@@ -38,11 +37,6 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>RELEASE</version>
-        </dependency>
     </dependencies>
 
 </project>

applications/transfers/mall-api/src/main/java/com/usoftchina/inquiry/api/InquiryApi.java

@@ -2,7 +2,6 @@ package com.usoftchina.inquiry.api;
 
 import com.usoftchina.inquiry.po.*;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.data.domain.Page;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
@@ -27,12 +26,15 @@ public interface InquiryApi {
      * @param pageNumber
      * @param pageSize
      * @param enableOffer   是否能报价的:1为是 0为否,作为搜索条件。  值为0或null时,筛选所有
+     * @param keyword       关键词
+     * @param quoted        1是已报价 0是未报价 查看全部不传
      * @return
      */
     @GetMapping("/sale/enremind")
     IPage<InquiryEnRemind> findEnRemind(@RequestParam("useruu") Long useruu, @RequestParam("enuu") Long enuu,
                                         @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
-                                        @RequestParam("enableOffer") Integer enableOffer);
+                                        @RequestParam("enableOffer") Integer enableOffer, @RequestParam("keyword") String keyword,
+                                        @RequestParam("quoted") Integer quoted);
 
     /**
      * 查看（个人商机）
@@ -79,11 +81,18 @@ public interface InquiryApi {
                                              @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize,
                                              @RequestParam("state") String state);
 
-    /*@GetMapping("/buyer/quotations")
+    /**
+     * 查看已报价列表
+     * @param state         defaultValue: done
+     * @param enUU
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/buyer/quotations")
     IPage<PurcInquiryItemInfo> findQuotationsByPage(@RequestParam(value = "state", defaultValue = "done") String state,
                                                    @RequestParam("enUU") Long enUU,
                                                    @RequestParam("pageNumber") int pageNumber, @RequestParam("pageSize") int pageSize);
-    */
 
     /**
      * 采纳

applications/transfers/mall-api/src/test/java/com/usoftchina/inquiry/test/InquiryApiTest.java

@@ -42,7 +42,7 @@ public class InquiryApiTest {
 
     @Test
     public void testB_findEnRemind(){
-        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 1);
+        IPage<InquiryEnRemind> inquiryEnRemindIPage = inquiryApi.findEnRemind(userUU, enUU, pageNum, pageSize, 1, "", 0);
         System.out.println(JsonUtils.toJsonString(inquiryEnRemindIPage));
     }
 
@@ -60,7 +60,7 @@ public class InquiryApiTest {
     }
 
     @Test
-    public void testE_saveQuote(){
+    public void testE_saveInquiry(){
         PurcInquiry purcInquiry = new PurcInquiry();
         PurcInquiry result = inquiryApi.saveInquiry(purcInquiry);
         System.out.println(JsonUtils.toJsonString(result));

frontend/operation-web/app/view/cuservice/Feedback.js

@@ -26,7 +26,7 @@ Ext.define('saas.view.cuservice.Feedback', {
         dataIndex: 'cf_creatime',
         width: 180,
         renderer: function(v, m, r) {
-            return Ext.Date.format(new Date(v), 'Y-m-d h:i:s');
+            return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
         }
     }, {
         text: '反馈内容',

frontend/operation-web/app/view/statistical/CompanyInfo.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.statistical.CompanyInfo', {
         width: 180,
         xtype: 'datecolumn',
         renderer: function(v, m, r) {
-            return Ext.Date.format(new Date(v), 'Y-m-d h:i:s');
+            return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
         }
     }, {
         text: '企业编号',

frontend/operation-web/app/view/statistical/LoginLog.js

@@ -30,7 +30,7 @@ Ext.define('saas.view.statistical.LoginLog', {
         width: 180,
         xtype: 'datecolumn',
         renderer: function(v, m, r) {
-            return Ext.Date.format(new Date(v), 'Y-m-d h:i:s');
+            return Ext.Date.format(new Date(v), 'Y-m-d H:i:s');
         }
     }],
 

frontend/operation-web/app/view/statistical/PersonInfo.js

@@ -49,7 +49,7 @@ Ext.define('saas.view.statistical.PersonInfo', {
         dataIndex: 'createTime',
         width: 180,
         renderer: function(v, m, r) {
-            return Ext.Date.format(new Date(v), 'Y-m-d h:i:s'); 
+            return Ext.Date.format(new Date(v), 'Y-m-d H:i:s'); 
         }
     }, {
         text: 'UU号',