1、维修/保养补充费用明细

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitMaintenance/entity/ExhibitMaintenance.java

@@ -99,6 +99,18 @@ public class ExhibitMaintenance implements Serializable {
     @ApiModelProperty(value = "关联展品id")
     private java.lang.String showpieceId;
 
+    //下次保养日期
+    @TableField(exist = false)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "下次保养")
+    private java.util.Date nextMaintenanceDate;
+
+    //保养费用明细
+    @TableField(exist = false)
+    @ApiModelProperty(value = "保养费用明细")
+    String expenseList;
+
     //保养费用表
     @TableField(exist = false)
     List<ExhibitMaintenanceExpense> exhibitMaintenanceExpenses;

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/exhibitRepair/entity/ExhibitRepair.java

@@ -91,7 +91,12 @@ public class ExhibitRepair implements Serializable {
     @ApiModelProperty(value = "关联展品id")
     private java.lang.String showpieceId;
 
-    //维修费用表
+    //维修费用明细
+    @TableField(exist = false)
+    @ApiModelProperty(value = "维修费用明细")
+    String expenseList;
+
+    //维修费用
     @TableField(exist = false)
     List<ExhibitRepairExpense> exhibitRepairExpenseList;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ConfigController.java

@@ -26,7 +26,7 @@ public class ConfigController {
     private ConfigService configService;
     /******************************************************************************************************************/
 
-    @ApiOperation(value="配置-查看轮播图列表", notes="配置-查看轮播图列表")
+    @ApiOperation(value="配置-查看轮播图列表", notes="type：0-首页")
     @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET})
     public Result<?> queryBannerList(ExhibitBanner exhibitBanner, PageBean pageBean){
         return configService.queryBannerList(exhibitBanner, pageBean);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/exhibitController/ShowpieceController.java

@@ -74,8 +74,8 @@ public class ShowpieceController {
 
     @ApiOperation(value="维修-新增维修记录", notes="维修-新增维修记录")
     @RequestMapping(value = "/addRepair", method = {RequestMethod.POST})
-    public Result<?> addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair, String expenseList){
-        return showpieceService.addRepair(token, exhibitRepair, expenseList);
+    public Result<?> addRepair(@RequestHeader("X-Access-Token") String token, ExhibitRepair exhibitRepair){
+        return showpieceService.addRepair(token, exhibitRepair);
     }
 
     @ApiOperation(value="保养-查看保养记录列表", notes="保养-查看保养记录列表")
@@ -92,8 +92,8 @@ public class ShowpieceController {
 
     @ApiOperation(value="保养-新增保养记录", notes="保养-新增保养记录")
     @RequestMapping(value = "/addMaintenance", method = {RequestMethod.POST})
-    public Result<?> addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance, String expenseList){
-        return showpieceService.addMaintenance(token, exhibitMaintenance, expenseList);
+    public Result<?> addMaintenance(@RequestHeader("X-Access-Token") String token, ExhibitMaintenance exhibitMaintenance){
+        return showpieceService.addMaintenance(token, exhibitMaintenance);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/ShowpieceService.java

@@ -35,7 +35,7 @@ public interface ShowpieceService {
     public Result<?> queryRepairById(String repairId);
 
     //维修-新增维修记录
-    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair, String expenseList);
+    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair);
 
     //保养-查看保养记录列表
     public Result<?> queryMaintenanceList(ExhibitMaintenance exhibitMaintenance, PageBean pageBean);
@@ -44,6 +44,6 @@ public interface ShowpieceService {
     public Result<?> queryMaintenanceById(String maintenanceId);
 
     //保养-新增保养记录
-    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList);
+    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/LoginApiServiceImpl.java

@@ -91,9 +91,9 @@ public class LoginApiServiceImpl implements LoginApiService {
 //            memberService.saveOrUpdate(member);
             // 生成token返回给小程序端
 
-            if(!"1".equals(member.getStatus())){
-                return Result.error("用户审核未通过，请联系管理员进行审核");
-            }
+//            if(!"1".equals(member.getStatus())){
+//                return Result.error("用户审核未通过，请联系管理员进行审核");
+//            }
 
             String token = JwtUtil.sign(member.getAppletOpenid(), wxOpenid);
             redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, token);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/ShowpieceServiceImpl.java

@@ -92,8 +92,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 query.eq(ExhibitShowpiece::getCategoryId, exhibitShowpiece.getCategoryId());
             }
 
-            //按照创建时间降序排列
-            query.orderByAsc(ExhibitShowpiece::getCreateTime);
+            //按照下次保养日期升序排列
+            query.orderByAsc(ExhibitShowpiece::getMaintenanceDate);
 
             //获取展品信息列表
             pageList = query.page(page);
@@ -140,8 +140,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 query.eq(ExhibitMalfunction::getStatus, exhibitMalfunction.getStatus());
             }
 
-            //按照创建时间降序排列
-            query.orderByAsc(ExhibitMalfunction::getCreateTime);
+            //按照报修日期降序排列
+            query.orderByDesc(ExhibitMalfunction::getMalfunctionDate);
 
             //获取报修单信息列表
             pageList = query.page(page);
@@ -291,8 +291,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 query.eq(ExhibitRepair::getRepairName, exhibitRepair.getRepairName());
             }
 
