~

vboot-application/src/main/java/vboot/app/module/de/supp/main/DeSuppContact.java

@@ -28,7 +28,6 @@ public class DeSuppContact {
     @Column(length = 32)
     private String email;//邮箱
 
-    @Column(length = 32)
     private String notes;//备注
 
     private Integer ornum;//排序号

vboot-core/src/main/java/vboot/core/common/init/AssInit.java

@@ -26,8 +26,8 @@ public class AssInit {
 
     private void initNum() {
         List<AssNumMain> numList = new ArrayList<>();
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
-        String cudat=dateFormat.format(new Date());
+//        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+//        String cudat=dateFormat.format(new Date());
         AssNumMain suppNum = new AssNumMain();
         suppNum.setId("SUPP");
         suppNum.setName("供应商流水号");

vboot-extend/src/main/java/vboot/extend/module/oa/demo/one/OaDemoOneRepo.java

@@ -1,9 +0,0 @@
-package vboot.extend.module.oa.demo.one;
-
-
-import org.springframework.data.jpa.repository.JpaRepository;
-
-public interface OaDemoOneRepo extends JpaRepository<OaDemoOne,String> {
-
-
-}

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/OaTestOne.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.one;
+package vboot.extend.module.oa.test.one;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -9,7 +9,7 @@ import javax.persistence.*;
 @Entity
 @Getter
 @Setter
-public class OaDemoOne extends BaseMainEntity {
+public class OaTestOne extends BaseMainEntity {
 
     private String notes;//备注
 

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/OaTestOneApi.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.one;
+package vboot.extend.module.oa.test.one;
 
 import cn.hutool.script.ScriptRuntimeException;
 import cn.hutool.script.ScriptUtil;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("oa/demo/one")
-public class OaDemoOneApi {
+@RequestMapping("oa/test/one")
+public class OaTestOneApi {
 
     @Oplog("查询DEMO")
     @GetMapping
@@ -45,7 +45,7 @@ public class OaDemoOneApi {
 //        if(true){
 //            throw new Exception("错误了");
 //        }
-        Sqler sqler = new Sqler("oa_demo_one");
+        Sqler sqler = new Sqler("oa_test_one");
         sqler.addLike("t.name", name);
         sqler.addSelect("t.addre,t.senum");
         return R.ok(service.findPageData(sqler));
@@ -89,17 +89,17 @@ public class OaDemoOneApi {
 
     @GetMapping("one/{id}")
     public R getOne(@PathVariable String id) {
-        OaDemoOne main = service.findOne(id);
+        OaTestOne main = service.findOne(id);
         return R.ok(main);
     }
 
     @PostMapping
-    public R post(@RequestBody OaDemoOne main) {
+    public R post(@RequestBody OaTestOne main) {
         return R.ok(service.insert(main));
     }
 
     @PutMapping
-    public R put(@RequestBody OaDemoOne main) {
+    public R put(@RequestBody OaTestOne main) {
         return R.ok(service.update(main));
     }
 
@@ -110,6 +110,6 @@ public class OaDemoOneApi {
 
 
     @Autowired
-    private OaDemoOneService service;
+    private OaTestOneService service;
 
 }

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/OaTestOneRepo.java

@@ -0,0 +1,9 @@
+package vboot.extend.module.oa.test.one;
+
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OaTestOneRepo extends JpaRepository<OaTestOne,String> {
+
+
+}

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/OaTestOneService.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.one;
+package vboot.extend.module.oa.test.one;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -7,12 +7,12 @@ import vboot.core.common.service.BaseMainService;
 import javax.annotation.PostConstruct;
 
 @Service
-public class OaDemoOneService extends BaseMainService<OaDemoOne> {
+public class OaTestOneService extends BaseMainService<OaTestOne> {
 
 
 
     @Autowired
-    private OaDemoOneRepo repo;
+    private OaTestOneRepo repo;
 
     @PostConstruct
     public void initDao() {

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/Student.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.one;
+package vboot.extend.module.oa.test.one;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import lombok.Data;

vboot-extend/src/main/java/vboot/extend/module/oa/test/one/StudentImportListener.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.one;
+package vboot.extend.module.oa.test.one;
 
 import com.alibaba.excel.context.AnalysisContext;
 import vboot.core.xutil.file.excel.ExcelListener;

vboot-extend/src/main/java/vboot/extend/module/oa/test/two/OaTestTwo.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.two;
+package vboot.extend.module.oa.test.two;
 
 import lombok.Getter;
 import lombok.Setter;
@@ -9,7 +9,7 @@ import javax.persistence.Entity;
 @Entity
 @Getter
 @Setter
-public class OaDemoTwo extends BaseMainEntity {
+public class OaTestTwo extends BaseMainEntity {
 
     //备注
     private String notes;

vboot-extend/src/main/java/vboot/extend/module/oa/test/two/OaTestTwoApi.java

@@ -1,4 +1,4 @@
-package vboot.extend.module.oa.demo.two;
+package vboot.extend.module.oa.test.two;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -7,8 +7,8 @@ import vboot.core.common.dao.JdbcDao;
 import vboot.core.common.dao.Sqler;
 
 @RestController
-@RequestMapping("oa/demo/two")
-public class OaDemoTwoApi {
+@RequestMapping("oa/test/two")
+public class OaTestTwoApi {
 
     @GetMapping("list")
     public R getList() {
@@ -18,7 +18,7 @@ public class OaDemoTwoApi {
     //分页查询项目清单
     @GetMapping
     public R get(String name) {
-        Sqler sqler = new Sqler("oa_demo_two");
+        Sqler sqler = new Sqler("oa_test_two");
         sqler.addLike("t.name", name);
         sqler.addSelect("t.notes");
         return R.ok(jdbcDao.findPageData(sqler));
@@ -27,19 +27,19 @@ public class OaDemoTwoApi {
     //查询单个项目
     @GetMapping("one/{id}")
     public R getOne(@PathVariable String id) {
-        OaDemoTwo main = service.findOne(id);
+        OaTestTwo main = service.findOne(id);
         return R.ok(main);
     }
 
     //新增项目
     @PostMapping
-    public R post(@RequestBody OaDemoTwo main) {
+    public R post(@RequestBody OaTestTwo main) {
         return R.ok(service.insert(main));
     }
 
     //修改项目
     @PutMapping
-    public R put(@RequestBody OaDemoTwo main) {
+    public R put(@RequestBody OaTestTwo main) {
         return R.ok(service.update(main));
     }
 
@@ -58,7 +58,7 @@ public class OaDemoTwoApi {
     }
 
     @Autowired
-    private OaDemoTwoService service;
+    private OaTestTwoService service;
 
     @Autowired
     private JdbcDao jdbcDao;

vboot-extend/src/main/java/vboot/extend/module/oa/test/two/OaTestTwoMapper.java

@@ -1,10 +1,10 @@
-package vboot.extend.module.oa.demo.two;
+package vboot.extend.module.oa.test.two;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface OaDemoTwoMapper extends BaseMapper<OaDemoTwo>
+public interface OaTestTwoMapper extends BaseMapper<OaTestTwo>
 {
 
 }

vboot-extend/src/main/java/vboot/extend/module/oa/test/two/OaTestTwoService.java

@@ -1,9 +1,9 @@
-package vboot.extend.module.oa.demo.two;
+package vboot.extend.module.oa.test.two;
 
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import vboot.extend.module.oa.demo.one.OaDemoOne;
-import vboot.extend.module.oa.demo.one.OaDemoOneRepo;
+import vboot.extend.module.oa.test.one.OaTestOne;
+import vboot.extend.module.oa.test.one.OaTestOneRepo;
 import vboot.core.xutil.lang.XstrUtil;
 
 import javax.annotation.Resource;
@@ -12,23 +12,23 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class OaDemoTwoService {
+public class OaTestTwoService {
 
-    public OaDemoTwo findOne(String id) {
+    public OaTestTwo findOne(String id) {
         return demoTwoMapper.selectById(id);
     }
 
-    public List<OaDemoTwo> findAll() {
+    public List<OaTestTwo> findAll() {
         return demoTwoMapper.selectList(null);
     }
 
-    public String insert(OaDemoTwo cust) {
+    public String insert(OaTestTwo cust) {
         cust.setId(XstrUtil.getUUID());
         demoTwoMapper.insert(cust);
         return cust.getId();
     }
 
-    public String update(OaDemoTwo cust) {
+    public String update(OaTestTwo cust) {
         demoTwoMapper.updateById(cust);
         return cust.getId();
     }
@@ -42,23 +42,23 @@ public class OaDemoTwoService {
 
     public void test() {
         //先通过JPA新增一个代理商
-        OaDemoOne demoMain=new OaDemoOne();
+        OaTestOne demoMain=new OaTestOne();
         demoMain.setId(XstrUtil.getUUID());
         demoMain.setName("有事务的项目");
         demoOneRepo.save(demoMain);
 
         //再通过mybatis-plus新增一个项目，并让它报错
-        OaDemoTwo demoMain2=new OaDemoTwo();
+        OaTestTwo demoMain2=new OaTestTwo();
         demoMain2.setId(XstrUtil.getUUID()+"XXXXXXXXXXXXXXXX");//超出长度保存出错
         demoMain2.setNotes("有事务的客户");
         demoTwoMapper.insert(demoMain2);
     }
 
     @Resource
-    private OaDemoOneRepo demoOneRepo;
+    private OaTestOneRepo demoOneRepo;
 
     @Resource
-    private OaDemoTwoMapper demoTwoMapper;
+    private OaTestTwoMapper demoTwoMapper;
 
 
 }