From 58e64f8891b8c07c135675b9029065f703984a7b Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期四, 24 二月 2022 11:09:08 +0800 Subject: [PATCH] # --- src/main/java/com/zy/sc/manager/service/impl/IssueServiceImpl.java | 12 src/main/java/com/zy/sc/manager/controller/IssueTypeController.java | 1 src/main/webapp/views/issue/issue.html | 224 +++++++++ src/main/java/com/zy/sc/manager/mapper/IssueMapper.java | 12 src/main/java/com/zy/sc/manager/service/IssueService.java | 8 src/main/resources/mapper/IssueMapper.xml | 32 + src/main/java/com/zy/sc/common/CodeBuilder.java | 3 src/main/webapp/static/js/issue/issue.js | 280 +++++++++++ src/main/java/com/zy/sc/manager/controller/IssueController.java | 123 +++++ src/main/java/com/zy/sc/manager/entity/Issue.java | 511 +++++++++++++++++++++ src/main/java/com/zy/sc/manager/controller/AppController.java | 164 ++++++ src/main/webapp/views/issueType/issueType.html | 20 12 files changed, 1,378 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/sc/common/CodeBuilder.java b/src/main/java/com/zy/sc/common/CodeBuilder.java index 799decf..aa78d4b 100644 --- a/src/main/java/com/zy/sc/common/CodeBuilder.java +++ b/src/main/java/com/zy/sc/common/CodeBuilder.java @@ -15,8 +15,7 @@ generator.url="47.97.1.152:51433;databasename=zypms"; generator.username="sa"; generator.password="Zoneyung@zy56$"; - generator.table="man_issue_type"; - + generator.table="man_issue"; // ------------------------------------------------------- generator.packagePath="com.zy.sc.manager"; // generator.js = false; diff --git a/src/main/java/com/zy/sc/manager/controller/AppController.java b/src/main/java/com/zy/sc/manager/controller/AppController.java new file mode 100644 index 0000000..b4d6ab1 --- /dev/null +++ b/src/main/java/com/zy/sc/manager/controller/AppController.java @@ -0,0 +1,164 @@ +package com.zy.sc.manager.controller; + +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.core.annotations.ManagerAuth; +import com.core.common.R; +import com.zy.sc.common.service.GeoService; +import com.zy.sc.common.web.BaseController; +import com.zy.sc.manager.entity.IssueType; +import com.zy.sc.manager.service.IssueTypeService; +import com.zy.sc.system.entity.Host; +import com.zy.sc.system.service.HostService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * Created by vincent on 2021/12/20 + */ +@Slf4j +@RestController +@RequestMapping("app") +public class AppController extends BaseController { + + @Autowired + private HostService hostService; + @Autowired + private IssueTypeService issueTypeService; + @Autowired + private GeoService geoService; + + @RequestMapping("/host/list/auth") + @ManagerAuth + public R hostList(){ + Long hostId = getHostId(); + Wrapper<Host> wrapper = new EntityWrapper<Host>().orderBy("id"); + if (hostId != null) { + wrapper.eq("id", hostId); + } + List<Host> hostList = hostService.selectList(wrapper); + return R.ok().add(hostList); + } + + @RequestMapping("/issue/type/auth") + public R issueType(){ + List<IssueType> issueTypes = issueTypeService.selectList(new EntityWrapper<IssueType>().orderBy("id")); + return R.ok().add(issueTypes); + } + +// @RequestMapping("/sensor/save/auth") +// @ManagerAuth(memo = "绉诲姩绔坊鍔犺澶�") +// public R issueSave(MobileSensorParam param){ +// Long hostId = getHostId(); +// if (hostId == null) { +// return R.error("璇蜂娇鐢ㄦ纭处鍙风櫥褰�"); +// } +// if (Cools.isEmpty(param.getUuid())) { +// return R.error("璇峰~鍐欒澶囩紪鍙�"); +// } +// if (Cools.isEmpty(param.getSensorType())) { +// return R.error("璇烽�夋嫨璁惧绫诲瀷"); +// } +// SensorType sensorType = sensorTypeService.selectById(param.getSensorType()); +// if (sensorType == null) { +// return R.error("璇烽�夋嫨姝g‘鐨勮澶囩被鍨�"); +// } +// Sensor sensor = sensorService.selectByCode(param.getUuid()); +// if (sensor != null) { +// return R.error("璁惧缂栧彿宸插瓨鍦紝璇疯仈绯荤鐞嗗憳"); +// } else { +// sensor = new Sensor(); +// } +// Date now = new Date(); +// sensor.setUuid(param.getUuid()); +// sensor.setHostId(hostId); +// sensor.setSensorType(param.getSensorType()); +// sensor.setCcid(param.getCcid()); +// sensor.setAddr(param.getAddr()); +// sensor.setDesc(param.getDesc()); +// sensor.setThreshold(String.valueOf(param.getThreshold())); +// List<String> imgArr = param.getImgArr(); +// if (!Cools.isEmpty(imgArr)) { +// sensor.setImg(JSONArray.toJSONString(imgArr)); +// } +// if (!Cools.isEmpty(param.getLocationObj())) { +// LocationObj locationObj = JSON.parseObject(param.getLocationObj(), LocationObj.class); +// sensor.setLon(Double.parseDouble(locationObj.getLongitude())); +// sensor.setLat(Double.parseDouble(locationObj.getLatitude())); +// GeoCodeDto geoCode = geoService.getGeoCode(sensor.getLon(), sensor.getLat()); +// if (geoCode != null && geoCode.getAddressComponent() != null) { +// sensor.setProvince(geoCode.getAddressComponent().getProvince()); +// sensor.setCity(geoCode.getAddressComponent().getCity()); +// sensor.setDistrict(geoCode.getAddressComponent().getDistrict()); +// sensor.setTownship(geoCode.getAddressComponent().getTownship()); +// } +// } +// sensor.setStatus(1); +// sensor.setCreateBy(getUserId()); +// sensor.setCreateTime(now); +// sensor.setUpdateBy(getUserId()); +// sensor.setUpdateTime(now); +// sensor.setMemo(param.getMemo()); +// if (!sensorService.insert(sensor)) { +// throw new CoolException("娣诲姞澶辫触锛岃鑱旂郴绠$悊鍛�"); +// } +// return R.ok("娣诲姞璁惧鎴愬姛"); +// } +// +// @RequestMapping("/sensor/list/auth") +// @ManagerAuth +// public R sensorList(@RequestParam(required = false) String condition){ +// Wrapper<Sensor> wrapper = new EntityWrapper<Sensor>() +// .like("uuid", condition) +// .orderBy("sensor_type").orderBy("create_time"); +// Long hostId = getHostId(); +// if (hostId != null) { +// wrapper.eq("host_id", hostId); +// } +// List<Sensor> sensors = sensorService.selectList(wrapper); +// List<AppSensorTypeVo> result = new ArrayList<>(); +// Set<Long> sensorTypeSet = new HashSet<>(); +// for (Sensor sensor : sensors) { +// AppSensorVo sensorVo = new AppSensorVo(); +// sensorVo.setSensorId(sensor.getId()); +// sensorVo.setUuid(sensor.getUuid()); +// String addr = sensor.getProvince()+sensor.getCity()+sensor.getDistrict(); +//// String addr = sensor.getProvince()+","+sensor.getCity()+","+sensor.getDistrict(); +// if (Cools.isEmpty(addr)) { +// addr = "鏈煡瀹氫綅"; +// } +// sensorVo.setAddr(addr); +// +// if (!sensorTypeSet.contains(sensor.getSensorType())) { +// sensorTypeSet.add(sensor.getSensorType()); +// SensorType sensorType = sensorTypeService.selectById(sensor.getSensorType()); +// AppSensorTypeVo vo = new AppSensorTypeVo(); +// vo.setSensorTypeFlag(sensorType.getFlag()); +// vo.setSensorTypeId(sensor.getSensorType()); +// vo.setSensorTypeName(sensorType.getName()); +// result.add(vo); +// vo.getSensors().add(sensorVo); +// } else { +// for (AppSensorTypeVo vo : result) { +// if (vo.getSensorTypeId().equals(sensor.getSensorType())) { +// vo.getSensors().add(sensorVo); +// } +// } +// } +// } +// return R.ok().add(result); +// } +// +// @RequestMapping("/sensor/detl/auth") +// @ManagerAuth +// public R sensorDetl(@RequestParam Long sensorId){ +// return R.ok().add(sensorService.selectById(sensorId)); +// } + + + +} diff --git a/src/main/java/com/zy/sc/manager/controller/IssueController.java b/src/main/java/com/zy/sc/manager/controller/IssueController.java new file mode 100644 index 0000000..f2a0db8 --- /dev/null +++ b/src/main/java/com/zy/sc/manager/controller/IssueController.java @@ -0,0 +1,123 @@ +package com.zy.sc.manager.controller; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.mapper.Wrapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.core.common.DateUtils; +import com.zy.sc.manager.entity.Issue; +import com.zy.sc.manager.service.IssueService; +import com.core.annotations.ManagerAuth; +import com.core.common.BaseRes; +import com.core.common.Cools; +import com.core.common.R; +import com.zy.sc.common.web.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.*; + +@RestController +public class IssueController extends BaseController { + + @Autowired + private IssueService issueService; + + @RequestMapping(value = "/issue/{id}/auth") + @ManagerAuth + public R get(@PathVariable("id") String id) { + return R.ok(issueService.selectById(String.valueOf(id))); + } + + @RequestMapping(value = "/issue/list/auth") + @ManagerAuth + public R list(@RequestParam(defaultValue = "1")Integer curr, + @RequestParam(defaultValue = "10")Integer limit, + @RequestParam(required = false)String orderByField, + @RequestParam(required = false)String orderByType, + @RequestParam Map<String, Object> param){ + EntityWrapper<Issue> wrapper = new EntityWrapper<>(); + excludeTrash(param); + convert(param, wrapper); + if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} + return R.ok(issueService.selectPage(new Page<>(curr, limit), wrapper)); + } + + private void convert(Map<String, Object> map, EntityWrapper wrapper){ + for (Map.Entry<String, Object> entry : map.entrySet()){ + String val = String.valueOf(entry.getValue()); + if (val.contains(RANGE_TIME_LINK)){ + String[] dates = val.split(RANGE_TIME_LINK); + wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); + wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); + } else { + wrapper.like(entry.getKey(), val); + } + } + } + + @RequestMapping(value = "/issue/add/auth") + @ManagerAuth + public R add(Issue issue) { + issueService.insert(issue); + return R.ok(); + } + + @RequestMapping(value = "/issue/update/auth") + @ManagerAuth + public R update(Issue issue){ + if (Cools.isEmpty(issue) || null==issue.getId()){ + return R.error(); + } + issueService.updateById(issue); + return R.ok(); + } + + @RequestMapping(value = "/issue/delete/auth") + @ManagerAuth + public R delete(@RequestParam(value="ids[]") Long[] ids){ + for (Long id : ids){ + issueService.deleteById(id); + } + return R.ok(); + } + + @RequestMapping(value = "/issue/export/auth") + @ManagerAuth + public R export(@RequestBody JSONObject param){ + EntityWrapper<Issue> wrapper = new EntityWrapper<>(); + List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); + Map<String, Object> map = excludeTrash(param.getJSONObject("issue")); + convert(map, wrapper); + List<Issue> list = issueService.selectList(wrapper); + return R.ok(exportSupport(list, fields)); + } + + @RequestMapping(value = "/issueQuery/auth") + @ManagerAuth + public R query(String condition) { + EntityWrapper<Issue> wrapper = new EntityWrapper<>(); + wrapper.like("id", condition); + Page<Issue> page = issueService.selectPage(new Page<>(0, 10), wrapper); + List<Map<String, Object>> result = new ArrayList<>(); + for (Issue issue : page.getRecords()){ + Map<String, Object> map = new HashMap<>(); + map.put("id", issue.getId()); + map.put("value", issue.getId()); + result.add(map); + } + return R.ok(result); + } + + @RequestMapping(value = "/issue/check/column/auth") + @ManagerAuth + public R query(@RequestBody JSONObject param) { + Wrapper<Issue> wrapper = new EntityWrapper<Issue>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); + if (null != issueService.selectOne(wrapper)){ + return R.parse(BaseRes.REPEAT).add(getComment(Issue.class, String.valueOf(param.get("key")))); + } + return R.ok(); + } + +} diff --git a/src/main/java/com/zy/sc/manager/controller/IssueTypeController.java b/src/main/java/com/zy/sc/manager/controller/IssueTypeController.java index e0db045..bd04cb0 100644 --- a/src/main/java/com/zy/sc/manager/controller/IssueTypeController.java +++ b/src/main/java/com/zy/sc/manager/controller/IssueTypeController.java @@ -59,6 +59,7 @@ @RequestMapping(value = "/issueType/add/auth") @ManagerAuth public R add(IssueType issueType) { + issueType.setStatus(1); issueType.setCreateBy(getUserId()); issueType.setCreateTime(new Date()); issueType.setUpdateBy(getUserId()); diff --git a/src/main/java/com/zy/sc/manager/entity/Issue.java b/src/main/java/com/zy/sc/manager/entity/Issue.java new file mode 100644 index 0000000..8a55605 --- /dev/null +++ b/src/main/java/com/zy/sc/manager/entity/Issue.java @@ -0,0 +1,511 @@ +package com.zy.sc.manager.entity; + +import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import com.core.common.SpringUtils; +import com.zy.sc.system.service.HostService; +import com.zy.sc.system.entity.Host; +import com.baomidou.mybatisplus.annotations.TableField; +import io.swagger.annotations.ApiModelProperty; +import com.core.common.SpringUtils; +import com.zy.sc.manager.service.IssueTypeService; +import com.zy.sc.manager.entity.IssueType; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import java.text.SimpleDateFormat; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import org.springframework.format.annotation.DateTimeFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import java.text.SimpleDateFormat; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import com.core.common.SpringUtils; +import com.zy.sc.system.service.UserService; +import com.zy.sc.system.entity.User; +import java.text.SimpleDateFormat; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; +import com.core.common.SpringUtils; +import com.zy.sc.system.service.UserService; +import com.zy.sc.system.entity.User; +import java.text.SimpleDateFormat; +import java.util.Date; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiModelProperty; + +import com.baomidou.mybatisplus.annotations.TableName; +import java.io.Serializable; + +@TableName("man_issue") +public class Issue implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ApiModelProperty(value= "ID") + private Long id; + + /** + * 鏁呴殰缂栧彿 + */ + @ApiModelProperty(value= "鏁呴殰缂栧彿") + private String uuid; + + /** + * 鎵�灞為」鐩� + */ + @ApiModelProperty(value= "鎵�灞為」鐩�") + @TableField("host_id") + private Long hostId; + + /** + * 鏁呴殰绫诲瀷 + */ + @ApiModelProperty(value= "鏁呴殰绫诲瀷") + @TableField("issue_type") + private Long issueType; + + /** + * 闂姒傝堪 + */ + @ApiModelProperty(value= "闂姒傝堪") + private String title; + + /** + * 鏁呴殰鍘熷洜 + */ + @ApiModelProperty(value= "鏁呴殰鍘熷洜") + private String reason; + + /** + * 瑙e喅鍔炴硶 + */ + @ApiModelProperty(value= "瑙e喅鍔炴硶") + private String deal; + + /** + * 鏂囦欢鍒楄〃 + */ + @ApiModelProperty(value= "鏂囦欢鍒楄〃") + private String files; + + /** + * 鍥剧墖 + */ + @ApiModelProperty(value= "鍥剧墖") + private String img; + + /** + * 鍙戠敓鏃ユ湡 + */ + @ApiModelProperty(value= "鍙戠敓鏃ユ湡") + @TableField("start_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date startTime; + + /** + * 澶勭悊鏃ユ湡 + */ + @ApiModelProperty(value= "澶勭悊鏃ユ湡") + @TableField("end_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date endTime; + + /** + * 鏇存柊鏃ユ湡 + */ + @ApiModelProperty(value= "鏇存柊鏃ユ湡") + @TableField("last_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date lastTime; + + /** + * 鍙戠幇浜� + */ + @ApiModelProperty(value= "鍙戠幇浜�") + private String discoverer; + + /** + * 鑱旂郴鏂瑰紡 + */ + @ApiModelProperty(value= "鑱旂郴鏂瑰紡") + private String tel; + + /** + * 渚涘簲鍟� + */ + @ApiModelProperty(value= "渚涘簲鍟�") + private String dealer; + + @ApiModelProperty(value= "") + private Integer settle; + + /** + * 鐘舵�� 1: 姝e父 0: 绂佺敤 + */ + @ApiModelProperty(value= "鐘舵�� 1: 姝e父 0: 绂佺敤 ") + private Integer status; + + /** + * 娣诲姞浜哄憳 + */ + @ApiModelProperty(value= "娣诲姞浜哄憳") + @TableField("create_by") + private Long createBy; + + /** + * 娣诲姞鏃堕棿 + */ + @ApiModelProperty(value= "娣诲姞鏃堕棿") + @TableField("create_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 淇敼浜哄憳 + */ + @ApiModelProperty(value= "淇敼浜哄憳") + @TableField("update_by") + private Long updateBy; + + /** + * 淇敼鏃堕棿 + */ + @ApiModelProperty(value= "淇敼鏃堕棿") + @TableField("update_time") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; + + public Issue() {} + + public Issue(String uuid,Long hostId,Long issueType,String title,String reason,String deal,String files,String img,Date startTime,Date endTime,Date lastTime,String discoverer,String tel,String dealer,Integer settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) { + this.uuid = uuid; + this.hostId = hostId; + this.issueType = issueType; + this.title = title; + this.reason = reason; + this.deal = deal; + this.files = files; + this.img = img; + this.startTime = startTime; + this.endTime = endTime; + this.lastTime = lastTime; + this.discoverer = discoverer; + this.tel = tel; + this.dealer = dealer; + this.settle = settle; + this.status = status; + this.createBy = createBy; + this.createTime = createTime; + this.updateBy = updateBy; + this.updateTime = updateTime; + this.memo = memo; + } + +// Issue issue = new Issue( +// null, // 鏁呴殰缂栧彿 +// null, // 鎵�灞為」鐩� +// null, // 鏁呴殰绫诲瀷 +// null, // 闂姒傝堪 +// null, // 鏁呴殰鍘熷洜 +// null, // 瑙e喅鍔炴硶 +// null, // 鏂囦欢鍒楄〃 +// null, // 鍥剧墖 +// null, // 鍙戠敓鏃ユ湡 +// null, // 澶勭悊鏃ユ湡 +// null, // 鏇存柊鏃ユ湡 +// null, // 鍙戠幇浜� +// null, // 鑱旂郴鏂瑰紡 +// null, // 渚涘簲鍟� +// null, // +// null, // 鐘舵�� +// null, // 娣诲姞浜哄憳 +// null, // 娣诲姞鏃堕棿 +// null, // 淇敼浜哄憳 +// null, // 淇敼鏃堕棿 +// null // 澶囨敞 +// ); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public Long getHostId() { + return hostId; + } + + public String getHostId$(){ + HostService service = SpringUtils.getBean(HostService.class); + Host host = service.selectById(this.hostId); + if (!Cools.isEmpty(host)){ + return String.valueOf(host.getName()); + } + return null; + } + + public void setHostId(Long hostId) { + this.hostId = hostId; + } + + public Long getIssueType() { + return issueType; + } + + public String getIssueType$(){ + IssueTypeService service = SpringUtils.getBean(IssueTypeService.class); + IssueType issueType = service.selectById(this.issueType); + if (!Cools.isEmpty(issueType)){ + return String.valueOf(issueType.getName()); + } + return null; + } + + public void setIssueType(Long issueType) { + this.issueType = issueType; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getReason() { + return reason; + } + + public void setReason(String reason) { + this.reason = reason; + } + + public String getDeal() { + return deal; + } + + public void setDeal(String deal) { + this.deal = deal; + } + + public String getFiles() { + return files; + } + + public void setFiles(String files) { + this.files = files; + } + + public String getImg() { + return img; + } + + public void setImg(String img) { + this.img = img; + } + + public Date getStartTime() { + return startTime; + } + + public String getStartTime$(){ + if (Cools.isEmpty(this.startTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime); + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public String getEndTime$(){ + if (Cools.isEmpty(this.endTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime); + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public Date getLastTime() { + return lastTime; + } + + public String getLastTime$(){ + if (Cools.isEmpty(this.lastTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lastTime); + } + + public void setLastTime(Date lastTime) { + this.lastTime = lastTime; + } + + public String getDiscoverer() { + return discoverer; + } + + public void setDiscoverer(String discoverer) { + this.discoverer = discoverer; + } + + public String getTel() { + return tel; + } + + public void setTel(String tel) { + this.tel = tel; + } + + public String getDealer() { + return dealer; + } + + public void setDealer(String dealer) { + this.dealer = dealer; + } + + public Integer getSettle() { + return settle; + } + + public void setSettle(Integer settle) { + this.settle = settle; + } + + public Integer getStatus() { + return status; + } + + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 1: + return "姝e父"; + case 0: + return "绂佺敤"; + default: + return String.valueOf(this.status); + } + } + + public void setStatus(Integer status) { + this.status = status; + } + + public Long getCreateBy() { + return createBy; + } + + public String getCreateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.createBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public void setCreateBy(Long createBy) { + this.createBy = createBy; + } + + public Date getCreateTime() { + return createTime; + } + + public String getCreateTime$(){ + if (Cools.isEmpty(this.createTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime); + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Long getUpdateBy() { + return updateBy; + } + + public String getUpdateBy$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.updateBy); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + + public void setUpdateBy(Long updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public String getUpdateTime$(){ + if (Cools.isEmpty(this.updateTime)){ + return ""; + } + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime); + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public String getMemo() { + return memo; + } + + public void setMemo(String memo) { + this.memo = memo; + } + + +} diff --git a/src/main/java/com/zy/sc/manager/mapper/IssueMapper.java b/src/main/java/com/zy/sc/manager/mapper/IssueMapper.java new file mode 100644 index 0000000..7e969b4 --- /dev/null +++ b/src/main/java/com/zy/sc/manager/mapper/IssueMapper.java @@ -0,0 +1,12 @@ +package com.zy.sc.manager.mapper; + +import com.zy.sc.manager.entity.Issue; +import com.baomidou.mybatisplus.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface IssueMapper extends BaseMapper<Issue> { + +} diff --git a/src/main/java/com/zy/sc/manager/service/IssueService.java b/src/main/java/com/zy/sc/manager/service/IssueService.java new file mode 100644 index 0000000..382922e --- /dev/null +++ b/src/main/java/com/zy/sc/manager/service/IssueService.java @@ -0,0 +1,8 @@ +package com.zy.sc.manager.service; + +import com.zy.sc.manager.entity.Issue; +import com.baomidou.mybatisplus.service.IService; + +public interface IssueService extends IService<Issue> { + +} diff --git a/src/main/java/com/zy/sc/manager/service/impl/IssueServiceImpl.java b/src/main/java/com/zy/sc/manager/service/impl/IssueServiceImpl.java new file mode 100644 index 0000000..84c6190 --- /dev/null +++ b/src/main/java/com/zy/sc/manager/service/impl/IssueServiceImpl.java @@ -0,0 +1,12 @@ +package com.zy.sc.manager.service.impl; + +import com.zy.sc.manager.mapper.IssueMapper; +import com.zy.sc.manager.entity.Issue; +import com.zy.sc.manager.service.IssueService; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +@Service("issueService") +public class IssueServiceImpl extends ServiceImpl<IssueMapper, Issue> implements IssueService { + +} diff --git a/src/main/resources/mapper/IssueMapper.xml b/src/main/resources/mapper/IssueMapper.xml new file mode 100644 index 0000000..9ff8196 --- /dev/null +++ b/src/main/resources/mapper/IssueMapper.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="com.zy.sc.manager.mapper.IssueMapper"> + + <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> + <resultMap id="BaseResultMap" type="com.zy.sc.manager.entity.Issue"> + <id column="id" property="id" /> + <result column="uuid" property="uuid" /> + <result column="host_id" property="hostId" /> + <result column="issue_type" property="issueType" /> + <result column="title" property="title" /> + <result column="reason" property="reason" /> + <result column="deal" property="deal" /> + <result column="files" property="files" /> + <result column="img" property="img" /> + <result column="start_time" property="startTime" /> + <result column="end_time" property="endTime" /> + <result column="last_time" property="lastTime" /> + <result column="discoverer" property="discoverer" /> + <result column="tel" property="tel" /> + <result column="dealer" property="dealer" /> + <result column="settle" property="settle" /> + <result column="status" property="status" /> + <result column="create_by" property="createBy" /> + <result column="create_time" property="createTime" /> + <result column="update_by" property="updateBy" /> + <result column="update_time" property="updateTime" /> + <result column="memo" property="memo" /> + + </resultMap> + +</mapper> diff --git a/src/main/webapp/static/js/issue/issue.js b/src/main/webapp/static/js/issue/issue.js new file mode 100644 index 0000000..7fcf9cd --- /dev/null +++ b/src/main/webapp/static/js/issue/issue.js @@ -0,0 +1,280 @@ +var pageCurr; +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).use(['table','laydate', 'form', 'admin'], function(){ + var table = layui.table; + var $ = layui.jquery; + var layer = layui.layer; + var layDate = layui.laydate; + var form = layui.form; + var admin = layui.admin; + + // 鏁版嵁娓叉煋 + tableIns = table.render({ + elem: '#issue', + headers: {token: localStorage.getItem('token')}, + url: baseUrl+'/issue/list/auth', + page: true, + limit: 16, + limits: [16, 30, 50, 100, 200, 500], + toolbar: '#toolbar', + cellMinWidth: 50, + cols: [[ + {type: 'checkbox'} + ,{field: 'id', align: 'center',title: 'ID'} + ,{field: 'uuid', align: 'center',title: '鏁呴殰缂栧彿'} + ,{field: 'hostId$', align: 'center',title: '鎵�灞為」鐩�'} + ,{field: 'issueType$', align: 'center',title: '鏁呴殰绫诲瀷'} + ,{field: 'title', align: 'center',title: '闂姒傝堪'} + ,{field: 'reason', align: 'center',title: '鏁呴殰鍘熷洜'} + ,{field: 'deal', align: 'center',title: '瑙e喅鍔炴硶'} + ,{field: 'files', align: 'center',title: '鏂囦欢鍒楄〃'} + ,{field: 'img', align: 'center',title: '鍥剧墖'} + ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃ユ湡'} + ,{field: 'endTime$', align: 'center',title: '澶勭悊鏃ユ湡'} + ,{field: 'lastTime$', align: 'center',title: '鏇存柊鏃ユ湡'} + ,{field: 'discoverer', align: 'center',title: '鍙戠幇浜�'} + ,{field: 'tel', align: 'center',title: '鑱旂郴鏂瑰紡'} + ,{field: 'dealer', align: 'center',title: '渚涘簲鍟�'} + ,{field: 'settle', align: 'center',title: ''} + ,{field: 'status$', align: 'center',title: '鐘舵��'} + ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'} + ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'} + ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'} + ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'} + ,{field: 'memo', align: 'center',title: '澶囨敞'} + + ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:150} + ]], + request: { + pageName: 'curr', + pageSize: 'limit' + }, + parseData: function (res) { + return { + 'code': res.code, + 'msg': res.msg, + 'count': res.data.total, + 'data': res.data.records + } + }, + response: { + statusCode: 200 + }, + done: function(res, curr, count) { + if (res.code === 403) { + top.location.href = baseUrl+"/"; + } + pageCurr=curr; + limit(); + } + }); + + // 鐩戝惉鎺掑簭浜嬩欢 + table.on('sort(issue)', function (obj) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + searchData['orderByField'] = obj.field; + searchData['orderByType'] = obj.type; + tableIns.reload({ + where: searchData, + page: {curr: 1} + }); + }); + + // 鐩戝惉澶村伐鍏锋爮浜嬩欢 + table.on('toolbar(issue)', function (obj) { + var checkStatus = table.checkStatus(obj.config.id).data; + switch(obj.event) { + case 'addData': + showEditModel(); + break; + case 'deleteData': + if (checkStatus.length === 0) { + layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2}); + return; + } + var ids = checkStatus.map(function (d) { + return d.id; + }); + del(ids); + break; + case 'exportData': + layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){ + var titles=[]; + var fields=[]; + obj.config.cols[0].map(function (col) { + if (col.type === 'normal' && col.hide === false && col.toolbar == null) { + titles.push(col.title); + fields.push(col.field); + } + }); + var exportData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + exportData[this.name] = this.value; + }); + var param = { + 'issue': exportData, + 'fields': fields + }; + $.ajax({ + url: baseUrl+"/issue/export/auth", + headers: {'token': localStorage.getItem('token')}, + data: JSON.stringify(param), + dataType:'json', + contentType:'application/json;charset=UTF-8', + method: 'POST', + success: function (res) { + layer.closeAll(); + if (res.code === 200) { + table.exportFile(titles,res.data,'xls'); + } else if (res.code === 403) { + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}) + } + } + }); + }); + break; + } + }); + + // 鐩戝惉琛屽伐鍏蜂簨浠� + table.on('tool(issue)', function(obj){ + var data = obj.data; + switch (obj.event) { + case 'edit': + showEditModel(data); + break; + case "del": + var ids = [data.id]; + del(ids); + break; + } + }); + + /* 寮圭獥 - 鏂板銆佷慨鏀� */ + function showEditModel(mData) { + admin.open({ + type: 1, + area: '600px', + title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��', + content: $('#editDialog').html(), + success: function (layero, dIndex) { + layDateRender(); + form.val('detail', mData); + form.on('submit(editSubmit)', function (data) { + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/issue/"+(mData?'update':'add')+"/auth", + headers: {'token': localStorage.getItem('token')}, + data: data.field, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.close(dIndex); + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + }else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + return false; + }); + $(layero).children('.layui-layer-content').css('overflow', 'visible'); + layui.form.render('select'); + } + }); + } + + /* 鍒犻櫎 */ + function del(ids) { + layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', { + skin: 'layui-layer-admin', + shade: .1 + }, function (i) { + layer.close(i); + var loadIndex = layer.load(2); + $.ajax({ + url: baseUrl+"/issue/delete/auth", + headers: {'token': localStorage.getItem('token')}, + data: {ids: ids}, + method: 'POST', + success: function (res) { + layer.close(loadIndex); + if (res.code === 200){ + layer.msg(res.msg, {icon: 1}); + tableReload(); + } else if (res.code === 403){ + top.location.href = baseUrl+"/"; + } else { + layer.msg(res.msg, {icon: 2}); + } + } + }) + }); + } + + // 鎼滅储 + form.on('submit(search)', function (data) { + pageCurr = 1; + tableReload(false); + }); + + // 閲嶇疆 + form.on('submit(reset)', function (data) { + pageCurr = 1; + clearFormVal($('#search-box')); + tableReload(false); + }); + + // 鏃堕棿閫夋嫨鍣� + function layDateRender() { + layDate.render({ + elem: '#startTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#endTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#lastTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#createTime\\$', + type: 'datetime' + }); + layDate.render({ + elem: '#updateTime\\$', + type: 'datetime' + }); + + } + layDateRender(); + +}); + +// 鍏抽棴鍔ㄤ綔 +$(document).on('click','#data-detail-close', function () { + parent.layer.closeAll(); +}); + +function tableReload(child) { + var searchData = {}; + $.each($('#search-box [name]').serializeArray(), function() { + searchData[this.name] = this.value; + }); + tableIns.reload({ + where: searchData, + page: {curr: pageCurr} + }); +} diff --git a/src/main/webapp/views/issue/issue.html b/src/main/webapp/views/issue/issue.html new file mode 100644 index 0000000..92464d8 --- /dev/null +++ b/src/main/webapp/views/issue/issue.html @@ -0,0 +1,224 @@ +<!DOCTYPE html> +<html lang="en"> +<head> + <meta charset="utf-8"> + <title></title> + <meta name="renderer" content="webkit"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> + <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all"> + <link rel="stylesheet" href="../../static/css/cool.css" media="all"> + <link rel="stylesheet" href="../../static/css/common.css" media="all"> +</head> +<body> + +<!-- 鎼滅储鏍� --> +<div id="search-box" class="layui-form layui-card-header"> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off"> + </div> + </div> + <!-- 寰呮坊鍔� --> + <div id="data-search-btn" class="layui-btn-container layui-form-item"> + <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button> + <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button> + </div> +</div> + +<!-- 琛ㄦ牸 --> +<div class="layui-form"> + <table class="layui-hide" id="issue" lay-filter="issue"></table> +</div> +<script type="text/html" id="toolbar"> + <div class="layui-btn-container"> + <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button> + <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button> + <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button> + </div> +</script> + +<script type="text/html" id="operate"> + <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a> + <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a> +</script> + +<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script> +<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script> +<script type="text/javascript" src="../../static/js/issue/issue.js" charset="utf-8"></script> +</body> +<!-- 琛ㄥ崟寮圭獥 --> +<script type="text/html" id="editDialog"> + <form id="detail" lay-filter="detail" class="layui-form admin-form"> + <input name="id" type="hidden"> + <div class="layui-row"> + <div class="layui-col-md12"> + <div class="layui-form-item"> + <label class="layui-form-label">鏁呴殰缂栧彿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ユ晠闅滅紪鍙�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鎵�灞為」鐩�: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="hostId" placeholder="璇疯緭鍏ユ墍灞為」鐩�" style="display: none"> + <input id="hostId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ墍灞為」鐩�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="hostQueryByhostId" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="hostQueryByhostIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏁呴殰绫诲瀷: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="issueType" placeholder="璇疯緭鍏ユ晠闅滅被鍨�" style="display: none"> + <input id="issueType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ晠闅滅被鍨�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="issueTypeQueryByissueType" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="issueTypeQueryByissueTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">闂姒傝堪: </label> + <div class="layui-input-block"> + <input class="layui-input" name="title" placeholder="璇疯緭鍏ラ棶棰樻杩�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏁呴殰鍘熷洜: </label> + <div class="layui-input-block"> + <input class="layui-input" name="reason" placeholder="璇疯緭鍏ユ晠闅滃師鍥�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">瑙e喅鍔炴硶: </label> + <div class="layui-input-block"> + <input class="layui-input" name="deal" placeholder="璇疯緭鍏ヨВ鍐冲姙娉�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏂囦欢鍒楄〃: </label> + <div class="layui-input-block"> + <input class="layui-input" name="files" placeholder="璇疯緭鍏ユ枃浠跺垪琛�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍥剧墖: </label> + <div class="layui-input-block"> + <input class="layui-input" name="img" placeholder="璇疯緭鍏ュ浘鐗�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍙戠敓鏃ユ湡: </label> + <div class="layui-input-block"> + <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ュ彂鐢熸棩鏈�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">澶勭悊鏃ユ湡: </label> + <div class="layui-input-block"> + <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ュ鐞嗘棩鏈�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鏇存柊鏃ユ湡: </label> + <div class="layui-input-block"> + <input class="layui-input" name="lastTime" id="lastTime$" placeholder="璇疯緭鍏ユ洿鏂版棩鏈�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鍙戠幇浜�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="discoverer" placeholder="璇疯緭鍏ュ彂鐜颁汉"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鑱旂郴鏂瑰紡: </label> + <div class="layui-input-block"> + <input class="layui-input" name="tel" placeholder="璇疯緭鍏ヨ仈绯绘柟寮�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">渚涘簲鍟�: </label> + <div class="layui-input-block"> + <input class="layui-input" name="dealer" placeholder="璇疯緭鍏ヤ緵搴斿晢"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">: </label> + <div class="layui-input-block"> + <input class="layui-input" name="settle" placeholder="璇疯緭鍏�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">鐘舵��: </label> + <div class="layui-input-block"> + <select name="status"> + <option value="">璇烽�夋嫨鐘舵��</option> + <option value="1">姝e父</option> + <option value="0">绂佺敤</option> + </select> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">娣诲姞浜哄憳: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none"> + <input id="createBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">娣诲姞鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼浜哄憳: </label> + <div class="layui-input-block cool-auto-complete"> + <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none"> + <input id="updateBy$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" onfocus=this.blur()> + <div class="cool-auto-complete-window"> + <input class="cool-auto-complete-window-input" data-key="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))"> + <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> + </select> + </div> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">淇敼鏃堕棿: </label> + <div class="layui-input-block"> + <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�"> + </div> + </div> + <div class="layui-form-item"> + <label class="layui-form-label">澶囨敞: </label> + <div class="layui-input-block"> + <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�"> + </div> + </div> + + </div> + </div> + <hr class="layui-bg-gray"> + <div class="layui-form-item text-right"> + <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button> + <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button> + </div> + </form> +</script> +</html> + diff --git a/src/main/webapp/views/issueType/issueType.html b/src/main/webapp/views/issueType/issueType.html index 8541b1a..aa20548 100644 --- a/src/main/webapp/views/issueType/issueType.html +++ b/src/main/webapp/views/issueType/issueType.html @@ -56,16 +56,16 @@ <input class="layui-input" name="name" placeholder="璇疯緭鍏ョ被鍨嬪悕绉�"> </div> </div> - <div class="layui-form-item"> - <label class="layui-form-label">鐘舵��: </label> - <div class="layui-input-block"> - <select name="status"> - <option value="">璇烽�夋嫨鐘舵��</option> - <option value="1">姝e父</option> - <option value="0">绂佺敤</option> - </select> - </div> - </div> +<!-- <div class="layui-form-item">--> +<!-- <label class="layui-form-label">鐘舵��: </label>--> +<!-- <div class="layui-input-block">--> +<!-- <select name="status">--> +<!-- <option value="">璇烽�夋嫨鐘舵��</option>--> +<!-- <option value="1">姝e父</option>--> +<!-- <option value="0">绂佺敤</option>--> +<!-- </select>--> +<!-- </div>--> +<!-- </div>--> <div class="layui-form-item"> <label class="layui-form-label">澶囨敞: </label> <div class="layui-input-block"> -- Gitblit v1.9.1