|
@@ -128,9 +128,6 @@ class ClientController extends DooController
|
|
*/
|
|
*/
|
|
$localmd5HashString = hash_file("md5",Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
$localmd5HashString = hash_file("md5",Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
if($localmd5HashString!=$_POST['MD5_Zip']){
|
|
if($localmd5HashString!=$_POST['MD5_Zip']){
|
|
- error_log(var_export(Doo::conf()->SITE_PATH . $fp[0]['filepath'],true),3,'/opt/html/jiliang_customedProduct/'.microtime());
|
|
|
|
- error_log(var_export($_POST,true),3,'/opt/html/jiliang_customedProduct/'.microtime());
|
|
|
|
- error_log(var_export($localmd5HashString,true),3,'/opt/html/jiliang_customedProduct/'.microtime());
|
|
|
|
$status = array('status' => 'FALSE', 'msg' => '期数数据上传失败,请重新上传');
|
|
$status = array('status' => 'FALSE', 'msg' => '期数数据上传失败,请重新上传');
|
|
echo json_encode($status, JSON_UNESCAPED_UNICODE);
|
|
echo json_encode($status, JSON_UNESCAPED_UNICODE);
|
|
die();
|
|
die();
|
|
@@ -683,7 +680,7 @@ class ClientController extends DooController
|
|
// 标段期审核接口
|
|
// 标段期审核接口
|
|
function auditMeasure()
|
|
function auditMeasure()
|
|
{
|
|
{
|
|
- if (isset($_POST['userid']) && isset($_POST['tenderid']) && isset($_POST['phaseno']) && isset($_POST['MD5_JL'])) {
|
|
|
|
|
|
+ if (isset($_POST['userid']) && isset($_POST['tenderid']) && isset($_POST['phaseno']) && isset($_POST['MD5_JL']) && isset($_POST['MD5_Zip'])) {
|
|
$auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
|
|
$auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
|
|
$auditArray = $this->measureauditact->getLastNewRowInfo($_POST['tenderid'], $_POST['phaseno'], $_POST['userid']);
|
|
$auditArray = $this->measureauditact->getLastNewRowInfo($_POST['tenderid'], $_POST['phaseno'], $_POST['userid']);
|
|
if (isset($auditArray ['mastatus']) && ($auditArray ['mastatus'] == 'checked') || ($auditArray ['mastatus'] == 'checkno')) {
|
|
if (isset($auditArray ['mastatus']) && ($auditArray ['mastatus'] == 'checked') || ($auditArray ['mastatus'] == 'checkno')) {
|
|
@@ -693,6 +690,12 @@ class ClientController extends DooController
|
|
$auditUserArray = $this->measureauditact->getUserAuditLast($_POST['tenderid'], $_POST['phaseno']);
|
|
$auditUserArray = $this->measureauditact->getUserAuditLast($_POST['tenderid'], $_POST['phaseno']);
|
|
$fp = $this->upfile('upfile');
|
|
$fp = $this->upfile('upfile');
|
|
if (isset($fp[0]['filepath'])) {
|
|
if (isset($fp[0]['filepath'])) {
|
|
|
|
+ $localmd5HashString = hash_file("md5",Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
|
|
+ if($localmd5HashString!=$_POST['MD5_Zip']){
|
|
|
|
+ $status = array('status' => 'FALSE', 'msg' => '审核期数数据上传失败,请重新上传');
|
|
|
|
+ echo json_encode($status, JSON_UNESCAPED_UNICODE);
|
|
|
|
+ die();
|
|
|
|
+ }
|
|
$res = $this->zip->open(Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
$res = $this->zip->open(Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
$extPath = pathinfo($fp[0]['filepath']);
|
|
$extPath = pathinfo($fp[0]['filepath']);
|
|
$extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . '/' . $extPath['filename'];
|
|
$extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . '/' . $extPath['filename'];
|
|
@@ -880,7 +883,7 @@ class ClientController extends DooController
|
|
*/
|
|
*/
|
|
function setCheckno()
|
|
function setCheckno()
|
|
{
|
|
{
|
|
- if (isset($this->params['userid']) && isset($this->params['tenderid']) && isset($this->params['phaseno']) && isset($_POST['MD5_JL'])) {
|
|
|
|
|
|
+ if (isset($this->params['userid']) && isset($this->params['tenderid']) && isset($this->params['phaseno']) && isset($_POST['MD5_JL']) && isset($_POST['MD5_Zip'])) {
|
|
$auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
|
|
$auditcontent = iconv('GBK', 'UTF-8', $_POST['CheckerMemo']);
|
|
$auditArray = $this->measureauditact->getRowInfo($this->params['tenderid'], $this->params['phaseno'], $this->params['userid']);
|
|
$auditArray = $this->measureauditact->getRowInfo($this->params['tenderid'], $this->params['phaseno'], $this->params['userid']);
|
|
if (isset($auditArray['maid'])) {
|
|
if (isset($auditArray['maid'])) {
|
|
@@ -894,6 +897,12 @@ class ClientController extends DooController
|
|
if (isset($fp[0]['filepath'])) {
|
|
if (isset($fp[0]['filepath'])) {
|
|
// 解压缩文件等待以后直接使用
|
|
// 解压缩文件等待以后直接使用
|
|
// TODO:根据校验码校验包的完整性
|
|
// TODO:根据校验码校验包的完整性
|
|
|
|
+ $localmd5HashString = hash_file("md5",Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
|
|
+ if($localmd5HashString!=$_POST['MD5_Zip']){
|
|
|
|
+ $status = array('status' => 'FALSE', 'msg' => '未通过期数数据上传失败,请重新上传');
|
|
|
|
+ echo json_encode($status, JSON_UNESCAPED_UNICODE);
|
|
|
|
+ die();
|
|
|
|
+ }
|
|
$res = $this->zip->open(Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
$res = $this->zip->open(Doo::conf()->SITE_PATH . $fp[0]['filepath']);
|
|
$extPath = pathinfo($fp[0]['filepath']);
|
|
$extPath = pathinfo($fp[0]['filepath']);
|
|
$extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . '/' . $extPath['filename'];
|
|
$extPathdir = Doo::conf()->SITE_PATH . $extPath ['dirname'] . '/' . $extPath['filename'];
|