Merge branch 'develop' of http://112.74.196.215:3000/Tech2/data-daq into develop

service-base/src/main/resources/mapper/EmailFileInfoMapper.xml

@@ -72,7 +72,7 @@
             nav.nav,
             nav.cumulative_nav_withdrawal,
             asset.asset_net,
-            asset.asset_share
+            asset.asset_share,
         FROM
             PPW_EMAIL.EMAIL_FILE_INFO efi
                 LEFT JOIN PPW_EMAIL.email_fund_nav nav

service-base/src/main/resources/mapper/EmailFundNavMapper.xml

@@ -43,9 +43,31 @@
         <result column="is_stored" property="isStored"/>
         <result column="exception_status" property="exceptionStatus"/>
         <result column="target_fund_id" property="targetFundId"/>
+        <result column="target_fund_name" property="targetFundName"/>
     </resultMap>
     <select id="searchNavDetail" resultType="com.simuwang.base.pojo.vo.EmailFundNavAssetVO">
-
+        SELECT distinct
+            IFNULL(nav.fund_id,asset.fund_id) as fund_id,
+            IFNULL(nav.fund_name,asset.fund_name) as fund_name,
+            IFNULL(nav.register_number,asset.register_number) as register_number,
+            IFNULL(nav.price_date,asset.price_date) as price_date,
+            nav.nav,
+            nav.cumulative_nav_withdrawal,
+            nav.exception_status,
+            nav.is_stored,
+            asset.asset_net,
+            asset.asset_share,
+        FROM
+            PPW_EMAIL.EMAIL_FILE_INFO efi
+                LEFT JOIN PPW_EMAIL.email_fund_nav nav
+                          ON efi.id = nav.file_id
+                              AND nav.isvalid = 1
+                LEFT JOIN PPW_EMAIL.email_fund_asset asset
+                          ON efi.id = asset.file_id
+                              AND asset.isvalid = 1 AND (nav.fund_id=asset.fund_id OR nav.register_number=asset.register_number OR nav.fund_name= asset.fund_name) AND nav.price_date=asset.price_date
+        WHERE efi.isvalid = 1
+          AND efi.id =#{fileId}
+        order by fund_name desc,price_date desc
     </select>
 
 

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -42,7 +42,6 @@ public class CompanyEmailSendHistoryController extends BaseController {
     public TableDataInfo searchCompanyEmail(@RequestParam(value = "companyName",required = false)String companyName,
                                             @RequestParam(value = "email",required = false)String email,
                                             @RequestParam(value = "sendStatus",required = false)Integer sendStatus){
-        startPage();
         List<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchCompanyEmail(companyName,email,sendStatus);
         return getDataTable(result);
     }
@@ -54,7 +53,6 @@ public class CompanyEmailSendHistoryController extends BaseController {
      */
     @RequestMapping("search-email-history")
     public TableDataInfo searchEmailHistory(@RequestParam(value = "companyId")String companyId){
-        startPage();
         List<CompanyEmailSendHistoryVO> result = companyEmailSendHistoryService.searchEmailHistory(companyId);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/email/EmailConfigController.java

@@ -39,7 +39,6 @@ public class EmailConfigController extends BaseController {
      */
     @RequestMapping("search-email-list")
     public TableDataInfo searchEmailConfigList(@RequestParam(value = "email",required = false)String email){
-        startPage();
         List<MailboxInfoTableVO> result = emailConfigService.searchEmailConfigList(email);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailController.java

@@ -89,7 +89,6 @@ public class ParseEmailController extends BaseController {
                                          @RequestParam(value = "timeRange",required = false)TimeRange timeRange,
                                          @RequestParam(value = "startDate",required = false)String startDate,
                                          @RequestParam(value = "endDate",required = false)String endDate){
-        startPage();
         List<EmailParseInfoVO> result = parseEmailService.searchEmailList(emailTitle,emailType,parseStatus,timeRange,startDate,endDate);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/email/ParseEmailDetailController.java

@@ -40,7 +40,6 @@ public class ParseEmailDetailController extends BaseController {
                                          @RequestParam(value = "priceEndDate",required = false)String priceEndDate,
                                          @RequestParam(value = "updateStartDate",required = false)String updateStartDate,
                                          @RequestParam(value = "updateEndDate",required = false)String updateEndDate){
-        startPage();
         List<EmailFundNavAssetVO> result = parseEmailDetailService.searchNavDetail(fundName,emailTitle,exceptionStatus,priceStartDate,priceEndDate,updateStartDate,updateEndDate);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/fund/FundInformationController.java

@@ -102,7 +102,6 @@ public class FundInformationController extends BaseController {
     public TableDataInfo searchFundFileInfo(@RequestParam("fundId")String fundId,@RequestParam("fileType")Integer fileType,
                                             @RequestParam(value = "pageNum",required = false)Integer pageNum,@RequestParam(value ="pageSize",
             required = false)Integer pageSize){
-        startPage();
         List<FundFileInfoVO> result = emailFundInfoService.searchFundFileInfo(fundId,fileType);
         return getDataTable(result);
     }

service-manage/src/main/java/com/simuwang/manage/api/system/SysConfigController.java

@@ -41,7 +41,6 @@ public class SysConfigController extends BaseController
     @ResponseBody
     public TableDataInfo list(SysConfigVO config)
     {
-        startPage();
         List<SysConfigDO> list = configService.selectConfigList(config);
         return getDataTable(list);
     }