-            //按照创建时间降序排列
-            query.orderByAsc(ExhibitRepair::getCreateTime);
+            //按照维修时间降序排列
+            query.orderByDesc(ExhibitRepair::getRepairDate);
 
             //获取维修记录信息列表
             pageList = query.page(page);
@@ -345,7 +345,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
     //维修-新增维修记录
     @Override
-    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair, String expenseList) {
+    public Result<?> addRepair(String token, ExhibitRepair exhibitRepair) {
         log.info("开始新增维修记录");
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@@ -368,22 +368,25 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
             //3、新增费用明细
             List<ExhibitRepairExpense> list = new ArrayList<>();
-            String[] split = expenseList.split(";");
-            for (String s : split) {
-                String[] expense = s.split(",");
-                String title = expense[0];//费用名称
-                int num = Integer.parseInt(expense[1]);//数量
-                BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
-
-                ExhibitRepairExpense exhibitRepairExpense = new ExhibitRepairExpense();
-                exhibitRepairExpense.setRepairId(id);
-                exhibitRepairExpense.setTitle(title);
-                exhibitRepairExpense.setNum(num);
-                exhibitRepairExpense.setAmount(amount);
-
-                list.add(exhibitRepairExpense);
+            boolean result2 = true;
+            if(StringUtils.isNotEmpty(exhibitRepair.getExpenseList())){
+                String[] split = exhibitRepair.getExpenseList().split(";");
+                for (String s : split) {
+                    String[] expense = s.split(",");
+                    String title = expense[0];//费用名称
+                    int num = Integer.parseInt(expense[1]);//数量
+                    BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
+
+                    ExhibitRepairExpense exhibitRepairExpense = new ExhibitRepairExpense();
+                    exhibitRepairExpense.setRepairId(id);
+                    exhibitRepairExpense.setTitle(title);
+                    exhibitRepairExpense.setNum(num);
+                    exhibitRepairExpense.setAmount(amount);
+
+                    list.add(exhibitRepairExpense);
+                }
+                result2 = exhibitRepairExpenseService.saveBatch(list);
             }
-            boolean result2 = exhibitRepairExpenseService.saveBatch(list);
 
             //4、判断维修记录是否新增成功
             if(result1 && result2){
@@ -434,8 +437,8 @@ public class ShowpieceServiceImpl implements ShowpieceService {
                 query.eq(ExhibitMaintenance::getMaintenanceName, exhibitMaintenance.getMaintenanceName());
             }
 
-            //按照创建时间降序排列
-            query.orderByAsc(ExhibitMaintenance::getCreateTime);
+            //按照保养时间降序排列
+            query.orderByDesc(ExhibitMaintenance::getMaintenanceDate);
 
             //获取维修记录信息列表
             pageList = query.page(page);
@@ -488,7 +491,7 @@ public class ShowpieceServiceImpl implements ShowpieceService {
 
     //保养-新增保养记录
     @Override
-    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance, String expenseList) {
+    public Result<?> addMaintenance(String token, ExhibitMaintenance exhibitMaintenance) {
         log.info("开始新增保养记录");
         //权限验证
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
@@ -507,28 +510,42 @@ public class ShowpieceServiceImpl implements ShowpieceService {
             //2、新增维修记录
             String id = IdWorker.getIdStr();//生成保养单id
             exhibitMaintenance.setId(id);
-            boolean result =  exhibitMaintenanceService.save(exhibitMaintenance);
+            boolean result1 =  exhibitMaintenanceService.save(exhibitMaintenance);
 
             //3、新增费用明细
             List<ExhibitMaintenanceExpense> list = new ArrayList<>();
-            String[] split = expenseList.split(";");
-            for (String s : split) {
-                String[] expense = s.split(",");
-                String title = expense[0];//费用名称
-                int num = Integer.parseInt(expense[1]);//数量
-                BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
-
-                ExhibitMaintenanceExpense exhibitMaintenanceExpense = new ExhibitMaintenanceExpense();
-                exhibitMaintenanceExpense.setMaintenanceId(id);
-                exhibitMaintenanceExpense.setTitle(title);
-                exhibitMaintenanceExpense.setNum(num);
-                exhibitMaintenanceExpense.setAmount(amount);
-
-                list.add(exhibitMaintenanceExpense);
+            boolean result2 = true;
+            if(StringUtils.isNotEmpty(exhibitMaintenance.getExpenseList())){
+                String[] split = exhibitMaintenance.getExpenseList().split(";");
+                for (String s : split) {
+                    String[] expense = s.split(",");
+                    String title = expense[0];//费用名称
+                    int num = Integer.parseInt(expense[1]);//数量
+                    BigDecimal amount = BigDecimal.valueOf(Long.parseLong(expense[2]));//金额
+
+                    ExhibitMaintenanceExpense exhibitMaintenanceExpense = new ExhibitMaintenanceExpense();
+                    exhibitMaintenanceExpense.setMaintenanceId(id);
+                    exhibitMaintenanceExpense.setTitle(title);
+                    exhibitMaintenanceExpense.setNum(num);
+                    exhibitMaintenanceExpense.setAmount(amount);
+
+                    list.add(exhibitMaintenanceExpense);
+                }
+                result2 = exhibitMaintenanceExpenseService.saveBatch(list);
             }
-            boolean result2 = exhibitMaintenanceExpenseService.saveBatch(list);
 
-            if(result){
+            //4、修改展品下次保养时间
+            boolean result3 = true;
+            if(null != exhibitMaintenance.getNextMaintenanceDate()){
+                ExhibitShowpiece showpiece = exhibitShowpieceService.getById(exhibitMaintenance.getShowpieceId());
+                if(null != showpiece){
+                    showpiece.setMaintenanceDate(exhibitMaintenance.getNextMaintenanceDate());
+                    result3 = exhibitShowpieceService.updateById(showpiece);
+                }
+            }
+
+
+            if(result1 && result2 && result3){
                 log.info("保养记录新增成功");
                 return Result.OK("保养记录新增成功");
             }else {

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/service/impl/UserInfoServiceImpl.java

@@ -56,9 +56,9 @@ public class UserInfoServiceImpl implements UserInfoService {
         //HanHaiMember hanHaiMember = hanHaiMemberService.getById(token);
 
         try{
-            if(!"1".equals(hanHaiMember.getStatus())){
-                return Result.error("用户审核未通过，请联系管理员进行审核");
-            }
+//            if(!"1".equals(hanHaiMember.getStatus())){
+//                return Result.error("用户审核未通过，请联系管理员进行审核");
+//            }
             //用户昵称不能为空
             if(StringUtils.isBlank(nickName)){
                 log.error("用户昵称不能为空");