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

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

@@ -4,11 +4,13 @@ import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.service.VendorService;
 import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,9 +23,9 @@ public class VendorController {
     @Autowired
     private VendorService vendorService;
 
-    @RequestMapping("/getVendorsByCondition")
-    public Result<List<VendorDTO>> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO){
-        PageInfo<VendorDTO> vendorList = vendorService.getVendorsByCondition(page, docReqDTO);
+    @GetMapping("/getVendorsByCondition")
+    public Result<List<VendorDTO>> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO){
+        PageInfo<VendorDTO> vendorList = vendorService.getVendorsByCondition(page, listReqDTO);
         return Result.success(vendorList);
     }
 }

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

@@ -4,12 +4,14 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
+import feign.Param;
 
 import java.util.List;
 
 public interface VendorMapper extends CommonBaseMapper<Vendor> {
 
-    List<Vendor> getVendorsByCondition(DocReqDTO docReqDTO);
+    List<VendorDTO> getVendorsByCondition(@Param("condition") String condition, @Param("companyId") Long companyId);
 
 }

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

@@ -5,6 +5,7 @@ import com.usoftchina.saas.base.service.CommonBaseService;
 
 
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
@@ -14,6 +15,6 @@ import com.usoftchina.saas.page.PageRequest;
 
 public interface VendorService extends CommonBaseService<VendorMapper, Vendor>{
 
-    PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO);
+    PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO);
 
 }

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

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.dto.DocReqDTO;
+import com.usoftchina.saas.commons.dto.ListReqDTO;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.dto.VendorDTO;
 import com.usoftchina.saas.document.entities.Vendor;
 import com.usoftchina.saas.document.mapper.VendorMapper;
@@ -22,7 +24,7 @@ import java.util.List;
 public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendor> implements VendorService {
 
     @Override
-    public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, DocReqDTO docReqDTO) {
+    public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO) {
         //设置分页
         if (null == page || page.getSize() == 0 || page.getNumber() == 0) {
             page = new PageRequest();
@@ -30,9 +32,20 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             page.setSize(10);
         }
         PageHelper.startPage(page.getNumber(), page.getSize());
-        List<VendorDTO> vendorList = BeanMapper.mapList(getMapper().getVendorsByCondition(docReqDTO), VendorDTO.class);
+        List<VendorDTO> vendorList = getList(listReqDTO);
         //取分页信息
         PageInfo<VendorDTO> pageInfo = new PageInfo<VendorDTO>(vendorList);
         return pageInfo;
     }
+
+    private List<VendorDTO> getList(ListReqDTO listReqDTO){
+        Long companyId = BaseContextHolder.getCompanyId();
+        String condition = listReqDTO.getFinalCondition();
+        if(condition == null){
+            condition = "1=1";
+        }
+        List<VendorDTO> vendorDTOList = getMapper().getVendorsByCondition(condition, companyId);
+        return vendorDTOList;
+    }
+
 }

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

@@ -17,6 +17,9 @@
     from productbrand
     where pb_id = #{id}
   </select>
+  <sql id="Base_Column_List" >
+    pb_id, pb_name, pb_recordid, pb_recorder, pb_date, companyId, updaterId, updateTime
+  </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from productbrand
     where pb_id = #{id}

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

@@ -43,7 +43,12 @@
             <if test="condition!=null">
                 ${condition}
             </if>
+            <if test="companyId!=null">
+                AND companyId = #{companyId}
+            </if>
         </where>
+        ORDER BY VE_ID
     </select>
+
 </mapper>
 

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -10,6 +10,7 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
     columnWidth : 1.0, 
 
     requires: [
+        'Ext.grid.plugin.CellEditing',
         'Ext.selection.CellModel'
     ],
 

frontend/saas-web/app/view/core/grid/GridPanel.js

@@ -1,17 +0,0 @@
-Ext.define('saas.view.core.grid.GridPanel', {
-    extend: 'Ext.grid.Panel',
-    xtype: 'core-gridpanel',
-
-    GridUtil: Ext.create('saas.util.GridUtil'),
-
-    controller: 'core-grid-gridpanel',
-
-    configUrl: '',
-    dataUrl: '',
-
-    initComponent: function() {
-        var me = this;
-        me.configUrl && me.GridUtil.setColumns(me, me.configUrl);
-        me.callParent(arguments);
-    }
-});

frontend/saas-web/app/view/core/grid/GridPanelController.js

@@ -1,38 +0,0 @@
-Ext.define('saas.view.core.grid.GridPanelController', {
-    extend: 'Ext.app.ViewController',
-    alias: 'controller.core-grid-gridpanel',
-
-    control: {
-        'grid': {
-            afterSetColumns: '_initLoadData',
-            // itemClick: '_openDetail',
-        }
-    },
-
-    _initLoadData: function() {
-        var me = this,
-            grid = me.getView(),
-            GridUtil = grid.GridUtil,
-            dataUrl = grid.dataUrl;
-        
-        dataUrl && GridUtil.loadData(grid, dataUrl);
-    },
-
-    _openDetail: function(record) {
-        // console.log('grid1: click.....');
-        // var id = record.get('id');
-        // var mainTab = Ext.getCmp('main-tab-panel');
-        // var title = '采购单明细',
-        // existingItem = mainTab.down('[id=' + id + ']');
-
-        // lastView = mainTab.getActiveTab();
-
-        // if (!existingItem) {
-        //     var form = Ext.create('saas.view.purchase.panel.FormPanel', {
-        //         id,
-        //         title
-        //     });
-        //     mainTab.setActiveTab(mainTab.add(form));
-        // }
-    }
-});

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -186,6 +186,8 @@ Ext.define('saas.view.core.query.QueryPanel', {
             to = value.to;
 
             conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
+        }else if(xtype == 'combobox' || xtype == 'combo') {
+            conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {
             conditionValue = value.map(function(v) {
                 return '\'' + v.value + '\'';