md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisGoodsController.java

@@ -63,9 +63,9 @@ public class EmisGoodsController extends BaseController
         return getDataTable(list);
     }
 
-    @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')")
+//    @PreAuthorize("@ss.hasPermi('emis:emisGoods:list')")
     @JacksonFilter(include= {"id","goodsSn","goodsName","goodsNameEn"},value= EmisGoods.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    @GetMapping("/listSimple")
+    @RequestMapping("/listSimple")
     public TableDataInfo listSimple(EmisGoods emisGoods)
     {
         startPage();

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisMonthpayAccountController.java

@@ -13,6 +13,9 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
+import com.xdadan.erp.emis.domain.EmisGoods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -60,6 +63,15 @@ public class EmisMonthpayAccountController extends BaseController
         return getDataTable(list);
     }
 
+    @JacksonFilter(include= {"custNo","custName","customerCode","custNameEn","custNameEn","payee","salesmen","email","payeeName","salesmenName"},value= EmisMonthpayAccount.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @RequestMapping("/listSimple")
+    public TableDataInfo listSimple(EmisMonthpayAccount emisMonthpayAccount)
+    {
+        startPage();
+        List<EmisMonthpayAccount> list = emisMonthpayAccountService.selectEmisMonthpayAccountList(emisMonthpayAccount);
+        return getDataTable(list);
+    }
+
     /**
      * 导出月结账户表列表
      */

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisRegionController.java

@@ -68,6 +68,13 @@ public class EmisRegionController extends BaseController
     @GetMapping("/listSimple")
     public TableDataInfo listSimple(EmisRegion emisRegion)
     {
+        if(emisRegion.getRegionType() == null){
+            TableDataInfo rspData = new TableDataInfo();
+            rspData.setCode(500);
+            rspData.setMsg("参数错误,regionType必传");
+            return rspData;
+        }
+
         startPage();
         List<EmisRegion> list = emisRegionService.selectEmisRegionList(emisRegion);
         return getDataTable(list);

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisMonthpayAccount.java

@@ -127,4 +127,16 @@ public class EmisMonthpayAccount extends BaseEntity
     /* 更新网点 */
     private String updateSite;
 
+
+    private String countryName;
+    private String provinceName;
+    private String cityName;
+    private String countyName;
+
+    private String payeeName;
+    private String salesmenName;
+    private String ownerSiteName;
+    private String marketManName;
+
+
 }

emis-biz/src/main/resources/mapper/EmisMonthpayAccountMapper.xml

@@ -55,12 +55,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
+
+
+        <association property="countryName"    column="country" select="selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="selectRegionNameByCode"/>
+
+        <association property="payeeName"    column="payee" select="selectEmpNameByCode"/>
+        <association property="salesmenName"    column="salesmen" select="selectEmpNameByCode"/>
+        <association property="marketManName"    column="market_man" select="selectEmpNameByCode"/>
+        <association property="ownerSiteName"    column="owner_site" select="selectSiteNameByCode"/>
+
     </resultMap>
 
+
+
     <sql id="selectEmisMonthpayAccountVo">
         select id, cust_no, cust_name, cust_name_en, customer_code, user_type, company, lic_no, biz_info, cust_level, country, province, city, county, address, sex, owner_site, contact, phone, email, status, payee, salesmen, market_man, invitation_info, contract_type, order_num, contract_content, contract_change_content, contract_startdate, contract_enddate, contract_signdate, contract_senddate, contract_recievedate, express_name, express_billcode, bank, account_no, invoice_address, financial_contact, sender, send_address, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_monthpay_account
     </sql>
 
+    <select id="selectCountryNameByCode" parameterType="String" resultType="string">
+        select a.name from emis_country a where a.code = #{code} limit 1
+    </select>
+
+    <select id="selectRegionNameByCode" parameterType="String" resultType="string">
+        select a.region_name from emis_region a where a.region_code = #{code} limit 1
+    </select>
+
+    <select id="selectEmpNameByCode" parameterType="String" resultType="string">
+        select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
+    </select>
+
+
+    <select id="selectSiteNameByCode" parameterType="String" resultType="string">
+        select a.site_name from emis_site a where a.site_code = #{code} limit 1
+    </select>
+
+
     <select id="selectEmisMonthpayAccountList" parameterType="EmisMonthpayAccount" resultMap="EmisMonthpayAccountResult">
         <include refid="selectEmisMonthpayAccountVo"/>
         <where>