|
@@ -62,12 +62,14 @@ class PublicController extends AbstractController
|
|
|
{
|
|
|
$urlN = new CommonService();
|
|
|
$file = $this->request->file('file');
|
|
|
+ $fileName = $this->request->input("fileName",'');
|
|
|
try {
|
|
|
if ($file == null) {
|
|
|
return Result::error("未找到上传文件");
|
|
|
}
|
|
|
$data = CommonService::uploadFile($file, ['png','jpg','png','jpeg','gif','xls', 'xlsx', 'pdf', 'xls', 'xlsx', 'doc', 'docx', 'ppt', 'zip', 'pptx', 'mp4', 'flv'], 'image');
|
|
|
$data['imgUrl'] = $urlN->imgUrl($data['src']);
|
|
|
+ $data['oldFileName'] = $fileName;
|
|
|
return Result::success($data, '上传成功');
|
|
|
} catch (\Exception $e) {
|
|
|
return Result::error($e->getMessage());
|
|
@@ -193,7 +195,12 @@ class PublicController extends AbstractController
|
|
|
}
|
|
|
$requireData = $this->request->all();
|
|
|
$requireData['user_id'] = $this->UserId;
|
|
|
- $result = $this->publicServiceClient->addLetterOfComplaint($requireData);
|
|
|
+ if($requireData['id']){
|
|
|
+ $result = $this->publicServiceClient->userUpLetterOfComplaint($requireData);
|
|
|
+ }else{
|
|
|
+ $result = $this->publicServiceClient->addLetterOfComplaint($requireData);
|
|
|
+ }
|
|
|
+
|
|
|
return $result ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
|
|
@@ -232,7 +239,8 @@ class PublicController extends AbstractController
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$requireData['user_id'] = $this->UserId;
|
|
|
- if(isset($data['is_admin']) && !empty($data['is_admin'])){
|
|
|
+ var_dump("用户id:",$this->UserId);
|
|
|
+ if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
|
|
|
unset( $requireData['user_id']);
|
|
|
}
|
|
|
$result = $this->publicServiceClient->getLetterOfComplaint($requireData);
|
|
@@ -247,10 +255,16 @@ class PublicController extends AbstractController
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$requireData['user_id'] = $this->UserId;
|
|
|
- if(isset($data['is_admin']) && !empty($data['is_admin'])){
|
|
|
+ if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
|
|
|
unset( $requireData['user_id']);
|
|
|
}
|
|
|
$result = $this->publicServiceClient->getLetterOfComplaintInfo($requireData);
|
|
|
+ if($result){
|
|
|
+ $result['data']['judgment'] = $result['data']['judgment']?json_decode($result['data']['judgment']):'';
|
|
|
+ $result['data']['audio_and_video'] = $result['data']['audio_and_video']?json_decode($result['data']['audio_and_video']):'';
|
|
|
+ $result['data']['contract'] = $result['data']['contract']?json_decode($result['data']['contract']):'';
|
|
|
+ $result['data']['qualifications'] = $result['data']['qualifications']?json_decode($result['data']['qualifications']):'';
|
|
|
+ }
|
|
|
return $result ? Result::success($result['data']) : Result::error($result['message']);
|
|
|
}
|
|
|
|
|
@@ -262,7 +276,7 @@ class PublicController extends AbstractController
|
|
|
{
|
|
|
$requireData = $this->request->all();
|
|
|
$requireData['user_id'] = $this->UserId;
|
|
|
- if(isset($data['is_admin']) && !empty($data['is_admin'])){
|
|
|
+ if(isset($requireData['is_admin']) && !empty($requireData['is_admin'])){
|
|
|
unset( $requireData['user_id']);
|
|
|
}
|
|
|
$result = $this->publicServiceClient->delLetterOfComplaint($requireData);
|
|
@@ -317,11 +331,11 @@ class PublicController extends AbstractController
|
|
|
|
|
|
if ($zip->open($zipFileName, ZipArchive::CREATE) === TRUE) {
|
|
|
|
|
|
- $string = trim($requireData['files'], "[]'");
|
|
|
- $string = str_replace("'", '', $string);
|
|
|
- $filePaths = explode(',', $string);
|
|
|
- foreach ($filePaths as $filePathu) {
|
|
|
- $attachmentItem = 'public'.$filePathu;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ foreach ($requireData['files'] as $filePathu) {
|
|
|
+ $attachmentItem = 'public/'.$filePathu;
|
|
|
$zip->addFile($attachmentItem, pathinfo($attachmentItem, PATHINFO_BASENAME));
|
|
|
}
|
|
|
|
|
@@ -333,20 +347,35 @@ class PublicController extends AbstractController
|
|
|
} else {
|
|
|
return Result::error('无法创建zip文件');
|
|
|
}
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+ * 检测是否被处理
|
|
|
+ * @return array
|
|
|
+ */
|
|
|
+ public function checkMeasure()
|
|
|
+ {
|
|
|
+ $requireData = $this->request->all();
|
|
|
+ $validator = $this->validationFactory->make(
|
|
|
+ $requireData,
|
|
|
+ [
|
|
|
+ 'id' => 'required',
|
|
|
+ ],
|
|
|
+ [
|
|
|
+ 'id.required' => 'id不能为空',
|
|
|
+ ]
|
|
|
+ );
|
|
|
+ if ($validator->fails()){
|
|
|
+ $errorMessage = $validator->errors()->first();
|
|
|
+ return Result::error($errorMessage);
|
|
|
+ }
|
|
|
+ $requireData['user_id'] = $this->UserId;
|
|
|
+ $result = $this->publicServiceClient->checkMeasure($requireData);
|
|
|
+ return $result['code']==200 ? Result::success() : Result::error("已经处理了");
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
}
|