Tenlion/system-ai-shop
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加商标注册 , 电子软著备案

Browse Source
This commit is contained in:
1215525055@qq.com 2025-07-09 12:01:20 +08:00
parent 89bd9f0196
commit 8c190ca7fc
17 changed files with 411 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypeController.java
View File

@ -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"),

67
src/main/java/cn/com/tenlion/aishop/controller/api/trademarktype/TrademarkTypesController.java Normal file
View File

@ -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<TrademarkTypesDTO> listRepository() {
return trademarkTypeService.listRepository(new HashMap<>());
}
}

11
src/main/java/cn/com/tenlion/aishop/controller/route/apporder/AppOrderRouteController.java
View File

@ -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")

9
src/main/java/cn/com/tenlion/aishop/controller/route/trademark/TrademarkRouteController.java
View File

@ -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")

11
src/main/java/cn/com/tenlion/aishop/dao/trademarktype/ITrademarkTypeDao.java
View File

@ -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<ZTreeDTO> listZTree(Map<String, Object> params);
void saveRepository(Map<String, Object> params);
void saveRepositoryItem(Map<String, Object> params2);
void deleteRepository(Map<String, Object> params2);
List<TrademarkTypesDTO> listRepository(Map<String, Object> params);
List<String> listRepositoryItem(String typesId);
}

72
src/main/java/cn/com/tenlion/aishop/pojo/dtos/trademarktype/TrademarkTypesDTO.java Normal file
View File

@ -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<String> trademarkTypeIds;
@ApiModelProperty(name = "trademarkTypeDTOS", value = "")
private List<ZTreeDTO> trademarkTypeDTOS;
public List<ZTreeDTO> getTrademarkTypeDTOS() {
return trademarkTypeDTOS == null ? new ArrayList<>() : trademarkTypeDTOS;
}
public void setTrademarkTypeDTOS(List<ZTreeDTO> trademarkTypeDTOS) {
this.trademarkTypeDTOS = trademarkTypeDTOS;
}
public List<String> getTrademarkTypeIds() {
return trademarkTypeIds == null ? new ArrayList<>() : trademarkTypeIds;
}
public void setTrademarkTypeIds(List<String> 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;
}
}

53
src/main/java/cn/com/tenlion/aishop/pojo/vos/trademarktype/TrademarkTypesVO.java Normal file
View File

@ -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<String> 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<String> getTypeList() {
return typeList == null ? new ArrayList<>() : typeList;
}
public void setTypeList(List<String> typeList) {
this.typeList = typeList;
}
}

22
src/main/java/cn/com/tenlion/aishop/service/correction/impl/CorrectionServiceImpl.java
View File

@ -237,8 +237,9 @@ public class CorrectionServiceImpl extends DefaultBaseService implements ICorrec
phoneArray.add(obj);
Map<String, String> 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())) {

1
src/main/java/cn/com/tenlion/aishop/service/trademark/impl/TrademarkServiceImpl.java
View File

@ -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();

7
src/main/java/cn/com/tenlion/aishop/service/trademarktype/ITrademarkTypeService.java
View File

@ -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<ZTreeDTO> listReview(List<String> trademarkTypeIds, String query);
String saveRepository(TrademarkTypesVO typesVO);
void deleteRepository(String typesId);
List<TrademarkTypesDTO> listRepository(Map<String, Object> params);
String updateRepository(String typesId, TrademarkTypesVO typesVO);
}

58
src/main/java/cn/com/tenlion/aishop/service/trademarktype/impl/TrademarkTypeServiceImpl.java
View File

