From 6a47ebad90060dfaf9d8b06c27a9cb4b61eb5618 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 May 2022 14:38:32 +0800
Subject: [PATCH] 20220516
---
zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java | 18 +++++++++
zq-erp/src/main/resources/config/db/increment/2022-05-16Pad客户签名.sql | 3 +
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 4 ++
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java | 8 ++++
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSignServiceDto.java | 22 +++++++++++
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 10 ++++
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java | 2 +
7 files changed, 66 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index 59cc0f2..392b155 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -17,7 +17,7 @@
private static final long serialVersionUID = 1L;
-
+ private String signPic;
/**
* 序号
@@ -795,4 +795,12 @@
public void setCompanyId(Long companyId) {
this.companyId = companyId;
}
+
+ public String getSignPic() {
+ return signPic;
+ }
+
+ public void setSignPic(String signPic) {
+ this.signPic = signPic;
+ }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
index 6383e2d..871613a 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysProjServicesService.java
@@ -120,4 +120,6 @@
* @return
*/
int confirmServiceOrder(Long id);
+
+ int signService(SysProjServices services);
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
index 0b3ffe4..d643db5 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java
@@ -1218,5 +1218,13 @@
return i;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int signService(SysProjServices services) {
+ SysProjServices projServices =findById(services.getId());
+ projServices.setSignPic(services.getSignPic());
+ return sysProjServicesDao.update(projServices);
+ }
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
index e099c42..490ddf5 100644
--- a/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java
@@ -26,6 +26,7 @@
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.*;
import com.matrix.system.padApi.dto.PadServiceListDto;
+import com.matrix.system.padApi.dto.PadSignServiceDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
@@ -465,6 +466,23 @@
}
/**
+ * 设置客户签名
+ */
+ @ApiOperation(value = "设置客户签名", notes = "设置客户签名")
+ @PostMapping(value = "/signService")
+ public AjaxResult signService(@RequestBody PadSignServiceDto padSignServiceDto) {
+ SysProjServices services = new SysProjServices();
+ services.setId(padSignServiceDto.getId());
+ services.setSignPic(padSignServiceDto.getSignPic());
+ int i = sysProjServicesService.signService(services);
+ if (i > 0) {
+ return new AjaxResult(AjaxResult.STATUS_SUCCESS, "签名成功");
+ } else {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "签名失败");
+ }
+ }
+
+ /**
* 设置服务单划扣成功
*/
@ApiOperation(value = "设置服务单划扣成功", notes = "设置服务单划扣成功")
diff --git a/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSignServiceDto.java b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSignServiceDto.java
new file mode 100644
index 0000000..9b12377
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSignServiceDto.java
@@ -0,0 +1,22 @@
+package com.matrix.system.padApi.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@ApiModel(value = "PadSignServiceDto", description = "接收参数类")
+@Data
+public class PadSignServiceDto {
+
+ @ApiModelProperty(value = "服务单ID", example = "123456")
+ @NotNull(message = "服务单不能为空")
+ private Long id;
+
+ @ApiModelProperty(value = "签名图片", example = "")
+ @NotBlank(message = "签名图片不能为空")
+ private String signPic;
+
+}
diff --git "a/zq-erp/src/main/resources/config/db/increment/2022-05-16Pad\345\256\242\346\210\267\347\255\276\345\220\215.sql" "b/zq-erp/src/main/resources/config/db/increment/2022-05-16Pad\345\256\242\346\210\267\347\255\276\345\220\215.sql"
new file mode 100644
index 0000000..0eb1c33
--- /dev/null
+++ "b/zq-erp/src/main/resources/config/db/increment/2022-05-16Pad\345\256\242\346\210\267\347\255\276\345\220\215.sql"
@@ -0,0 +1,3 @@
+
+ALTER TABLE `sys_proj_services`
+ ADD COLUMN `sign_pic` varchar(500) NULL COMMENT '签名图片' AFTER `cashier_id`;
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index f7e620a..e37c0d0 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -42,6 +42,7 @@
<result property="reply" column="reply"/>
<result property="overtimeNotice" column="overtime_notice"/>
<result property="cashierId" column="cashier_id"/>
+ <result property="signPic" column="sign_pic"/>
<result property="cashierName" column="cashierName"/>
@@ -272,6 +273,9 @@
<if test="cashierId != null ">
cashier_id = #{cashierId},
</if>
+ <if test="signPic != null ">
+ sign_pic = #{signPic},
+ </if>
</set>
WHERE id=#{id}
</update>
--
Gitblit v1.9.1