From 8c190ca7fc0e2003f4514529537dce00b406cb77 Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Wed, 9 Jul 2025 12:01:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=95=86=E6=A0=87=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=20,=20=E7=94=B5=E5=AD=90=E8=BD=AF=E8=91=97=E5=A4=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrademarkTypeController.java | 12 +--- .../TrademarkTypesController.java | 67 +++++++++++++++++ .../apporder/AppOrderRouteController.java | 11 ++- .../trademark/TrademarkRouteController.java | 9 ++- .../dao/trademarktype/ITrademarkTypeDao.java | 11 +++ .../dtos/trademarktype/TrademarkTypesDTO.java | 72 +++++++++++++++++++ .../vos/trademarktype/TrademarkTypesVO.java | 53 ++++++++++++++ .../impl/CorrectionServiceImpl.java | 22 +++++- .../trademark/impl/TrademarkServiceImpl.java | 1 + .../trademarktype/ITrademarkTypeService.java | 7 ++ .../impl/TrademarkTypeServiceImpl.java | 58 ++++++++++++++- .../mapper/trademark/trademark-mapper.xml | 3 + .../trademarktype/trademark-type-mapper.xml | 60 ++++++++++++++++ .../resources/templates/apporder/update.html | 8 +-- .../templates/correction/trademark-list.html | 2 +- .../resources/templates/trademark/list.html | 36 ++++++++-- .../resources/templates/trademark/update.html | 8 ++- 17 files changed, 411 insertions(+), 29 deletions(-) create mode 100644 src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypesController.java create mode 100644 src/main/java/cn/com/tenlion/aishop/pojo/dtos/trademarktype/TrademarkTypesDTO.java create mode 100644 src/main/java/cn/com/tenlion/aishop/pojo/vos/trademarktype/TrademarkTypesVO.java diff --git a/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypeController.java b/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypeController.java index aae6838..d9c7fea 100644 --- a/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypeController.java +++ b/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypeController.java @@ -1,8 +1,7 @@ package cn.com.tenlion.aishop.controller.api.trademarktype; -import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeZtreeDTO; -import cn.com.tenlion.aishop.pojo.dtos.trademarktype.ZTreeDTO; -import cn.com.tenlion.aishop.pojo.dtos.trademarktype.ZTreeDTO2; +import cn.com.tenlion.aishop.pojo.dtos.trademarktype.*; +import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypesVO; import ink.wgink.annotation.CheckRequestBodyAnnotation; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; @@ -11,7 +10,6 @@ import ink.wgink.pojo.result.ErrorResult; import ink.wgink.pojo.result.SuccessResult; import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; -import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeDTO; import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypeVO; import cn.com.tenlion.aishop.service.trademarktype.ITrademarkTypeService; import io.swagger.annotations.*; @@ -20,10 +18,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @ClassName: TrademarkTypeController @@ -48,7 +43,6 @@ public class TrademarkTypeController extends DefaultBaseController { public void list1() throws Exception { // TrademarkDataFetcher.fetchData(); } - @ApiOperation(value = "类型zTree列表(查询)全量返回", notes = "类型zTree列表(查询)全量返回接口") @ApiImplicitParams({ @ApiImplicitParam(name = "keywords", value = "查询的内容", paramType = "query", dataType = "String", defaultValue = "1"), diff --git a/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypesController.java b/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypesController.java new file mode 100644 index 0000000..6b26a06 --- /dev/null +++ b/src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypesController.java @@ -0,0 +1,67 @@ +package cn.com.tenlion.aishop.controller.api.trademarktype; + +import cn.com.tenlion.aishop.pojo.dtos.trademarktype.*; +import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypeVO; +import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypesVO; +import cn.com.tenlion.aishop.service.trademarktype.ITrademarkTypeService; +import ink.wgink.annotation.CheckRequestBodyAnnotation; +import ink.wgink.common.base.DefaultBaseController; +import ink.wgink.interfaces.consts.ISystemConstant; +import ink.wgink.pojo.ListPage; +import ink.wgink.pojo.result.ErrorResult; +import ink.wgink.pojo.result.SuccessResult; +import ink.wgink.pojo.result.SuccessResultData; +import ink.wgink.pojo.result.SuccessResultList; +import io.swagger.annotations.*; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +/** + * @ClassName: TrademarkTypesController + * @Description: 商标类型 + * @Author: CodeFactory + * @Date: 2025-06-10 10:15:37 + * @Version: 3.0 + **/ +@Api(tags = ISystemConstant.API_TAGS_SYSTEM_PREFIX + "商标类型收藏接口") +@RestController +@RequestMapping(ISystemConstant.API_PREFIX + "/trademark-types") +public class TrademarkTypesController extends DefaultBaseController { + + @Autowired + private ITrademarkTypeService trademarkTypeService; + + @ApiOperation(value = "新增类型收藏", notes = "新增类型收藏接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PostMapping("save-repository") + public SuccessResultData saveRepository(@RequestBody TrademarkTypesVO typesVO) { + return new SuccessResultData<>(trademarkTypeService.saveRepository(typesVO)); + } + + @ApiOperation(value = "修改类型收藏", notes = "修改类型收藏接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @PutMapping("update-repository/{typesId}") + public SuccessResultData updateRepository(@PathVariable String typesId, @RequestBody TrademarkTypesVO typesVO) { + return new SuccessResultData<>(trademarkTypeService.updateRepository(typesId, typesVO)); + } + + @ApiOperation(value = "删除类型收藏", notes = "删除类型收藏接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @DeleteMapping("remove-repository/{typesId}") + public SuccessResult removeRepository(@PathVariable String typesId) { + trademarkTypeService.deleteRepository(typesId); + return new SuccessResult(); + } + + @ApiOperation(value = "类型收藏列表", notes = "类型收藏列表接口") + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("list-repository") + public List listRepository() { + return trademarkTypeService.listRepository(new HashMap<>()); + } + +} \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/aishop/controller/route/apporder/AppOrderRouteController.java b/src/main/java/cn/com/tenlion/aishop/controller/route/apporder/AppOrderRouteController.java index b759032..a8bfed8 100644 --- a/src/main/java/cn/com/tenlion/aishop/controller/route/apporder/AppOrderRouteController.java +++ b/src/main/java/cn/com/tenlion/aishop/controller/route/apporder/AppOrderRouteController.java @@ -1,5 +1,6 @@ package cn.com.tenlion.aishop.controller.route.apporder; +import cn.com.tenlion.aishop.pojo.dtos.apporder.AppOrderDTO; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; import cn.com.tenlion.aishop.service.apporder.IAppOrderService; @@ -24,7 +25,8 @@ import java.util.Map; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/apporder") public class AppOrderRouteController extends DefaultBaseController { - + @Autowired + private IAppOrderService appOrderService; @GetMapping("save") public ModelAndView save() { @@ -32,8 +34,11 @@ public class AppOrderRouteController extends DefaultBaseController { } @GetMapping("update") - public ModelAndView update() { - return new ModelAndView("apporder/update"); + public ModelAndView update(String appOrderId){ + AppOrderDTO appOrderDTO = appOrderService.get(appOrderId); + ModelAndView mv = new ModelAndView("apporder/update"); + mv.addObject("appOrderDTO", appOrderDTO); + return mv; } @GetMapping("list") diff --git a/src/main/java/cn/com/tenlion/aishop/controller/route/trademark/TrademarkRouteController.java b/src/main/java/cn/com/tenlion/aishop/controller/route/trademark/TrademarkRouteController.java index 4e749a7..3e78d66 100644 --- a/src/main/java/cn/com/tenlion/aishop/controller/route/trademark/TrademarkRouteController.java +++ b/src/main/java/cn/com/tenlion/aishop/controller/route/trademark/TrademarkRouteController.java @@ -24,14 +24,19 @@ import java.util.Map; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/trademark") public class TrademarkRouteController extends DefaultBaseController { + @Autowired + private ITrademarkService trademarkService; + @GetMapping("save") public ModelAndView save() { return new ModelAndView("trademark/save"); } @GetMapping("update") - public ModelAndView update() { - return new ModelAndView("trademark/update"); + public ModelAndView update(String trademarkId) { + ModelAndView modelAndView = new ModelAndView("trademark/update"); + modelAndView.addObject("trademarkDTO", trademarkService.get(trademarkId)); + return modelAndView; } @GetMapping("list") diff --git a/src/main/java/cn/com/tenlion/aishop/dao/trademarktype/ITrademarkTypeDao.java b/src/main/java/cn/com/tenlion/aishop/dao/trademarktype/ITrademarkTypeDao.java index b8045b8..373a854 100644 --- a/src/main/java/cn/com/tenlion/aishop/dao/trademarktype/ITrademarkTypeDao.java +++ b/src/main/java/cn/com/tenlion/aishop/dao/trademarktype/ITrademarkTypeDao.java @@ -1,5 +1,6 @@ package cn.com.tenlion.aishop.dao.trademarktype; +import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypesDTO; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.ZTreeDTO; import ink.wgink.exceptions.RemoveException; import ink.wgink.exceptions.SaveException; @@ -120,4 +121,14 @@ public interface ITrademarkTypeDao { Integer countByParentId(String id); List listZTree(Map params); + + void saveRepository(Map params); + + void saveRepositoryItem(Map params2); + + void deleteRepository(Map params2); + + List listRepository(Map params); + + List listRepositoryItem(String typesId); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/trademarktype/TrademarkTypesDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/trademarktype/TrademarkTypesDTO.java new file mode 100644 index 0000000..4edcd9b --- /dev/null +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/trademarktype/TrademarkTypesDTO.java @@ -0,0 +1,72 @@ +package cn.com.tenlion.aishop.pojo.dtos.trademarktype; + +import ink.wgink.annotation.CheckListAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @ClassName: TrademarkTypeVO + * @Description: 商标类型 + * @Author: CodeFactory + * @Date: 2025-06-10 10:15:37 + * @Version: 3.0 + **/ +@ApiModel +public class TrademarkTypesDTO { + + @ApiModelProperty(name = "typesTitle", value = "") + private String typesId; + @ApiModelProperty(name = "typesTitle", value = "") + private String typesTitle; + @ApiModelProperty(name = "typesRemark", value = "") + private String typesRemark; + @ApiModelProperty(name = "trademarkTypeIds", value = "") + private List trademarkTypeIds; + @ApiModelProperty(name = "trademarkTypeDTOS", value = "") + private List trademarkTypeDTOS; + + public List getTrademarkTypeDTOS() { + return trademarkTypeDTOS == null ? new ArrayList<>() : trademarkTypeDTOS; + } + + public void setTrademarkTypeDTOS(List trademarkTypeDTOS) { + this.trademarkTypeDTOS = trademarkTypeDTOS; + } + + public List getTrademarkTypeIds() { + return trademarkTypeIds == null ? new ArrayList<>() : trademarkTypeIds; + } + + public void setTrademarkTypeIds(List trademarkTypeIds) { + this.trademarkTypeIds = trademarkTypeIds; + } + + public String getTypesId() { + return typesId == null ? "" : typesId.trim(); + } + + public void setTypesId(String typesId) { + this.typesId = typesId; + } + + public String getTypesTitle() { + return typesTitle == null ? "" : typesTitle.trim(); + } + + public void setTypesTitle(String typesTitle) { + this.typesTitle = typesTitle; + } + + public String getTypesRemark() { + return typesRemark == null ? "" : typesRemark.trim(); + } + + public void setTypesRemark(String typesRemark) { + this.typesRemark = typesRemark; + } + +} diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/vos/trademarktype/TrademarkTypesVO.java b/src/main/java/cn/com/tenlion/aishop/pojo/vos/trademarktype/TrademarkTypesVO.java new file mode 100644 index 0000000..697e502 --- /dev/null +++ b/src/main/java/cn/com/tenlion/aishop/pojo/vos/trademarktype/TrademarkTypesVO.java @@ -0,0 +1,53 @@ +package cn.com.tenlion.aishop.pojo.vos.trademarktype; + +import ink.wgink.annotation.CheckEmptyAnnotation; +import ink.wgink.annotation.CheckListAnnotation; +import ink.wgink.annotation.CheckNumberAnnotation; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.ArrayList; +import java.util.List; + +/** + * + * @ClassName: TrademarkTypeVO + * @Description: 商标类型 + * @Author: CodeFactory + * @Date: 2025-06-10 10:15:37 + * @Version: 3.0 + **/ +@ApiModel +public class TrademarkTypesVO { + @ApiModelProperty(name = "typesTitle", value = "") + private String typesTitle; + @ApiModelProperty(name = "typesRemark", value = "") + private String typesRemark; + @ApiModelProperty(name = "typeList", value = "商标类型") + @CheckListAnnotation(name = "商标类型") + private List typeList; + + public String getTypesTitle() { + return typesTitle == null ? "" : typesTitle.trim(); + } + + public void setTypesTitle(String typesTitle) { + this.typesTitle = typesTitle; + } + + public String getTypesRemark() { + return typesRemark == null ? "" : typesRemark.trim(); + } + + public void setTypesRemark(String typesRemark) { + this.typesRemark = typesRemark; + } + + public List getTypeList() { + return typeList == null ? new ArrayList<>() : typeList; + } + + public void setTypeList(List typeList) { + this.typeList = typeList; + } +} diff --git a/src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java index ea6afbb..90960a9 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java +++ b/src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java @@ -237,8 +237,9 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec phoneArray.add(obj); Map templateParams = new HashMap<>(); - templateParams.put("name", orderDTO.getTrademarkDescription()); - TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00015", templateParams, phoneArray); + templateParams.put("name", StringUtils.isEmpty(orderDTO.getTrademarkName()) ? orderDTO.getTrademarkDescription() : orderDTO.getTrademarkName()); + templateParams.put("status", getTrademarkDescription (correctionVO.getCorrectionStatus())); + TenlionSMS.sendMessage(UUIDUtil.getUUID(), "M00022", templateParams, phoneArray); } } @@ -247,6 +248,23 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec return correctionId; } + public String getTrademarkDescription(String status) { + if(status.equals("4")) { + return "不予受理"; + }else if(status.equals("5")) { + return "已受理"; + }else if(status.equals("6")) { + return "已发初审公告"; + }else if(status.equals("7")) { + return "部分驳回"; + }else if(status.equals("8")) { + return "全部驳回"; + }else if(status.equals("9")) { + return "商标注册完成"; + } + return ""; + } + public String saveAppReturnId(String token, CorrectionVO correctionVO) { AppOrderDTO orderDTO = iAppOrderService.get(correctionVO.getOrderId()); if(StringUtils.isEmpty(correctionVO.getCorrectionRemark()) && StringUtils.isEmpty(correctionVO.getCorrectionFiles())) { diff --git a/src/main/java/cn/com/tenlion/aishop/service/trademark/impl/TrademarkServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/trademark/impl/TrademarkServiceImpl.java index 0ddc35c..b3e7640 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/trademark/impl/TrademarkServiceImpl.java +++ b/src/main/java/cn/com/tenlion/aishop/service/trademark/impl/TrademarkServiceImpl.java @@ -548,6 +548,7 @@ public class TrademarkServiceImpl extends DefaultBaseService implements ITradema goodsLogVO.setGoodsId(trademarkId); goodsLogVO.setGoodslogContent(trademarkCheckVO.getCheckRemark()); iGoodslogService.save(goodsLogVO); + // 发送短信通知 JSONArray phoneArray = new JSONArray(); JSONObject obj = new JSONObject(); diff --git a/src/main/java/cn/com/tenlion/aishop/service/trademarktype/ITrademarkTypeService.java b/src/main/java/cn/com/tenlion/aishop/service/trademarktype/ITrademarkTypeService.java index 08b0b9a..fdccd66 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/trademarktype/ITrademarkTypeService.java +++ b/src/main/java/cn/com/tenlion/aishop/service/trademarktype/ITrademarkTypeService.java @@ -1,7 +1,9 @@ package cn.com.tenlion.aishop.service.trademarktype; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeZtreeDTO; +import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypesDTO; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.ZTreeDTO; +import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypesVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeDTO; @@ -192,4 +194,9 @@ public interface ITrademarkTypeService { List listReview(List trademarkTypeIds, String query); + String saveRepository(TrademarkTypesVO typesVO); + void deleteRepository(String typesId); + List listRepository(Map params); + + String updateRepository(String typesId, TrademarkTypesVO typesVO); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/aishop/service/trademarktype/impl/TrademarkTypeServiceImpl.java b/src/main/java/cn/com/tenlion/aishop/service/trademarktype/impl/TrademarkTypeServiceImpl.java index f580dcc..27d6a10 100644 --- a/src/main/java/cn/com/tenlion/aishop/service/trademarktype/impl/TrademarkTypeServiceImpl.java +++ b/src/main/java/cn/com/tenlion/aishop/service/trademarktype/impl/TrademarkTypeServiceImpl.java @@ -1,8 +1,11 @@ package cn.com.tenlion.aishop.service.trademarktype.impl; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeZtreeDTO; +import cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypesDTO; import cn.com.tenlion.aishop.pojo.dtos.trademarktype.ZTreeDTO; +import cn.com.tenlion.aishop.pojo.vos.trademarktype.TrademarkTypesVO; import ink.wgink.common.base.DefaultBaseService; +import ink.wgink.exceptions.SaveException; import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResultList; @@ -36,6 +39,59 @@ public class TrademarkTypeServiceImpl extends DefaultBaseService implements ITra @Autowired private ITrademarkTypeDao trademarkTypeDao; + + @Override + public void deleteRepository(String typesId) { + Map params2 = new HashMap<>(); + params2.put("typesId", typesId); + params2.put("userId", securityComponent.getCurrentUser().getUserId()); + trademarkTypeDao.deleteRepository(params2); + } + + @Override + public String saveRepository(TrademarkTypesVO typesVO) { + /** + * 遍历保存 + */ + String userId = securityComponent.getCurrentUser().getUserId(); + if(typesVO.getTypeList().size() < 1) { + throw new SaveException("至少需保存一个商标分类"); + } + String typesId = UUIDUtil.getUUID(); + Map params = HashMapUtil.beanToMap(typesVO); + params.put("userId", userId); + params.put("typesId", typesId); + trademarkTypeDao.saveRepository(params); + for(String s : typesVO.getTypeList()) { + Map params2 = new HashMap<>(); + params2.put("typeId", s); + params2.put("typesId", typesId); + trademarkTypeDao.saveRepositoryItem(params2); + } + return typesId; + } + + @Override + public List listRepository(Map params) { + params.put("userId", securityComponent.getCurrentUser().getUserId()); + List typesDTOS = trademarkTypeDao.listRepository(params); + for(TrademarkTypesDTO d : typesDTOS) { + List ids = trademarkTypeDao.listRepositoryItem(d.getTypesId()); + List list1 = listReview(ids, ""); + d.setTrademarkTypeDTOS(list1); + d.setTrademarkTypeIds(ids); + } + return typesDTOS; + } + + @Override + public String updateRepository(String typesId, TrademarkTypesVO typesVO) { + Map params2 = new HashMap<>(); + params2.put("typesId", typesId); + trademarkTypeDao.deleteRepository(params2); + return saveRepository(typesVO); + } + @Override public void save(TrademarkTypeVO trademarkTypeVO) { saveReturnId(trademarkTypeVO); @@ -259,7 +315,7 @@ public class TrademarkTypeServiceImpl extends DefaultBaseService implements ITra @Override public List listReview(List trademarkTypeIds, String keywords) { - if(trademarkTypeIds == null || trademarkTypeIds.size() < 1) { + if(( trademarkTypeIds == null || trademarkTypeIds.size() < 1 ) && StringUtils.isEmpty(keywords)) { return new ArrayList<>(); } Map queryParams = super.getHashMap(2); diff --git a/src/main/resources/mybatis/mapper/trademark/trademark-mapper.xml b/src/main/resources/mybatis/mapper/trademark/trademark-mapper.xml index ef63cd1..11dd2c2 100644 --- a/src/main/resources/mybatis/mapper/trademark/trademark-mapper.xml +++ b/src/main/resources/mybatis/mapper/trademark/trademark-mapper.xml @@ -484,6 +484,9 @@ AND t1.trademark_status = #{trademarkStatus} + + AND t1.check_status = #{checkStatus} + AND t1.trademark_type = #{trademarkType} diff --git a/src/main/resources/mybatis/mapper/trademarktype/trademark-type-mapper.xml b/src/main/resources/mybatis/mapper/trademarktype/trademark-type-mapper.xml index fb66084..15d99d4 100644 --- a/src/main/resources/mybatis/mapper/trademarktype/trademark-type-mapper.xml +++ b/src/main/resources/mybatis/mapper/trademarktype/trademark-type-mapper.xml @@ -11,6 +11,12 @@ + + + + + + @@ -66,6 +72,60 @@ + + + INSERT INTO shop_trademark_types_item( + types_id, + type_id + ) VALUES( + #{typesId}, + #{typeId} + ) + + + + INSERT INTO shop_trademark_types( + types_id, + types_title, + types_remark, + user_id + ) VALUES( + #{typesId}, + #{typesTitle}, + #{typesRemark}, + #{userId} + ) + + + + + + + + + DELETE t1 , t2 + FROM shop_trademark_types t1 + LEFT JOIN + shop_trademark_types_item t2 ON t1.types_id = t2.types_id + WHERE t1.types_id = #{typesId} AND t1.user_id = #{userId} + + INSERT INTO shop_trademark_type( diff --git a/src/main/resources/templates/apporder/update.html b/src/main/resources/templates/apporder/update.html index 60c257c..a78a536 100644 --- a/src/main/resources/templates/apporder/update.html +++ b/src/main/resources/templates/apporder/update.html @@ -33,8 +33,8 @@
  • 软件基本信息
  • 鉴别材料信息
  • 信息审核
    • -
  • 资料补充
    • -
  • 备案完成
    • +
  • 资料补充
    • +
  • 备案完成
    • @@ -220,11 +220,11 @@
    -
    +
    -
    +
    diff --git a/src/main/resources/templates/correction/trademark-list.html b/src/main/resources/templates/correction/trademark-list.html index 467a853..85ba783 100644 --- a/src/main/resources/templates/correction/trademark-list.html +++ b/src/main/resources/templates/correction/trademark-list.html @@ -133,7 +133,7 @@ }else{ if(correctionType.indexOf("2") != -1) { if (buyId != "") { - type = type + (type.length > 0 ? " / " : "") + "申请人已查看/b>"; + type = type + (type.length > 0 ? " / " : "") + "申请人已查看"; }else{ type = type + (type.length > 0 ? " / " : "") + "申请人待查看"; } diff --git a/src/main/resources/templates/trademark/list.html b/src/main/resources/templates/trademark/list.html index 367e17e..6f028ac 100644 --- a/src/main/resources/templates/trademark/list.html +++ b/src/main/resources/templates/trademark/list.html @@ -10,6 +10,11 @@ +
    @@ -27,6 +32,22 @@
    +
    + +
    +
    + +
    @@ -123,10 +144,13 @@ {field: 'trademarkName', width: 180, title: '商标名称', align:'center', templet: function(row) { var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; + var trademarkModeName = row["trademarkModeName"]; + var trademarkMode = row["trademarkMode"]; + if(trademarkMode == 1) { + return rowData; + }else{ + return trademarkModeName; } - return rowData; } }, {field: 'trademarkDescription', width: 250, title: '商标说明', align:'center', @@ -233,6 +257,8 @@ return "部分驳回"; }else if(rowData == "8") { return "全部驳回"; + }else if(rowData == "9") { + return "商标注册完成"; } return rowData; } @@ -424,7 +450,9 @@ where: { keywords: $('#keywords').val(), startTime: $('#startTime').val(), - endTime: $('#endTime').val() + endTime: $('#endTime').val(), + trademarkMode: $('#trademarkMode').val(), + checkStatus: $('#checkStatus').val() }, page: { curr: currentPage diff --git a/src/main/resources/templates/trademark/update.html b/src/main/resources/templates/trademark/update.html index 5b6af5c..79bb023 100644 --- a/src/main/resources/templates/trademark/update.html +++ b/src/main/resources/templates/trademark/update.html @@ -43,7 +43,7 @@
  • 商标信息
  • 商标类别
  • 申请人信息
    • -
  • 信息审核
    • +
  • 信息审核
  • 进度沟通
  • 进度记录
    • @@ -314,7 +314,7 @@
    -
    +
    @@ -684,7 +684,7 @@ callback: { onNodeCreated: function() { var treeObj = $.fn.zTree.getZTreeObj("leftTree"); - // treeObj.expandAll(true); + treeObj.expandAll(true); } } }; @@ -1028,6 +1028,8 @@ return "部分驳回"; }else if(rowData == "8") { return "全部驳回"; + }else{ + return "商标注册完成"; } return rowData; }