Commit 571f75e6 authored by 刘林's avatar 刘林

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 3a442bed 6126e6d3
...@@ -1412,6 +1412,13 @@ ...@@ -1412,6 +1412,13 @@
select sum(inUseNumber) from ( select sum(inUseNumber) from (
select count(1) as inUseNumber select count(1) as inUseNumber
from from
tzs_jg_certificate_replenish a
where a.use_registration_code = #{code}
AND a.is_delete = 0
AND a.apply_status != '6617'
UNION
select count(1) as inUseNumber
from
tzs_jg_change_registration_reform a tzs_jg_change_registration_reform a
where a.use_registration_code = #{code} where a.use_registration_code = #{code}
AND a.is_delete = 0 AND a.is_delete = 0
......
...@@ -2,31 +2,24 @@ package com.yeejoin.amos.boot.module.jg.biz.controller; ...@@ -2,31 +2,24 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.jg.api.dto.JgCertificateReplenishDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgCertificateReplenishDto;
import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateReplenish; import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateReplenish;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationManageServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import java.util.*;
import java.util.stream.Collectors;
import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl; import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.component.event.RestEventTrigger;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper; import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.springframework.beans.factory.annotation.Autowired;
import javax.servlet.http.HttpServletRequest; import java.util.List;
import java.util.Map;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl.*; import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgCertificateReplenishServiceImpl.*;
...@@ -52,6 +45,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -52,6 +45,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/queryEquByCertificateSeqList") @GetMapping(value = "/queryEquByCertificateSeqList")
@ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备") @ApiOperation(httpMethod = "GET", value = "根据证的sequenceNbr 批量查询证下面的所有设备", notes = "根据证的sequenceNbr 批量查询证下面的所有设备")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Map<String, Object>> queryEquByCertificateSeqList(@RequestParam(value = "record") String sequenceNbr) { public ResponseModel<Map<String, Object>> queryEquByCertificateSeqList(@RequestParam(value = "record") String sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryEquByCertSeq(sequenceNbr)); return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryEquByCertSeq(sequenceNbr));
} }
...@@ -64,6 +58,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -64,6 +58,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save") @PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增") @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<List<JgCertificateReplenish>> save(@RequestBody JSONObject jsonObject) { public ResponseModel<List<JgCertificateReplenish>> save(@RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.save(jsonObject)); return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.save(jsonObject));
} }
...@@ -74,6 +69,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -74,6 +69,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/update") @PostMapping(value = "/update")
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新补证登记单", notes = "根据sequenceNbr更新补证登记单") @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr更新补证登记单", notes = "根据sequenceNbr更新补证登记单")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType, public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType,
@RequestBody JSONObject jsonObject) { @RequestBody JSONObject jsonObject) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.updateCertRep("0".equals(submitType) ? UPDDATE_NOT_SUBMIT : UPDDATE_SUBMIT, jsonObject)); return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.updateCertRep("0".equals(submitType) ? UPDDATE_NOT_SUBMIT : UPDDATE_SUBMIT, jsonObject));
...@@ -85,6 +81,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -85,6 +81,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/accept") @PostMapping(value = "/accept")
@ApiOperation(httpMethod = "POST", value = "补证登记受理", notes = "补证登记受理") @ApiOperation(httpMethod = "POST", value = "补证登记受理", notes = "补证登记受理")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JgEquipTransferDto> accept(@RequestParam(value = "operate") String operate, @RequestBody Map<String, Object> map) { public ResponseModel<JgEquipTransferDto> accept(@RequestParam(value = "operate") String operate, @RequestBody Map<String, Object> map) {
JSONObject model = JSON.parseObject(JSON.toJSONString(map.get(MODEL))); JSONObject model = JSON.parseObject(JSON.toJSONString(map.get(MODEL)));
model.put(PROCESS_ADVICE, map.get(PROCESS_ADVICE)); model.put(PROCESS_ADVICE, map.get(PROCESS_ADVICE));
...@@ -102,6 +99,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -102,6 +99,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page") @GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询") @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Page<JgCertificateReplenish>> queryForPage(JgCertificateReplenishDto dto, public ResponseModel<Page<JgCertificateReplenish>> queryForPage(JgCertificateReplenishDto dto,
@RequestParam(value = "current") int current, @RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) { @RequestParam(value = "size") int size) {
...@@ -119,6 +117,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -119,6 +117,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/cancel") @PostMapping(value = "/cancel")
@ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回") @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<JgCertificateReplenishDto> cancel(@RequestBody JgCertificateReplenishDto dto) { public ResponseModel<JgCertificateReplenishDto> cancel(@RequestBody JgCertificateReplenishDto dto) {
jgCertificateReplenishServiceImpl.cancel(dto); jgCertificateReplenishServiceImpl.cancel(dto);
return ResponseHelper.buildResponse(null); return ResponseHelper.buildResponse(null);
...@@ -133,6 +132,7 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -133,6 +132,7 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/details") @GetMapping(value = "/details")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单据", notes = "根据sequenceNbr查询单据") @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单据", notes = "根据sequenceNbr查询单据")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) { public ResponseModel<Map<String, Object>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySequenceNbr(sequenceNbr)); return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySequenceNbr(sequenceNbr));
} }
...@@ -146,34 +146,17 @@ public class JgCertificateReplenishController extends BaseController { ...@@ -146,34 +146,17 @@ public class JgCertificateReplenishController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}") @DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除") @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
@RestEventTrigger(value = "operateLogRestEventHandler")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) { public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeCertRepBySequenceNbr(sequenceNbr)); return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.removeCertRepBySequenceNbr(sequenceNbr));
} }
//
// /**
// * 根据sequenceNbr查询
// *
// * @param sequenceNbr 主键
// * @return
// */
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// @GetMapping(value = "/{sequenceNbr}")
// @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
// public ResponseModel<JgCertificateReplenish> selectOne(@PathVariable Long sequenceNbr) {
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryBySeq(sequenceNbr));
// }
//
// @TycloudOperation(ApiLevel = UserType.AGENCY)
// /** @ApiOperation(httpMethod = "PUT", value = "补证登记作废", notes = "补证登记作废")
// * 列表全部数据查询 @PutMapping(value = "/void")
// * @RestEventTrigger(value = "operateLogRestEventHandler")
// * @return public ResponseModel<JgCertificateReplenish> voidApplication(@RequestBody JgCertificateReplenishDto certDto) {
// */ JgCertificateReplenish result = jgCertificateReplenishServiceImpl.voidApplication(certDto.getSequenceNbr(), certDto.getCancelReason());
// @TycloudOperation(ApiLevel = UserType.AGENCY) return ResponseHelper.buildResponse(result);
// @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询") }
// @GetMapping(value = "/list")
// public ResponseModel<List<JgCertificateReplenish>> selectForList() {
// return ResponseHelper.buildResponse(jgCertificateReplenishServiceImpl.queryForJgCertificateReplenishList());
// }
} }
...@@ -959,4 +959,47 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate ...@@ -959,4 +959,47 @@ public class JgCertificateReplenishServiceImpl extends BaseService<JgCertificate
jgRegistrationHistoryService.getBaseMapper().update(null, new LambdaUpdateWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).set(JgRegistrationHistory::getIsDelete, true)); jgRegistrationHistoryService.getBaseMapper().update(null, new LambdaUpdateWrapper<JgRegistrationHistory>().eq(JgRegistrationHistory::getCurrentDocumentId, sequenceNbr).set(JgRegistrationHistory::getIsDelete, true));
return Boolean.TRUE; return Boolean.TRUE;
} }
@GlobalTransactional(rollbackFor = Exception.class)
public JgCertificateReplenish voidApplication(Long sequenceNbr, String cancelReason) {
JgCertificateReplenish certRep = this.baseMapper.selectById(sequenceNbr);
String oldApplyStatus = certRep.getApplyStatus();
certRep.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
certRep.setCancelReason(cancelReason);
certRep.setCancelDate(new Date());
certRep.setCancelUserId(RequestContext.getExeUserId());
certRep.setNextExecuteUserIds(null);
certRep.setPromoter(null);
this.updateById(certRep);
this.processElseDataByStatus(Objects.requireNonNull(FlowStatusEnum.getEumByCode(Integer.parseInt(oldApplyStatus))), certRep);
return certRep;
}
private void processElseDataByStatus(FlowStatusEnum oldApplyStatus, JgCertificateReplenish certRep) {
switch (oldApplyStatus) {
// 待提交
case TO_BE_SUBMITTED:
// 删除暂存时生成的待办
commonService.deleteTaskModel(certRep.getSequenceNbr() + "", certRep.getInstanceId());
break;
// 已完成
case TO_BE_FINISHED:
// 1.删除写入到证管理表的补证日期
this.deleteCertManageReissueDate(certRep);
break;
// 流程中(驳回、撤回等)
default:
// 删除待办
commonService.deleteTaskModel(certRep.getSequenceNbr() + "", certRep.getInstanceId());
// 清空redis
this.delRepeatUseEquipData(certRep.getSequenceNbr(), certRep.getApplyStatus(), certRep.getUseUnitCode());
}
}
private void deleteCertManageReissueDate(JgCertificateReplenish certRep) {
registrationManageService.update(new LambdaUpdateWrapper<JgUseRegistrationManage>()
.eq(JgUseRegistrationManage::getUseRegistrationCode, certRep.getUseRegistrationCode())
.set(JgUseRegistrationManage::getReissueDate, null));
}
} }
\ No newline at end of file
...@@ -189,10 +189,6 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp ...@@ -189,10 +189,6 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
return this.baseMapper.alreadyExist(value) > 0; return this.baseMapper.alreadyExist(value) > 0;
} }
public static void main(String[] args) {
System.out.println(Boolean.parseBoolean("false"));
}
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean claim(String claimOneself, Map<String, Object> paramMap) { public Boolean claim(String claimOneself, Map<String, Object> paramMap) {
......
...@@ -40,24 +40,13 @@ ...@@ -40,24 +40,13 @@
<pkg:part pkg:name="/word/document.xml" <pkg:part pkg:name="/word/document.xml"
pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml"> pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml">
<pkg:xmlData> <pkg:xmlData>
<w:document xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" <w:document
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"
xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
xmlns:w10="urn:schemas-microsoft-com:office:word" mc:Ignorable="w14 w15 wp14">
xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml"
xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"
xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk"
xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml"
xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape"
xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData"
mc:Ignorable="w14 w15 wp14">
<w:body> <w:body>
<w:p w14:paraId="05B1A808"> <w:p w14:paraId="05B1A808">
<w:pPr> <w:pPr>
...@@ -95,29 +84,34 @@ ...@@ -95,29 +84,34 @@
<w:spacing w:line="600" w:lineRule="exact"/> <w:spacing w:line="600" w:lineRule="exact"/>
<w:ind w:firstLine="420"/> <w:ind w:firstLine="420"/>
<w:rPr> <w:rPr>
<w:rFonts w:ascii="仿宋_GB2312" w:hAnsi="宋体" w:eastAsia="仿宋_GB2312"/> <w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体"
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:kern w:val="2"/>
<w:sz w:val="21"/>
<w:szCs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar-SA"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:hAnsi="宋体"/> <w:rFonts w:hint="eastAsia" w:hAnsi="宋体"/>
</w:rPr> </w:rPr>
<w:t xml:space="preserve"> </w:t> <w:t xml:space="preserve"> </w:t>
</w:r> </w:r>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体"
w:eastAsia="仿宋_GB2312"/> w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
</w:rPr> <w:bCs/>
<w:t>编号:</w:t> <w:spacing w:val="-10"/>
</w:r> <w:kern w:val="2"/>
<w:r> <w:sz w:val="21"/>
<w:rPr> <w:szCs w:val="21"/>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:lang w:val="en-US" w:eastAsia="zh-CN" w:bidi="ar-SA"/>
w:eastAsia="仿宋_GB2312"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr> </w:rPr>
<w:t>${(applyNo)!''}</w:t> <w:t xml:space="preserve"> 编号:${(applyNo)!''}</w:t>
</w:r> </w:r>
</w:p> </w:p>
<w:tbl> <w:tbl>
...@@ -354,16 +348,18 @@ ...@@ -354,16 +348,18 @@
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312"/>
<w:sz w:val="28"/>
<w:szCs w:val="28"/>
<w:lang w:eastAsia="zh-CN"/>
</w:rPr>
<#if applicationReason == '0'> <#if applicationReason == '0'>
<w:t></w:t> <w:rPr>
<#else> <w:rFonts w:hint="default" w:ascii="Wingdings" w:hAnsi="Wingdings" w:cs="Wingdings"/>
<w:t></w:t> </w:rPr>
<w:sym w:font="Wingdings" w:char="00FE"/>
</#if>
<#if applicationReason == '1'>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="Wingdings" w:hAnsi="Wingdings" w:cs="Wingdings"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:sym w:font="Wingdings" w:char="00A8"/>
</#if> </#if>
</w:r> </w:r>
<w:r> <w:r>
...@@ -375,16 +371,18 @@ ...@@ -375,16 +371,18 @@
<w:t xml:space="preserve">遗失 </w:t> <w:t xml:space="preserve">遗失 </w:t>
</w:r> </w:r>
<w:r> <w:r>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312"/>
<w:sz w:val="28"/>
<w:szCs w:val="28"/>
<w:lang w:eastAsia="zh-CN"/>
</w:rPr>
<#if applicationReason == '1'> <#if applicationReason == '1'>
<w:t></w:t> <w:rPr>
<#else> <w:rFonts w:hint="default" w:ascii="Wingdings" w:hAnsi="Wingdings" w:cs="Wingdings"/>
<w:t></w:t> </w:rPr>
<w:sym w:font="Wingdings" w:char="00FE"/>
</#if>
<#if applicationReason == '0'>
<w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="Wingdings" w:hAnsi="Wingdings" w:cs="Wingdings"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr>
<w:sym w:font="Wingdings" w:char="00A8"/>
</#if> </#if>
</w:r> </w:r>
<w:r> <w:r>
...@@ -578,20 +576,20 @@ ...@@ -578,20 +576,20 @@
<w:spacing w:line="520" w:lineRule="exact"/> <w:spacing w:line="520" w:lineRule="exact"/>
<w:jc w:val="center"/> <w:jc w:val="center"/>
<w:rPr> <w:rPr>
<w:rFonts w:hint="default" w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312"/> <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="28"/> <w:sz w:val="21"/>
<w:szCs w:val="28"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312"/> <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
<w:sz w:val="28"/> <w:sz w:val="21"/>
<w:szCs w:val="28"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
<w:t>${(safetyManagerPhone)!''}</w:t> <w:t><w:t>${(safetyManagerPhone)!''}</w:t></w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -764,7 +762,7 @@ ...@@ -764,7 +762,7 @@
</w:tblCellMar> </w:tblCellMar>
</w:tblPrEx> </w:tblPrEx>
<w:trPr> <w:trPr>
<w:trHeight w:val="681" w:hRule="atLeast"/> <w:trHeight w:val="681" w:hRule="exact"/>
</w:trPr> </w:trPr>
<w:tc> <w:tc>
<w:tcPr> <w:tcPr>
...@@ -782,8 +780,7 @@ ...@@ -782,8 +780,7 @@
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" <w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:eastAsia="仿宋_GB2312"/>
w:eastAsia="仿宋_GB2312"/>
<w:sz w:val="24"/> <w:sz w:val="24"/>
</w:rPr> </w:rPr>
<w:t>${(equLists.index)!''}</w:t> <w:t>${(equLists.index)!''}</w:t>
...@@ -801,24 +798,18 @@ ...@@ -801,24 +798,18 @@
<w:snapToGrid w:val="0"/> <w:snapToGrid w:val="0"/>
<w:jc w:val="center"/> <w:jc w:val="center"/>
<w:rPr> <w:rPr>
<w:rFonts w:hint="default" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
<w:t>${(equLists.productName)!''}</w:t> <w:t>${(equLists.productName)!''}</w:t>
</w:r> </w:r>
...@@ -835,24 +826,18 @@ ...@@ -835,24 +826,18 @@
<w:snapToGrid w:val="0"/> <w:snapToGrid w:val="0"/>
<w:jc w:val="center"/> <w:jc w:val="center"/>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
<w:t>${(equLists.equCode)!''}</w:t> <w:t>${(equLists.equCode)!''}</w:t>
</w:r> </w:r>
...@@ -869,24 +854,18 @@ ...@@ -869,24 +854,18 @@
<w:snapToGrid w:val="0"/> <w:snapToGrid w:val="0"/>
<w:jc w:val="center"/> <w:jc w:val="center"/>
<w:rPr> <w:rPr>
<w:rFonts w:hint="default" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
<w:t>${(equLists.useRegistrationCode)!''}</w:t> <w:t>${(equLists.useRegistrationCode)!''}</w:t>
</w:r> </w:r>
...@@ -903,24 +882,18 @@ ...@@ -903,24 +882,18 @@
<w:snapToGrid w:val="0"/> <w:snapToGrid w:val="0"/>
<w:jc w:val="center"/> <w:jc w:val="center"/>
<w:rPr> <w:rPr>
<w:rFonts w:hint="default" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
</w:pPr> </w:pPr>
<w:r> <w:r>
<w:rPr> <w:rPr>
<w:rFonts w:hint="eastAsia" w:ascii="仿宋_GB2312" w:hAnsi="宋体" <w:rFonts w:ascii="黑体" w:h-ansi="黑体" w:fareast="黑体" w:cs="黑体" w:hint="fareast"/>
w:eastAsia="仿宋_GB2312" w:cs="宋体"/>
<w:bCs/>
<w:spacing w:val="-10"/>
<w:sz w:val="21"/> <w:sz w:val="21"/>
<w:szCs w:val="21"/> <w:sz-cs w:val="21"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="EN-US" w:fareast="ZH-CN"/>
</w:rPr> </w:rPr>
<w:t>${(equLists.factoryNum)!''}</w:t> <w:t>${(equLists.factoryNum)!''}</w:t>
</w:r> </w:r>
...@@ -1051,7 +1024,7 @@ ...@@ -1051,7 +1024,7 @@
<w:szCs w:val="28"/> <w:szCs w:val="28"/>
<w:lang w:val="en-US" w:eastAsia="zh-CN"/> <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
</w:rPr> </w:rPr>
<w:t>${(applicationDateYear)!''}</w:t> <w:t>${(applicationDateYear?string("####"))!''}</w:t>
</w:r> </w:r>
<w:r> <w:r>
<w:rPr> <w:rPr>
...@@ -1241,7 +1214,6 @@ ...@@ -1241,7 +1214,6 @@
<pkg:xmlData> <pkg:xmlData>
<cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties"
xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/"
xmlns:dcmitype="http://purl.org/dc/dcmitype/"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<dcterms:created xsi:type="dcterms:W3CDTF">2021-09-23T07:36:00Z</dcterms:created> <dcterms:created xsi:type="dcterms:W3CDTF">2021-09-23T07:36:00Z</dcterms:created>
<dc:creator>User</dc:creator> <dc:creator>User</dc:creator>
...@@ -10958,14 +10930,11 @@ ...@@ -10958,14 +10930,11 @@
pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml"> pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml">
<pkg:xmlData> <pkg:xmlData>
<w:settings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" <w:settings xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w10="urn:schemas-microsoft-com:office:word"
xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main" mc:Ignorable="w14">
xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14">
<w:zoom w:percent="107"/> <w:zoom w:percent="107"/>
<w:embedTrueTypeFonts/> <w:embedTrueTypeFonts/>
<w:saveSubsetFonts/> <w:saveSubsetFonts/>
...@@ -11093,15 +11062,11 @@ ...@@ -11093,15 +11062,11 @@
pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml"> pkg:contentType="application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml">
<pkg:xmlData> <pkg:xmlData>
<w:styles xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" <w:styles xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"
xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math"
xmlns:v="urn:schemas-microsoft-com:vml"
xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml"
xmlns:w10="urn:schemas-microsoft-com:office:word" mc:Ignorable="w14">
xmlns:sl="http://schemas.openxmlformats.org/schemaLibrary/2006/main"
xmlns:wpsCustomData="http://www.wps.cn/officeDocument/2013/wpsCustomData" mc:Ignorable="w14">
<w:docDefaults> <w:docDefaults>
<w:rPrDefault> <w:rPrDefault>
<w:rPr> <w:rPr>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment