辅助资料修改

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

@@ -18,8 +18,7 @@ public class AddressController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Address address){
-        addressService.save(address);
-        return Result.success();
+        return Result.success(addressService.saveData(address));
     }
 
     @PostMapping("/delete/{id}")
@@ -36,7 +35,7 @@ public class AddressController {
 
     @GetMapping("/list")
     public Result<List<Address>> getAll(){
-        List<Address> addresseList = addressService.findAll();
+        List<Address> addresseList = addressService.selectAll();
         return Result.success(addresseList);
     }
 

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

@@ -18,8 +18,7 @@ public class FundinouttypeController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Fundinouttype fundinouttype){
-        fundinouttypeService.save(fundinouttype);
-        return Result.success();
+        return Result.success(fundinouttypeService.saveData(fundinouttype));
     }
 
     @PostMapping("/delete/{id}")
@@ -30,7 +29,7 @@ public class FundinouttypeController {
 
     @GetMapping("/list")
     public Result getAll(){
-        List<Fundinouttype> fundinouttypeList = fundinouttypeService.findAll();
+        List<Fundinouttype> fundinouttypeList = fundinouttypeService.selectAll();
         return Result.success(fundinouttypeList);
     }
 

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

@@ -22,8 +22,7 @@ public class ProductbrandController {
      */
     @PostMapping("/save")
     public Result save(@RequestBody Productbrand productbrand){
-        productbrandService.save(productbrand);
-        return Result.success();
+        return Result.success(productbrandService.saveData(productbrand));
     }
 
     /**
@@ -43,7 +42,7 @@ public class ProductbrandController {
      */
     @GetMapping("/list")
     public Result getAll(){
-        List<Productbrand> productbrandList = productbrandService.findAll();
+        List<Productbrand> productbrandList = productbrandService.selectAll();
         return Result.success(productbrandList);
     }
 

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

@@ -18,14 +18,13 @@ public class ProducttypeController {
 
     @GetMapping("/list")
     public Result<List<Producttype>> getAll(){
-        List<Producttype> producttypeList = producttypeService.findAll();
+        List<Producttype> producttypeList = producttypeService.selectAll();
         return Result.success(producttypeList);
     }
 
     @PostMapping("/save")
     public Result save(@RequestBody Producttype producttype){
-        producttypeService.save(producttype);
-        return Result.success();
+        return Result.success(producttypeService.saveData(producttype));
     }
 
     @PostMapping("/delete/{id}")

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

@@ -19,8 +19,7 @@ public class ProductunitController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Productunit productunit){
-        productunitService.save(productunit);
-        return Result.success();
+        return Result.success(productunitService.saveData(productunit));
     }
 
     @PostMapping("/delete/{id}")
@@ -31,7 +30,7 @@ public class ProductunitController {
 
     @GetMapping("/list")
     public Result getAll(){
-        List<Productunit> productunitList = productunitService.findAll();
+        List<Productunit> productunitList = productunitService.selectAll();
         return Result.success(productunitList);
     }
 

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

@@ -17,8 +17,7 @@ public class VendorkindController {
 
     @PostMapping("/save")
     public Result save(@RequestBody Vendorkind vendorkind){
-        vendorkindService.save(vendorkind);
-        return Result.success();
+        return Result.success(vendorkindService.saveData(vendorkind));
     }
 
     @PostMapping("/delete/{id}")
@@ -29,7 +28,7 @@ public class VendorkindController {
 
     @GetMapping("/list")
     public Result<Vendorkind> getAll(){
-        List<Vendorkind> vendorkindList = vendorkindService.findAll();
+        List<Vendorkind> vendorkindList = vendorkindService.selectAll();
         return Result.success(vendorkindList);
     }
 

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Address;
 import com.usoftchina.saas.document.mapper.AddressMapper;
 
@@ -14,4 +15,6 @@ public interface AddressService extends CommonBaseService<AddressMapper, Address
     List<ComboDTO> getCombo();
 
     List<Address> selectAll();
+
+    DocBaseDTO saveData(Address address);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Fundinouttype;
 import com.usoftchina.saas.document.mapper.FundinouttypeMapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,4 +14,6 @@ public interface FundinouttypeService extends CommonBaseService<FundinouttypeMap
     List<ComboDTO> getCombo();
 
     List<Fundinouttype> selectAll();
+
+    DocBaseDTO saveData(Fundinouttype fundinouttype);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Productbrand;
 import com.usoftchina.saas.document.mapper.ProductbrandMapper;
 
@@ -12,4 +13,6 @@ public interface ProductbrandService extends CommonBaseService<ProductbrandMappe
     List<ComboDTO> getCombo();
 
     List<Productbrand> selectAll();
+
+    DocBaseDTO saveData(Productbrand productbrand);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Producttype;
 import com.usoftchina.saas.document.mapper.ProducttypeMapper;
 
@@ -12,4 +13,6 @@ public interface ProducttypeService extends CommonBaseService<ProducttypeMapper,
     List<ComboDTO> getCombo();
 
     List<Producttype> selectAll();
+
+    DocBaseDTO saveData(Producttype producttype);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Productunit;
 import com.usoftchina.saas.document.mapper.ProductunitMapper;
 
@@ -12,4 +13,6 @@ public interface ProductunitService extends CommonBaseService<ProductunitMapper,
     List<ComboDTO> getCombo();
 
     List<Productunit> selectAll();
+
+    DocBaseDTO saveData(Productunit productunit);
 }

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

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.usoftchina.saas.base.service.CommonBaseService;
 import com.usoftchina.saas.commons.dto.ComboDTO;
+import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.document.entities.Vendorkind;
 import com.usoftchina.saas.document.mapper.VendorkindMapper;
 
@@ -12,4 +13,6 @@ public interface VendorkindService extends CommonBaseService<VendorkindMapper, V
     List<ComboDTO> getCombo();
 
     List<Vendorkind> selectAll();
+
+    DocBaseDTO saveData(Vendorkind vendorkind);
 }

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

@@ -32,7 +32,8 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
      * @return
      */
     @Override
-    public boolean save(Address address){
+    public DocBaseDTO saveData(Address address){
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
         if(address.getId() == 0){
             address.setCompanyId(BaseContextHolder.getCompanyId());
             address.setCreateTime(new Date());
@@ -41,7 +42,8 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             validName(address.getAd_address(), address.getId());
             addressMapper.insertSelective(address);
             //记录LOG
-            messageLogService.save(generateMsgObj(address.getId()));
+            docBaseDTO = generateMsgObj(address.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             address.setUpdaterId(BaseContextHolder.getUserId());
             address.setUpdateTime(new Date());
@@ -49,9 +51,10 @@ public class AddressServiceImpl extends CommonBaseServiceImpl<AddressMapper, Add
             validName(address.getAd_address(), address.getId());
             addressMapper.updateByPrimaryKeySelective(address);
             //记录LOG
-            messageLogService.update(generateMsgObj(address.getId()));
+            docBaseDTO = generateMsgObj(address.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -29,7 +29,8 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
      * @return
      */
     @Override
-    public boolean save(Fundinouttype fundinouttype){
+    public DocBaseDTO saveData(Fundinouttype fundinouttype){
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
         if(fundinouttype.getId() == 0){
             fundinouttype.setCompanyId(BaseContextHolder.getCompanyId());
             fundinouttype.setCreatorId(BaseContextHolder.getUserId());
@@ -39,7 +40,8 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
 
             getMapper().insertSelective(fundinouttype);
             //记录LOG
-            messageLogService.save(generateMsgObj(fundinouttype.getId()));
+            docBaseDTO = generateMsgObj(fundinouttype.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             fundinouttype.setUpdaterId(BaseContextHolder.getUserId());
             fundinouttype.setUpdateTime(new Date());
@@ -48,9 +50,10 @@ public class FundinouttypeServiceImpl extends CommonBaseServiceImpl<Fundinouttyp
 
             getMapper().updateByPrimaryKeySelective(fundinouttype);
             //记录LOG
-            messageLogService.update(generateMsgObj(fundinouttype.getId()));
+            docBaseDTO = generateMsgObj(fundinouttype.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -27,7 +27,8 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
     private final String LOG_NAME = "ProductBrand";
 
     @Override
-    public boolean save(Productbrand productbrand){
+    public DocBaseDTO saveData(Productbrand productbrand){
+        DocBaseDTO docBaseDTO = null;
         productbrand.setCompanyId(BaseContextHolder.getCompanyId());
         if(productbrand.getId() == 0){
             productbrand.setCompanyId(BaseContextHolder.getCompanyId());
@@ -38,7 +39,7 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
 
             productbrandMapper.insertSelective(productbrand);
             //记录日志
-            DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
+            docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
             messageLogService.save(docBaseDTO);
         }else{
             productbrand.setUpdaterId(BaseContextHolder.getUserId());
@@ -47,10 +48,10 @@ public class ProductbrandServiceImpl extends CommonBaseServiceImpl<ProductbrandM
             validName(productbrand.getPb_name(), productbrand.getId());
             productbrandMapper.updateByPrimaryKeySelective(productbrand);
             //记录日志
-            DocBaseDTO docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
+            docBaseDTO = new DocBaseDTO(productbrand.getId(), null, LOG_NAME);
             messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override

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

@@ -13,6 +13,7 @@ import com.usoftchina.saas.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.List;
 
@@ -30,7 +31,8 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
      * @return
      */
     @Override
-    public boolean save(Producttype producttype){
+    public DocBaseDTO saveData(Producttype producttype){
+        DocBaseDTO docBaseDTO = null;
         if(producttype.getId() == 0){
             producttype.setCompanyId(BaseContextHolder.getCompanyId());
             producttype.setCreatorId(BaseContextHolder.getUserId());
@@ -39,7 +41,8 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.insertSelective(producttype);
             //记录LOG
-            messageLogService.save(generateMsgObj(producttype.getId()));
+            docBaseDTO = generateMsgObj(producttype.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             producttype.setUpdaterId(BaseContextHolder.getUserId());
             producttype.setUpdateTime(new Date());
@@ -47,9 +50,10 @@ public class ProducttypeServiceImpl extends CommonBaseServiceImpl<ProducttypeMap
             validName(producttype.getPt_name(), producttype.getId());
             producttypeMapper.updateByPrimaryKeySelective(producttype);
             //记录LOG
-            messageLogService.update(generateMsgObj(producttype.getId()));
+            docBaseDTO = generateMsgObj(producttype.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     /**

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

@@ -23,7 +23,8 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
     private MessageLogService messageLogService;
 
     @Override
-    public boolean save(Productunit productunit){
+    public DocBaseDTO saveData(Productunit productunit){
+        DocBaseDTO docBaseDTO = null;
         if(productunit.getId() == 0){
             productunit.setCompanyId(BaseContextHolder.getCompanyId());
             productunit.setCreatorId(BaseContextHolder.getUserId());
@@ -33,7 +34,8 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
 
             getMapper().insertSelective(productunit);
             //记录LOG
-            messageLogService.save(generateMsgObj(productunit.getId()));
+            docBaseDTO = generateMsgObj(productunit.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             productunit.setUpdaterId(BaseContextHolder.getUserId());
             productunit.setUpdateTime(new Date());
@@ -41,9 +43,10 @@ public class ProductunitServiceImpl extends CommonBaseServiceImpl<ProductunitMap
             validName(productunit.getPu_name(), productunit.getId());
             getMapper().updateByPrimaryKeySelective(productunit);
             //记录LOG
-            messageLogService.update(generateMsgObj(productunit.getId()));
+            docBaseDTO = generateMsgObj(productunit.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override

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

@@ -260,9 +260,9 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
 
     @Override
     public boolean deleteContact(Long id) {
-        vendorcontactMapper.deleteByPrimaryKey(id);
         Long ve_id = vendorcontactMapper.selectByPrimaryKey(id).getVc_veid();
         String code = getMapper().getCodeById(ve_id, BaseContextHolder.getCompanyId());
+        vendorcontactMapper.deleteByPrimaryKey(id);
         //记录LOG
         messageLogService.deleteDetail(generateMsgObj(id, code));
         return true;

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

@@ -13,6 +13,7 @@ import com.usoftchina.saas.exception.BizException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.print.Doc;
 import java.util.Date;
 import java.util.List;
 
@@ -25,7 +26,8 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
     private MessageLogService messageLogService;
 
     @Override
-    public boolean save(Vendorkind vendorkind){
+    public DocBaseDTO saveData(Vendorkind vendorkind){
+        DocBaseDTO docBaseDTO = null;
         if(vendorkind.getId() == 0){
             vendorkind.setCompanyId(BaseContextHolder.getCompanyId());
             vendorkind.setCreatorId(BaseContextHolder.getUserId());
@@ -34,7 +36,8 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.insertSelective(vendorkind);
             //记录LOG
-            messageLogService.save(generateMsgObj(vendorkind.getId()));
+            docBaseDTO = generateMsgObj(vendorkind.getId());
+            messageLogService.save(docBaseDTO);
         }else{
             vendorkind.setUpdaterId(BaseContextHolder.getUserId());
             vendorkind.setUpdateTime(new Date());
@@ -42,9 +45,10 @@ public class VendorkindServiceImpl extends CommonBaseServiceImpl<VendorkindMappe
             validName(vendorkind.getVk_name(), vendorkind.getId());
             vendorkindMapper.updateByPrimaryKeySelective(vendorkind);
             //记录LOG
-            messageLogService.update(generateMsgObj(vendorkind.getId()));
+            docBaseDTO = generateMsgObj(vendorkind.getId());
+            messageLogService.update(docBaseDTO);
         }
-        return true;
+        return docBaseDTO;
     }
 
     @Override