Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/java/com/kmall/admin/controller/GoodsTransportInfoDetailController.java

@@ -4,6 +4,7 @@ import java.util.*;
 
 import com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto;
 import com.kmall.admin.entity.GoodsTransportInfoEntity;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.constant.JxlsXmlTemplateName;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
@@ -25,7 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @email admin@qhdswl.com
  * @date 2020-06-15 18:19:23
  */
-@Controller
+@RestController
 @RequestMapping("goodstransportinfodetail")
 public class GoodsTransportInfoDetailController {
     @Autowired
@@ -76,6 +77,8 @@ public class GoodsTransportInfoDetailController {
         goodsTransportInfoDetail.setCreateTime(new Date());
         goodsTransportInfoDetail.setModTime(new Date());
         goodsTransportInfoDetail.setTstm(new Date());
+        goodsTransportInfoDetail.setCreaterSn(ShiroUtils.getUserId().toString());
+        goodsTransportInfoDetail.setModerSn(ShiroUtils.getUserId().toString());
         goodsTransportInfoDetailService.save(goodsTransportInfoDetail);
 
         return R.ok();
@@ -93,6 +96,7 @@ public class GoodsTransportInfoDetailController {
         }
         goodsTransportInfoDetail.setModTime(new Date());
         goodsTransportInfoDetail.setTstm(new Date());
+        goodsTransportInfoDetail.setModerSn(ShiroUtils.getUserId().toString());
         goodsTransportInfoDetailService.update(goodsTransportInfoDetail);
 
         return R.ok();
@@ -162,7 +166,7 @@ public class GoodsTransportInfoDetailController {
             if (file.isEmpty()) {
                 return R.error("文件不能为空！");
             }
-            excelUtil.readExcel(JxlsXmlTemplateName.GOODS_TRANSPORT_INFO_DETAIL_ENTITY_LIST, beans, file.getInputStream());
+            excelUtil.readExcel(JxlsXmlTemplateName.Goods_Transport_Info_Detail_Excel_Dto_List, beans, file.getInputStream());
         } catch (Exception e) {
             e.printStackTrace();
             return R.error("导入失败！");

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsTransportInfoDetailServiceImpl.java

@@ -4,6 +4,7 @@ import com.kmall.admin.dao.GoodsTransportInfoDetailDao;
 import com.kmall.admin.dto.GoodsTransportInfoDetailExcelDto;
 import com.kmall.admin.entity.GoodsTransportInfoDetailEntity;
 import com.kmall.admin.service.GoodsTransportInfoDetailService;
+import com.kmall.admin.utils.ShiroUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.RRException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +72,10 @@ public class GoodsTransportInfoDetailServiceImpl implements GoodsTransportInfoDe
         return goodsTransportInfoDetailDao.queryTotalByStatusAndSku(query,wayStatus,sku);
     }
 
+    /**
+     * 把excel转成的list对象一行一行插入到数据库中
+     * @param goodsTransportInfoDetailExcelDtoList
+     */
     @Override
     @Transactional
     public void saveExcelDtoList(List<GoodsTransportInfoDetailExcelDto> goodsTransportInfoDetailExcelDtoList) {
@@ -86,8 +91,8 @@ public class GoodsTransportInfoDetailServiceImpl implements GoodsTransportInfoDe
             goodsTransportInfoDetailEntity.setSupplierId(Integer.parseInt(goodsTransportInfoDetailExcelDto.getSupplierId()));
             goodsTransportInfoDetailEntity.setOriginCountry(goodsTransportInfoDetailExcelDto.getOriginCountry());
             goodsTransportInfoDetailEntity.setNum(Integer.parseInt(goodsTransportInfoDetailExcelDto.getNum()));
-            goodsTransportInfoDetailEntity.setCreaterSn(goodsTransportInfoDetailExcelDto.getCreaterSn());
-            goodsTransportInfoDetailEntity.setModerSn(goodsTransportInfoDetailExcelDto.getModerSn());
+            goodsTransportInfoDetailEntity.setCreaterSn(ShiroUtils.getUserId().toString());
+            goodsTransportInfoDetailEntity.setModerSn(ShiroUtils.getUserId().toString());
             goodsTransportInfoDetailEntity.setTstm(new Date());
             goodsTransportInfoDetailEntity.setModTime(new Date());
             goodsTransportInfoDetailEntity.setCreateTime(new Date());

kmall-admin/src/main/resources/XmlTemplate/GoodsTransportInfoDetailEntityList.xml → kmall-admin/src/main/resources/XmlTemplate/GoodsTransportInfoDetailExcelDtoList.xml

@@ -10,8 +10,6 @@
                 <mapping row="1" col="2">GoodsTransportInfoDetailExcelDto.supplierId</mapping>
                 <mapping row="1" col="3">GoodsTransportInfoDetailExcelDto.originCountry</mapping>
                 <mapping row="1" col="4">GoodsTransportInfoDetailExcelDto.num</mapping>
-                <mapping row="1" col="5">GoodsTransportInfoDetailExcelDto.createrSn</mapping>
-                <mapping row="1" col="6">GoodsTransportInfoDetailExcelDto.moderSn</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodstransportinfodetail.html

@@ -53,15 +53,15 @@
             <Form-item label="数量" prop="num">
                 <i-input v-model="goodsTransportInfoDetail.num" placeholder="数量"/>
             </Form-item>
-            <Form-item label="创建人编号" prop="createrSn">
-                <i-input v-model="goodsTransportInfoDetail.createrSn" placeholder="创建人编号"/>
-            </Form-item>
+            <!--<Form-item label="创建人编号" prop="createrSn">-->
+                <!--<i-input v-model="goodsTransportInfoDetail.createrSn" placeholder="创建人编号"/>-->
+            <!--</Form-item>-->
             <!--<Form-item label="创建时间" prop="createTime">-->
                 <!--<i-input v-model="goodsTransportInfoDetail.createTime"  placeholder="创建时间"/>-->
             <!--</Form-item>-->
-            <Form-item label="修改人编号" prop="moderSn">
-                <i-input v-model="goodsTransportInfoDetail.moderSn" placeholder="修改人编号"/>
-            </Form-item>
+            <!--<Form-item label="修改人编号" prop="moderSn">-->
+                <!--<i-input v-model="goodsTransportInfoDetail.moderSn" placeholder="修改人编号"/>-->
+            <!--</Form-item>-->
             <!--<Form-item label="修改时间" prop="modTime">-->
                 <!--<i-input v-model="goodsTransportInfoDetail.modTime"  placeholder="修改时间"/>-->
             <!--</Form-item>-->

kmall-common/src/main/java/com/kmall/common/constant/JxlsXmlTemplateName.java

@@ -23,5 +23,5 @@ public class JxlsXmlTemplateName {
 
     public static final String CATE_STORE_DTO_LIST = "/XmlTemplate/CateStoreDtoList.xml";
     // 在途商品明细导入
-    public static final String GOODS_TRANSPORT_INFO_DETAIL_ENTITY_LIST = "/XmlTemplate/GoodsTransportInfoDetailEntityList.xml";
+    public static final String Goods_Transport_Info_Detail_Excel_Dto_List = "/XmlTemplate/GoodsTransportInfoDetailExcelDtoList.xml";
 }