@ -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<String, Object> 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<String, Object> params = HashMapUtil.beanToMap(typesVO);
params.put("userId", userId);
params.put("typesId", typesId);
trademarkTypeDao.saveRepository(params);
for(String s : typesVO.getTypeList()) {
Map<String, Object> params2 = new HashMap<>();
params2.put("typeId", s);
params2.put("typesId", typesId);
trademarkTypeDao.saveRepositoryItem(params2);
}
return typesId;
}
@Override
public List<TrademarkTypesDTO> listRepository(Map<String, Object> params) {
params.put("userId", securityComponent.getCurrentUser().getUserId());
List<TrademarkTypesDTO> typesDTOS = trademarkTypeDao.listRepository(params);
for(TrademarkTypesDTO d : typesDTOS) {
List<String> ids = trademarkTypeDao.listRepositoryItem(d.getTypesId());
List<ZTreeDTO> list1 = listReview(ids, "");
d.setTrademarkTypeDTOS(list1);
d.setTrademarkTypeIds(ids);
}
return typesDTOS;
}
@Override
public String updateRepository(String typesId, TrademarkTypesVO typesVO) {
Map<String, Object> 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<ZTreeDTO> listReview(List<String> trademarkTypeIds, String keywords) {
if(trademarkTypeIds == null || trademarkTypeIds.size() < 1) {
if(( trademarkTypeIds == null || trademarkTypeIds.size() < 1 ) && StringUtils.isEmpty(keywords)) {
return new ArrayList<>();
}
Map<String, Object> queryParams = super.getHashMap(2);

3
src/main/resources/mybatis/mapper/trademark/trademark-mapper.xml
View File

@ -484,6 +484,9 @@
<if test="trademarkStatus != null and trademarkStatus != ''">
AND t1.trademark_status = #{trademarkStatus}
</if>
<if test="checkStatus != null and checkStatus != ''">
AND t1.check_status = #{checkStatus}
</if>
<if test="trademarkType != null and trademarkType != ''">
AND t1.trademark_type = #{trademarkType}
</if>

60
src/main/resources/mybatis/mapper/trademarktype/trademark-type-mapper.xml
View File

@ -11,6 +11,12 @@
<result property="price" column="trademark_type_money"/>
</resultMap>
<resultMap id="typesDTO" type="cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypesDTO">
<id property="typesId" column="types_id"/>
<result property="typesTitle" column="types_title"/>
<result property="typesRemark" column="types_remark"/>
</resultMap>
<resultMap id="trademarkTypeDTO" type="cn.com.tenlion.aishop.pojo.dtos.trademarktype.TrademarkTypeDTO">
<result column="trademark_type_id" property="trademarkTypeId"/>
<result column="trademark_type_code" property="trademarkTypeCode"/>
@ -66,6 +72,60 @@
<result column="delete_status" property="deleteStatus"/>
</resultMap>
<insert id="saveRepositoryItem" parameterType="map">
INSERT INTO shop_trademark_types_item(
types_id,
type_id
) VALUES(
#{typesId},
#{typeId}
)
</insert>
<insert id="saveRepository" parameterType="map">
INSERT INTO shop_trademark_types(
types_id,
types_title,
types_remark,
user_id
) VALUES(
#{typesId},
#{typesTitle},
#{typesRemark},
#{userId}
)
</insert>
<!-- 商标类型详情 -->
<select id="listRepository" parameterType="map" resultMap="typesDTO">
SELECT
t1.types_id,
t1.types_title,
t1.types_remark
FROM
shop_trademark_types t1
WHERE
t1.user_id = #{userId}
</select>
<select id="listRepositoryItem" parameterType="java.lang.String" resultType="java.lang.String">
SELECT
t1.type_id
FROM
shop_trademark_types_item t1
WHERE
t1.types_id = #{typesId}
</select>
<update id="deleteRepository" parameterType="map">
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}
</update>
<!-- 新增商标类型 -->
<insert id="save" parameterType="map">
INSERT INTO shop_trademark_type(

8
src/main/resources/templates/apporder/update.html
View File

@ -33,8 +33,8 @@
<li>软件基本信息</li>
<li>鉴别材料信息</li>
<li>信息审核</li>
<li>资料补充</li>
<li>备案完成</li>
<li th:if="${appOrderDTO.checkStatus == '2'}">资料补充</li>
<li th:if="${appOrderDTO.checkStatus == '2'}">备案完成</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@ -220,11 +220,11 @@
</div>
</div>
<div class="layui-tab-item">
<div class="layui-tab-item" th:if="${appOrderDTO.checkStatus == '2'}">
<iframe id="gouTong" src="route/correction/list-system?orderId={orderId}" style="border: none !important;"></iframe>
</div>
<div class="layui-tab-item">
<div class="layui-tab-item" th:if="${appOrderDTO.checkStatus == '2'}">
<div class=" layui-row " id="jieGuo" style="height: 436px">
<div class="layui-col-lg12" >
<div class="layui-input-block">

2
src/main/resources/templates/correction/trademark-list.html
View File

@ -133,7 +133,7 @@
}else{
if(correctionType.indexOf("2") != -1) {
if (buyId != "") {
type = type + (type.length > 0 ? " / " : "") + "<b style='color: green'>申请人已查看/b>";
type = type + (type.length > 0 ? " / " : "") + "<b style='color: green'>申请人已查看</b>";
}else{
type = type + (type.length > 0 ? " / " : "") + "<b style='color: red'>申请人待查看</b>";
}

36
src/main/resources/templates/trademark/list.html
View File

@ -10,6 +10,11 @@
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
<link rel="stylesheet" type="text/css" href="assets/js/vendor/viewer/viewer.min.css">
<style>
.search-item .layui-form-select .layui-input {
width: 200px!important;
}
</style>
</head>
<body>
<div class="layui-fluid layui-anim layui-anim-fadein">
@ -27,6 +32,22 @@
<div class="layui-inline">
<input type="text" id="endTime" class="layui-input search-item" placeholder="结束时间" readonly>
</div>
<div class="layui-inline layui-form search-item" >
<select id="checkStatus" name="checkStatus">
<option value="">请选择审核状态</option>
<option value="1">审核中</option>
<option value="0">未通过</option>
<option value="2">已通过</option>
</select>
</div>
<div class="layui-inline layui-form search-item" >
<select id="trademarkMode" name="trademarkMode">
<option value="">请选择注册方式</option>
<option value="1">智能申请注册</option>
<option value="2">专家辅助注册</option>
<option value="3">至尊无忧注册</option>
</select>
</div>
<button type="button" id="search" class="layui-btn layui-btn-sm">
<i class="fa fa-lg fa-search"></i> 搜索
</button>
@ -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;
}
}
},
{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

8
src/main/resources/templates/trademark/update.html
View File

@ -43,7 +43,7 @@
<li class="layui-this">商标信息</li>
<li>商标类别</li>
<li>申请人信息</li>
<li>信息审核</li>
<li th:if="${trademarkDTO.trademarkStatus == '2'}">信息审核</li>
<li>进度沟通</li>
<li>进度记录</li>
</ul>
@ -314,7 +314,7 @@
</div>
</script>
</div>
<div class="layui-tab-item" pane="">
<div class="layui-tab-item" pane="" th:if="${trademarkDTO.trademarkStatus == '2'}">
<div class=" layui-row " >
<div class="layui-col-lg6" pane="">
<div class="layui-form-item" pane="">
@ -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;
}